diff --git a/darwin/shiro/configuration.nix b/darwin/shiro/configuration.nix
index 8fd5c14e..f97b0825 100644
--- a/darwin/shiro/configuration.nix
+++ b/darwin/shiro/configuration.nix
@@ -35,7 +35,7 @@
   };
 
   users.users.remotebuilder = {
-    isNormalUser = true;
+    # isNormalUser = true;
     openssh.authorizedKeys.keyFiles = [../../secrets/id_ed25519.pub];
   };
 
diff --git a/home/gui-programs/wezterm.nix b/home/gui-programs/wezterm.nix
index c87f1764..8db65ffd 100644
--- a/home/gui-programs/wezterm.nix
+++ b/home/gui-programs/wezterm.nix
@@ -34,7 +34,11 @@
                 top = 2,
                 bottom = 0,
             },
-            window_decorations = ${if pkgs.stdenv.isLinux then "NONE" else "RESIZE"},
+            window_decorations = "${
+          if pkgs.stdenv.isLinux
+          then "NONE"
+          else "RESIZE"
+        }",
             use_ime = false,
         }
       '';
diff --git a/home/programs/fish.nix b/home/programs/fish.nix
index 2e12e1f3..0bf6d340 100644
--- a/home/programs/fish.nix
+++ b/home/programs/fish.nix
@@ -35,9 +35,11 @@
     interactiveShellInit = ''
       ${pkgs.pfetch-rs}/bin/pfetch
       ${lib.optionalString (device.isLinux && !device.isNix) "source /etc/profile.d/nix-daemon.fish"}
-      if not set -q HYPRLAND_INSTANCE_SIGNATURE
-         set -x HYPRLAND_INSTANCE_SIGNATURE (hyprctl instances | head -1 | cut -d ' ' -f2 | tr -d :)
-      end
+      ${lib.optionalString device.isNix
+        ''          if not set -q HYPRLAND_INSTANCE_SIGNATURE
+                        set -x HYPRLAND_INSTANCE_SIGNATURE (hyprctl instances | head -1 | cut -d ' ' -f2 | tr -d :)
+                    end
+        ''}
     '';
   };
 }