diff --git a/Justfile b/Justfile
old mode 100644
new mode 100755
index dc4f0ed..769b712
--- a/Justfile
+++ b/Justfile
@@ -1,3 +1,5 @@
+#!/usr/bin/env -S just --justfile
+
 FLAKE_HOME := justfile_directory()
 DEFAULT_SPECIALISATION := "default"
 
@@ -10,6 +12,9 @@ switch specialisation=DEFAULT_SPECIALISATION:
 update:
     nix flake update --log-format internal-json 2>&1 | nom --json
 
+build specialisation=DEFAULT_SPECIALISATION:
+    nh os build {{ FLAKE_HOME }} {{ if specialisation == DEFAULT_SPECIALISATION { "-S" } else { "-s " + specialisation } }}
+
 deploy host:
     deploy {{ FLAKE_HOME }}#{{ host }}
 
@@ -24,3 +29,4 @@ alias u := update
 alias d := deploy
 alias c := clean
 alias h := health
+alias b := build
diff --git a/flake.lock b/flake.lock
index b8e6f4a..5a83fd9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -70,11 +70,11 @@
     "bt-tracker": {
       "flake": false,
       "locked": {
-        "lastModified": 1738656540,
-        "narHash": "sha256-bJAX5RgKgYya7WPpygdlvmh5TByY1KVOnMrOlvL2HUI=",
+        "lastModified": 1738743043,
+        "narHash": "sha256-Px+PjGwwaxsWr67cV8E6KyLlOlzgtEDZupz8+rug+mM=",
         "owner": "XIU2",
         "repo": "TrackersListCollection",
-        "rev": "03c44392a4fad3b01d491af1f8a0b2b7b1f23abb",
+        "rev": "f1691576ffdd1ce12e446b52be5a7defee0d3c9c",
         "type": "github"
       },
       "original": {
@@ -528,11 +528,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1738625866,
-        "narHash": "sha256-0GibVm6Pfm99Lu5fcH68YGa3jO0zUdoO+V3DqmAcJTc=",
+        "lastModified": 1738723095,
+        "narHash": "sha256-5l7ghUJb++dh59VlaZlmAKDoaJgCtT7pCKP87bRNFZE=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "8995ccaae25b1af2e052d0d78ed74e7d225dec5a",
+        "rev": "b0e1eaf50d01257a743b8508f9eb29b78882c403",
         "type": "github"
       },
       "original": {
@@ -549,11 +549,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738667255,
-        "narHash": "sha256-sMMQb9NydZqQ/MvvtPp+Ny0W9P0Jk0moU7SrTBlO5Vo=",
+        "lastModified": 1738741704,
+        "narHash": "sha256-+XVScrF7Yymk9659dFb/ikCIET7DblHBVgK3RTW8mQg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7abcf59a365430b36f84eaa452a466b11e469e33",
+        "rev": "3b6fde96d8b41a4a21cbacba8de7debf7ea78021",
         "type": "github"
       },
       "original": {
@@ -615,11 +615,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1738659223,
-        "narHash": "sha256-fr3uPkLEDdmyD3CQwFBcRDl96VmkK0Lgr21BIxqk+gY=",
+        "lastModified": 1738745742,
+        "narHash": "sha256-5NzAMZucmha1LiyLViljCDipPCw/vD8kYg4QW3FRp9c=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "297a7208e396ab6e9de88363c538baec8d75ccbb",
+        "rev": "3707f6ee5d5903311801a52594345e824d1a1a87",
         "type": "github"
       },
       "original": {
@@ -648,11 +648,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1738654964,
-        "narHash": "sha256-30l3hOfTW1kJXcTRQsJ9f0/wE1aaTTACKb4ch6ZlLNU=",
+        "lastModified": 1738737418,
+        "narHash": "sha256-TytWBrInF5CDc8Q6GCdaujAUNWEYXy01s0Uqclx3Vvc=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "7d24ad23c2bc690b22b1f13ad4598dc8323d128b",
+        "rev": "ddcac86d1d568463ef828bf370d8989bbf12c9fd",
         "type": "github"
       },
       "original": {
@@ -764,11 +764,11 @@
         "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
-        "lastModified": 1738638873,
-        "narHash": "sha256-BJMELQKR1gyZKM+lIPT6yMND/YIVRmTtzCHrrA6Zjs0=",
+        "lastModified": 1738719817,
+        "narHash": "sha256-yJbiwN9Se8+EVrsgaeBJYflp8dpMN827MZZun58I7Js=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "20879a0946b62794ed73583c34b830158d9a2f21",
+        "rev": "7d9637c0c3dcf5b55b48dbc0157dc11a06e56468",
         "type": "github"
       },
       "original": {
@@ -891,11 +891,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1738574474,
-        "narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=",
+        "lastModified": 1738702386,
+        "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c",
+        "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e",
         "type": "github"
       },
       "original": {
@@ -907,11 +907,11 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1738435198,
-        "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=",
+        "lastModified": 1738574474,
+        "narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3",
+        "rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c",
         "type": "github"
       },
       "original": {
@@ -987,11 +987,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1738546358,
-        "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=",
+        "lastModified": 1738680400,
+        "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914",
+        "rev": "799ba5bffed04ced7067a91798353d360788b30d",
         "type": "github"
       },
       "original": {
@@ -1003,11 +1003,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1738410390,
-        "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
+        "lastModified": 1738680400,
+        "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
+        "rev": "799ba5bffed04ced7067a91798353d360788b30d",
         "type": "github"
       },
       "original": {
@@ -1019,11 +1019,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1738546358,
-        "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=",
+        "lastModified": 1738680400,
+        "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914",
+        "rev": "799ba5bffed04ced7067a91798353d360788b30d",
         "type": "github"
       },
       "original": {
@@ -1067,11 +1067,11 @@
     "nur-rycee": {
       "flake": false,
       "locked": {
-        "lastModified": 1738641794,
-        "narHash": "sha256-MNnDZJuxMTXT1vGHQFSPJx9sJ56JjpjKulNsy01Cu8A=",
+        "lastModified": 1738742448,
+        "narHash": "sha256-GluvfIlhmJSHqXxqUMMNIv9URIDGjI+7cb6PDuSF2oc=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "727fbb76627296cdeab0f2367930fb1f663b2113",
+        "rev": "40a693d6465a8a960a44a296ab6a439316c7765d",
         "type": "gitlab"
       },
       "original": {
@@ -1084,11 +1084,11 @@
     "nur-xddxdd": {
       "flake": false,
       "locked": {
-        "lastModified": 1738663503,
-        "narHash": "sha256-wBhmi2r5+4gUv5Hc48O3vWiYLU8BnW45QN1k4rRY9xs=",
+        "lastModified": 1738750159,
+        "narHash": "sha256-Y/yYT3qANqafc+6Uxk/rCbNuzdGlYoQn3VDM6MbKkT0=",
         "owner": "xddxdd",
         "repo": "nur-packages",
-        "rev": "ee35d2e43a34fa706aa6934d8262046f40d0ace8",
+        "rev": "2b715df004ac0e90eaf5cc213082159f8bff97fe",
         "type": "github"
       },
       "original": {
diff --git a/home/alice/configurations/Cape/default.nix b/home/alice/configurations/Cape/default.nix
index 1d26bf3..b8ff63e 100644
--- a/home/alice/configurations/Cape/default.nix
+++ b/home/alice/configurations/Cape/default.nix
@@ -50,7 +50,6 @@
     gitoxide
     viu
     fd
-    just
   ];
   programs.ssh = {
     enable = true;
diff --git a/home/david/configurations/Akun/default.nix b/home/david/configurations/Akun/default.nix
index f423dcc..2ad8813 100644
--- a/home/david/configurations/Akun/default.nix
+++ b/home/david/configurations/Akun/default.nix
@@ -69,6 +69,5 @@
     kdePackages.kdenlive
     fd
     viu
-    just
   ];
 }
diff --git a/home/david/modules/default.nix b/home/david/modules/default.nix
index 54feb98..12d7d58 100644
--- a/home/david/modules/default.nix
+++ b/home/david/modules/default.nix
@@ -8,6 +8,7 @@
     home.packages = with pkgs; [
       spacer
       devenv
+      just
     ];
   };
 }
diff --git a/home/modules/programs/shell/default.nix b/home/modules/programs/shell/default.nix
index daa448e..9a88557 100644
--- a/home/modules/programs/shell/default.nix
+++ b/home/modules/programs/shell/default.nix
@@ -1,4 +1,8 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  ...
+}:
 let
   inherit (lib) mkEnableOption mkIf mkMerge;
   fish-cfg = config.youthlic.programs.fish;
@@ -19,7 +23,7 @@ in
   options = {
     youthlic.programs = {
       fish = {
-        enable =mkEnableOption "fish";
+        enable = mkEnableOption "fish";
       };
       bash = {
         enable = mkEnableOption "bash";