diff --git a/modules/home/programs/shell/aliases.nix b/modules/home/programs/shell/aliases.nix
index d923fbe..a0ef510 100644
--- a/modules/home/programs/shell/aliases.nix
+++ b/modules/home/programs/shell/aliases.nix
@@ -8,51 +8,58 @@
   options.custom.programs.shell.aliases.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.custom.programs.shell.aliases.enable {
-    home.packages = [
-      pkgs.eza
-      pkgs.bat
-    ];
+    programs.zoxide = {
+      enable = true;
+      options = [ "--cmd cd" ];
+    };
+      
+    home = {
+      packages = [
+        pkgs.eza
+        pkgs.bat
+      ];
 
-    home.shellAliases =
-      let
-        lsAliases =
-          let
-            eza = [ "eza" "--header" "--group" "--time-style=long-iso" "--group-directories-first" "--sort=name" "--icons=auto" "--git" "--git-repos-no-status" "--binary" ];
-            aliasPartsToCommand =
-              aliasParts:
-              aliasParts
-              |> lib.filter (aliasPart: aliasPart != "")
-              |> lib.map (aliasPart:
+      shellAliases =
+        let
+          lsAliases =
+            let
+              eza = [ "eza" "--header" "--group" "--time-style=long-iso" "--group-directories-first" "--sort=name" "--icons=auto" "--git" "--git-repos-no-status" "--binary" ];
+              aliasPartsToCommand =
+                aliasParts:
+                aliasParts
+                |> lib.filter (aliasPart: aliasPart != "")
+                |> lib.map (aliasPart:
+                  {
+                    "l" = "--oneline --dereference";
+                    "ll" = "--long";
+                    "lt" = "--tree";
+                    "a" = "--all";
+                    "d" = "--only-dirs";
+                    "f" = "--only-files";
+                  }
+                  .${aliasPart})
+                |> (flags: eza ++ flags)
+                |> lib.concatStringsSep " ";
+            in
+              { format = [ "l" "ll" "lt" ]; visibility = [ "" "a" ]; restriction = [ "" "d" "f" ]; }
+              |> lib.mapCartesianProduct ({ format, visibility, restriction, }: [ format visibility restriction ])
+              |> lib.map (aliasParts: lib.nameValuePair (lib.concatStrings aliasParts) (aliasPartsToCommand aliasParts))
+              |> lib.listToAttrs;
+        in 
+        lsAliases // {
+          ls = "l";
+          btm = "btm --group_processes";
+          cat =
+            let
+              theme =
                 {
-                  "l" = "--oneline --dereference";
-                  "ll" = "--long";
-                  "lt" = "--tree";
-                  "a" = "--all";
-                  "d" = "--only-dirs";
-                  "f" = "--only-files";
+                  dark = "";
+                  light = "GitHub";
                 }
-                .${aliasPart})
-              |> (flags: eza ++ flags)
-              |> lib.concatStringsSep " ";
-          in
-            { format = [ "l" "ll" "lt" ]; visibility = [ "" "a" ]; restriction = [ "" "d" "f" ]; }
-            |> lib.mapCartesianProduct ({ format, visibility, restriction, }: [ format visibility restriction ])
-            |> lib.map (aliasParts: lib.nameValuePair (lib.concatStrings aliasParts) (aliasPartsToCommand aliasParts))
-            |> lib.listToAttrs;
-      in 
-      lsAliases // {
-        ls = "l";
-        btm = "btm --group_processes";
-        cat =
-          let
-            theme =
-              {
-                dark = "";
-                light = "GitHub";
-              }
-              .${config.custom.theme};
-          in
-          "bat --plain --theme=${theme}";
-      };
+                .${config.custom.theme};
+            in
+            "bat --plain --theme=${theme}";
+        };
+    };
   };
 }
diff --git a/modules/home/programs/shell/zsh/default.nix b/modules/home/programs/shell/zsh/default.nix
index 58abbc6..7eff80f 100644
--- a/modules/home/programs/shell/zsh/default.nix
+++ b/modules/home/programs/shell/zsh/default.nix
@@ -44,11 +44,6 @@
 
       fzf.enable = true;
 
-      zoxide = {
-        enable = true;
-        options = [ "--cmd cd" ];
-      };
-
       direnv = {
         enable = true;
         nix-direnv.enable = true;