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/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";