diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b2be92b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+result
diff --git a/hosts/homeserver/configuration.nix b/hosts/homeserver/configuration.nix
index a52a04a..80d62d5 100644
--- a/hosts/homeserver/configuration.nix
+++ b/hosts/homeserver/configuration.nix
@@ -25,6 +25,7 @@
 
     # Common modules
     ../../shared/fish.nix
+    ../../shared/cli.nix
 
     # External Modules
     inputs.sops-nix.nixosModules.sops
@@ -146,12 +147,6 @@
     docker-compose
     sops
 
-    git
-    just
-
-    btop
-    dust
-
     restic
 
     # Power efficient
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index 17520a2..4ebe4c5 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -16,6 +16,7 @@
 
     # Common modules
     ../../shared/fish.nix
+    ../../shared/cli.nix
 
     # External modules
     inputs.hydration-notifier.nixosModules.default
@@ -107,9 +108,6 @@
       inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default
 
       zed-editor
-      just
-
-      btop
 
       discord
 
@@ -138,8 +136,6 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    git
-
     espup
     espflash
 
diff --git a/justfile b/justfile
index c299d87..573ad6f 100644
--- a/justfile
+++ b/justfile
@@ -3,3 +3,9 @@ switch flake:
 
 boot flake:
     sudo nixos-rebuild boot --flake .#{{flake}}
+
+build flake:
+    sudo nixos-rebuild build --flake .#{{flake}}
+
+diff:
+    nvd diff /run/current-system/ ./result
diff --git a/result b/result
deleted file mode 120000
index 8e8a6b7..0000000
--- a/result
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/d8hax7ml9jfivja4c6j3a7izvpk5wyh1-nixos-system-nixos-26.05.20260710.8f0500b
\ No newline at end of file
diff --git a/shared/cli.nix b/shared/cli.nix
new file mode 100644
index 0000000..f3eb34f
--- /dev/null
+++ b/shared/cli.nix
@@ -0,0 +1,16 @@
+{
+  pkgs,
+  ...
+}:
+
+{
+  environment.systemPackages = with pkgs; [
+    btop
+    dust
+
+    git
+    just
+
+    nvd
+  ];
+}