diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index 1717f1f..102eb91 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -6,14 +6,20 @@
 
 with lib;
 let
-  nom-system = pkgs.writeShellApplication {
+  nom-system = pkgs.writeFishApplication {
     name = "nom-system";
     runtimeInputs = with pkgs; [ nix-output-monitor ];
-    text = ''
-      nom build --no-link "/home/moritz/.dotfiles#nixosConfigurations.$(hostname).config.system.build.toplevel"
+    text = /* fish */ ''
+      nom build --no-link "/home/moritz/.dotfiles#nixosConfigurations.$(hostname).config.system.build.toplevel" $argv
+    '';
+  };
+  nom-system-command = name: command: pkgs.writeFishApplication {
+    inherit name;
+    runtimeInputs = with pkgs; [ nom-system nix ];
+    text = /* fish */ ''
+      nom-system $argv && ${command}
     '';
   };
-  nom-system-command = command: "${nom-system}/bin/nom-system && ${command}";
 
   f = pkgs.writeFishApplication {
     name = "f";
@@ -57,8 +63,6 @@ in
         mv = "mv -i";
         cd = "__zoxide_z";
 
-        nixos-switch = nom-system-command "sudo nixos-rebuild switch --flake ~/.dotfiles";
-        nixos-boot = nom-system-command "sudo nixos-rebuild boot --flake ~/.dotfiles";
         nixos-update = "pushd ~/.dotfiles && nix flake update && popd";
 
         latexwatch = ''find -type f -name "*.tex" | entr -c latexmk -pdf -silent'';
@@ -105,6 +109,8 @@ in
     bottom
 
     # nix
+    (nom-system-command "nixos-boot" "sudo nixos-rebuild boot --flake ~/.dotfiles")
+    (nom-system-command "nixos-switch" "sudo nixos-rebuild switch --flake ~/.dotfiles")
     comma
     nix-index
     nixpkgs-fmt