diff --git a/hosts/imxyy-nix-wsl/home.nix b/hosts/imxyy-nix-wsl/home.nix
index 2bafada..0a83038 100644
--- a/hosts/imxyy-nix-wsl/home.nix
+++ b/hosts/imxyy-nix-wsl/home.nix
@@ -1,7 +1,12 @@
 { lib, username, ... }:
 {
-  my.hm.programs.zsh.shellAliases = {
-    localproxy_on = "export http_proxy=http://192.168.128.1:7890 https_proxy=http://192.168.128.1:7890 all_proxy=socks://192.168.128.1:7890";
+  my.hm = {
+    programs.zsh.shellAliases = {
+      localproxy_on = "export http_proxy=http://192.168.128.1:7890 https_proxy=http://192.168.128.1:7890 all_proxy=socks://192.168.128.1:7890";
+    };
+    programs.fish.shellAliases = {
+      localproxy_on = "export http_proxy=http://192.168.128.1:7890 https_proxy=http://192.168.128.1:7890 all_proxy=socks://192.168.128.1:7890";
+    };
   };
   my = {
     sops.sshKeyFile = "/home/${username}/.ssh/id_ed25519";
diff --git a/hosts/imxyy-nix-x16/home.nix b/hosts/imxyy-nix-x16/home.nix
index 87ed03f..e9b0dcd 100644
--- a/hosts/imxyy-nix-x16/home.nix
+++ b/hosts/imxyy-nix-x16/home.nix
@@ -30,6 +30,9 @@
         PATH = "/home/${username}/bin:$PATH";
       };
     };
+    programs.fish.interactiveShellInit = ''
+      set -gp PATH $HOME/bin
+    '';
 
     programs.niri.settings = {
       environment.STEAM_FORCE_DESKTOPUI_SCALING = "1.25";
diff --git a/hosts/imxyy-nix/home.nix b/hosts/imxyy-nix/home.nix
index 4269bfd..d677bc2 100644
--- a/hosts/imxyy-nix/home.nix
+++ b/hosts/imxyy-nix/home.nix
@@ -35,10 +35,16 @@
         no_proxy = "192.168.3.0/24";
         PATH = "/home/${username}/bin:$PATH";
       };
-      profileExtra = ''
-        if [ `tty` = "/dev/tty6" ]; then
-          clear
-        fi
+    };
+    programs.fish = {
+      shellAliases = {
+        cageterm = "cage -m DP-1 -s -- alacritty -o font.size=20";
+        cagefoot = "cage -m DP-1 -s -- foot --font=monospace:size=20";
+        cagekitty = "cage -m DP-1 -s -- kitty -o font_size=20";
+      };
+      interactiveShellInit = ''
+        set -g no_proxy "192.168.3.0/24"
+        set -gp PATH $HOME/bin
       '';
     };
 
diff --git a/modules/coding/langs/js.nix b/modules/coding/langs/js.nix
index 6f58db7..140dbde 100644
--- a/modules/coding/langs/js.nix
+++ b/modules/coding/langs/js.nix
@@ -27,7 +27,10 @@ in
         registry = https://registry.npmmirror.com
       '';
       programs.zsh.initContent = lib.mkAfter ''
-        export PATH=$PATH:$HOME/.npm-global/bin
+        export PATH=$HOME/.npm-global/bin:$PATH
+      '';
+      programs.fish.interactiveShellInit = ''
+        set -gp PATH $HOME/.npm-global/bin
       '';
     };
     my.persist.homeDirs = [
diff --git a/modules/coding/langs/rust.nix b/modules/coding/langs/rust.nix
index ee89d87..62060fe 100644
--- a/modules/coding/langs/rust.nix
+++ b/modules/coding/langs/rust.nix
@@ -38,7 +38,10 @@ in
         git-fetch-with-cli = true
       '';
       programs.zsh.initContent = lib.mkAfter ''
-        export PATH=$PATH:$HOME/.cargo/bin
+        export PATH=$HOME/.cargo/bin:$PATH
+      '';
+      programs.fish.interactiveShellInit = ''
+        set -gp PATH $HOME/.cargo/bin
       '';
     };
     my.persist.homeDirs = [
diff --git a/modules/core/user.nix b/modules/core/user.nix
index ccf23e6..ce31134 100644
--- a/modules/core/user.nix
+++ b/modules/core/user.nix
@@ -18,8 +18,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    programs.zsh.enable = true;
-
     sops.secrets.imxyy-nix-hashed-password = {
       sopsFile = secrets.imxyy-nix-hashed-password;
       format = "binary";