diff --git a/home-manager/modules/sway/default.nix b/home-manager/modules/sway/default.nix
index 983ed4e..4490918 100644
--- a/home-manager/modules/sway/default.nix
+++ b/home-manager/modules/sway/default.nix
@@ -62,6 +62,8 @@ in
   programs.fish.loginShellInit = ''
     if [ -z $WAYLAND_DISPLAY ] && [ (tty) = /dev/tty1 ]
         export XDG_SESSION_TYPE="wayland" # otherwise set to tty
+        set -e __HM_SESS_VARS_SOURCED
+        set -e __NIXOS_SET_ENVIRONMENT_DONE
         exec systemd-cat -t sway sway
     end
   '';
diff --git a/modules/default.nix b/modules/default.nix
index 308fa72..317a247 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -8,6 +8,7 @@
   imports = [
     ./autologin.nix
     ./dji-goggles.nix
+    ./fish.nix
     ./fonts.nix
     ./kvm-switch-enable-screen.nix
     ./localization.nix
diff --git a/modules/fish.nix b/modules/fish.nix
new file mode 100644
index 0000000..958da57
--- /dev/null
+++ b/modules/fish.nix
@@ -0,0 +1,3 @@
+{
+  programs.fish.enable = true;
+}
diff --git a/modules/nix.nix b/modules/nix.nix
index 8585893..de06f9e 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -14,6 +14,10 @@
     daemonIOSchedPriority = 7;
 
     autoOptimiseStore = true;
+
+    nixPath = [
+      "nixpkgs=${inputs.nixpkgs}"
+    ];
   };
 
   nixpkgs.overlays = with inputs; [