diff --git a/.justfile b/.justfile
index f964077..bf1dd7a 100644
--- a/.justfile
+++ b/.justfile
@@ -11,8 +11,7 @@ export NIX_CONFIG := "
 [private]
 [macos]
 rebuild *args:
-  #!/usr/bin/env bash
-  set -euxo pipefail
+  #!/usr/bin/env -S bash -euo pipefail
   dir="${TMPDIR:-/tmp}/nix-darwin"
   ! [[ -x "$dir/sw/bin/darwin-rebuild" ]] && nix build .\#darwinConfigurations.`hostname`.system -o "$dir"
   "$dir/sw/bin/darwin-rebuild" --flake . {{args}}
@@ -23,7 +22,9 @@ rebuild *args:
   sudo nixos-rebuild --flake . {{args}}
 
 build *args:
-  @just rebuild build {{args}}
+  @sudo true
+  @just rebuild build {{args}} --log-format internal-json -v |& nom --json
+  @nvd diff /run/current-system result
 
 home *args:
   nix run ".#homeConfigurations.winston.activationPackage" {{args}}
@@ -41,7 +42,11 @@ check *args:
   @just rebuild test {{args}}
 
 switch *args:
-  @just rebuild switch {{args}}
+  #!/usr/bin/env -S bash -euo pipefail
+  just build {{args}}
+  read -r -n 1 -p "Continue? [y/N]: " REPLY
+  [[ "$REPLY" =~ ^[Yy]$ ]] || exit 0
+  just rebuild switch {{args}}
 
 fetch:
   @nix shell nixpkgs\#onefetch nixpkgs\#scc -c sh -c "onefetch --true-color never --no-bots -d lines-of-code && scc --no-cocomo ."
diff --git a/flake.nix b/flake.nix
index 8b61903..4a3cad9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -95,6 +95,7 @@
         devShells.default = pkgs.mkShell {
           name = "nixpkgs";
           inherit (self'.checks.pre-commit-check) shellHook;
+          buildInputs = with pkgs; [nvd nix-output-monitor];
         };
 
         legacyPackages.homeConfigurations = let
diff --git a/home/default.nix b/home/default.nix
index 9013b6d..8feb4b1 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -23,6 +23,8 @@ in {
         just
         mdcat
         mosh
+        nix-output-monitor
+        nvd
         ranger
         ripgrep
         sops