diff --git a/home/features/cli/fish.nix b/home/features/cli/fish.nix
index 300a455..5ae75a9 100644
--- a/home/features/cli/fish.nix
+++ b/home/features/cli/fish.nix
@@ -29,13 +29,9 @@
       set -x USER lu
       set -x SHELL (which fish)
       set -x TERM xterm-256color
-      set -x LANG en_US.UTF-8
-      set -x LC_ALL en_US.UTF-8
-      set -x LC_CTYPE en_US.UTF-8
-      set -x LANGUAGE en_US.UTF-8
     '';
 
-    shellAbbrs = {
+    shellAliases = {
       # General aliases
       c = "clear";
       ll = "ls -lahF --color=always";
@@ -49,7 +45,6 @@
       cp = "cp -r";
       scp = "scp -r";
       apt = "sudo apt";
-      doc = "sudo docker";
       docker = "sudo docker";
       sctl = "sudo systemctl";
       usctl = "systemctl --user";
@@ -97,12 +92,8 @@
       nd = "nix develop";
       ns = "nix shell";
       np = "nix profile";
-      ngc = "nix-collect-garbage";
-      hm = "home-manager";
-      hmreload = "cd ~/nix-config && home-manager switch --flake .#(whoami)@(hostname) && cd -";
-      hminplace = "home-manager switch --flake .#(whoami)@(hostname)";
-      nmreload = "cd ~/nix-config && sudo nixos-rebuild switch --flake .";
-      nminplace = "sudo nixos-rebuild switch --flake .";
+      ngc = "nh clean all --keep 3";
+      rebuild = "nh os switch";
     };
 
     plugins = [