diff --git a/Justfile b/Justfile
index e2bf4ab..27a0c4f 100755
--- a/Justfile
+++ b/Justfile
@@ -4,7 +4,7 @@ _usage:
 _device recipe dir +moreargs="":
 	#!/usr/bin/env bash
 	set -ex
-	sudo $(set -x; nix-build --no-link --show-trace $(dirname {{dir}})/default.nix -A recipes.{{recipe}} --argstr dir {{dir}} {{moreargs}})
+	$(set -x; nix-build --no-link --show-trace $(dirname {{dir}})/default.nix -A recipes.{{recipe}} --argstr dir {{dir}} {{moreargs}})
 
 _render_templates:
 	#!/usr/bin/env bash
diff --git a/nix/os/devices/default.nix b/nix/os/devices/default.nix
index 23741c8..462f1ee 100644
--- a/nix/os/devices/default.nix
+++ b/nix/os/devices/default.nix
@@ -7,7 +7,8 @@
 , gitRoot ? "$(git rev-parse --show-toplevel)"
 }:
 
-let 
+let
+  rebuildargsSudo = [ "switch" "boot" ];
   rebuild = pkgs.writeScript "script" ''
     #!/usr/bin/env bash
     set -xe
@@ -17,6 +18,11 @@ let
 
     [[ -e "''${NIXOS_CONFIG}" ]]
 
+    ${if (builtins.elem rebuildarg rebuildargsSudo) then
+      "sudo -E \\"
+    else
+      ""
+      }
     nixos-rebuild -I nixos-config=''${NIXOS_CONFIG} ${rebuildarg} ${moreargs}
     if test -L result; then
       rm result