diff --git a/home-manager/packages/default.nix b/home-manager/packages/default.nix
index d8714cde2..bce1432bb 100644
--- a/home-manager/packages/default.nix
+++ b/home-manager/packages/default.nix
@@ -41,6 +41,7 @@ with pkgs;
   gh
   google-cloud-sdk
   git
+  glance
   glow
   gnumake
   gping
@@ -67,7 +68,6 @@ with pkgs;
   procs
   # qwen-code  # FIXME: npmDepsHash is stale in nixpkgs, uncomment when fixed
   ripgrep
-  rustup
   sccache
   sd
   shellcheck
diff --git a/home-manager/programs/bash/default.nix b/home-manager/programs/bash/default.nix
index 88d15e56b..76023fe34 100644
--- a/home-manager/programs/bash/default.nix
+++ b/home-manager/programs/bash/default.nix
@@ -43,6 +43,7 @@
       # Add additional bin paths
       export PATH="$PATH:$GOPATH/bin"
       export PATH="$HOME/.bun/bin:$PATH"
+      export PATH="$HOME/.cargo/bin:$PATH"
       export PATH="$HOME/.foundry/bin:$PATH"
       export PATH="$HOME/.local/bin:$PATH"
       export PATH="$HOME/.nix-profile/bin:$PATH"
diff --git a/home-manager/programs/fish/default.nix b/home-manager/programs/fish/default.nix
index 7147f438a..1f1d597ef 100644
--- a/home-manager/programs/fish/default.nix
+++ b/home-manager/programs/fish/default.nix
@@ -12,14 +12,20 @@
       if test (uname) = "Linux"
           set -gx XDG_RUNTIME_DIR /run/user/(id -u)
       end
+
+      # Go configuration
+      set -gx GOPATH $HOME/go
+
       direnv hook fish | source
     '';
     loginShellInit = ''
       fish_add_path -p ~/.local/bin
       fish_add_path -p ~/.bun/bin
+      fish_add_path -p ~/.cargo/bin
+      fish_add_path -p ~/.foundry/bin
       fish_add_path -p ~/.nix-profile/bin
+      fish_add_path -p ~/go/bin
       fish_add_path -p /nix/var/nix/profiles/default/bin
-      fish_add_path -p ~/.foundry/bin
       fish_add_path -p /opt/homebrew/bin
       fish_add_path -p /opt/homebrew/opt/postgresql@18/bin
       fish_add_path -p /etc/profiles/per-user/${config.home.username}/bin
@@ -31,9 +37,11 @@
       set fish_theme dracula
       fish_add_path -p ~/.local/bin
       fish_add_path -p ~/.bun/bin
+      fish_add_path -p ~/.cargo/bin
+      fish_add_path -p ~/.foundry/bin
       fish_add_path -p ~/.nix-profile/bin
+      fish_add_path -p ~/go/bin
       fish_add_path -p /nix/var/nix/profiles/default/bin
-      fish_add_path -p ~/.foundry/bin
       fish_add_path -p /opt/homebrew/bin
       fish_add_path -p /opt/homebrew/opt/postgresql@18/bin
       fish_add_path -p /etc/profiles/per-user/${config.home.username}/bin
@@ -54,7 +62,6 @@
       j = "jj";
       lzd = "lazydocker";
       lzg = "lazygit";
-      sag = "_ssh_add_github";
       ta = "tmux new -A -s default";
       v = "nvim";
 
@@ -66,16 +73,6 @@
       coxel = "_coxel_function";
       coxelh = "_coxelh_function";
       dev = "_dev_function";
-      ocxe = "_ocxe_function";
-      ocxeh = "_ocxeh_function";
-      gco = "_gco_function";
-      grco = "_grco_function";
-      grcr = "_grcr_function";
-      kyber = "_kyber_function";
-      kyberd = "_kyberd_function";
-      kyberm = "_kyberm_function";
-      zdo = "_zdo_function";
-      zmo = "_zmo_function";
       fch = "_fzf_cmd_history --allow-execute";
       fdp = "_fzf_directory_picker --allow-cd --prompt-name Projects ~/";
       ffp = "_fzf_file_picker --allow-open-in-editor --prompt-name Files";
@@ -83,7 +80,18 @@
       fgb = "_fzf_git_branch";
       fgw = "_fzf_git_worktree";
       fhq = "_fzf_ghq_picker";
+      gco = "_gco_function";
+      grco = "_grco_function";
+      grcr = "_grcr_function";
+      kyber = "_kyber_function";
+      kyberd = "_kyberd_function";
+      kyberm = "_kyberm_function";
+      ocxe = "_ocxe_function";
+      ocxeh = "_ocxeh_function";
+      sag = "_ssh_add_github";
       shortcuts = "_fish_shortcuts";
+      zdo = "_zdo_function";
+      zmo = "_zmo_function";
     };
     plugins = [
       {
diff --git a/home-manager/programs/lazydocker/default.nix b/home-manager/programs/lazydocker/default.nix
index 049207434..9a759e122 100644
--- a/home-manager/programs/lazydocker/default.nix
+++ b/home-manager/programs/lazydocker/default.nix
@@ -1,4 +1,4 @@
 { pkgs, ... }:
 {
-  home.packages = [ pkgs.lazydocker ];
+  home.packages = with pkgs; [ pkgs.lazydocker ];
 }
diff --git a/home-manager/programs/rust/default.nix b/home-manager/programs/rust/default.nix
index 9bd5d39eb..71f6928bf 100644
--- a/home-manager/programs/rust/default.nix
+++ b/home-manager/programs/rust/default.nix
@@ -1,5 +1,6 @@
+{ pkgs, ... }:
 {
-  programs.fish.interactiveShellInit = ''
-    fish_add_path -p ~/.cargo/bin/
-  '';
+  home.packages = with pkgs; [
+    rustup
+  ];
 }
diff --git a/home-manager/programs/zsh/default.nix b/home-manager/programs/zsh/default.nix
index a241e440c..37f5b0fb3 100644
--- a/home-manager/programs/zsh/default.nix
+++ b/home-manager/programs/zsh/default.nix
@@ -35,6 +35,7 @@
       # Additional bin paths
       export PATH="$PATH:$GOPATH/bin"
       export PATH="$HOME/.bun/bin:$PATH"
+      export PATH="$HOME/.cargo/bin:$PATH"
       export PATH="$HOME/.foundry/bin:$PATH"
       export PATH="$HOME/.local/bin:$PATH"
       export PATH="$HOME/.nix-profile/bin:$PATH"