diff --git a/modules/applications/default.nix b/modules/applications/default.nix
index 38f4869..7a154db 100644
--- a/modules/applications/default.nix
+++ b/modules/applications/default.nix
@@ -33,6 +33,7 @@
     ./wayland.nix
     ./zellij
     ./zoom.nix
+    ./zoxide.nix
     ./zsh
   ];
 }
diff --git a/modules/applications/zoxide.nix b/modules/applications/zoxide.nix
new file mode 100644
index 0000000..1456a40
--- /dev/null
+++ b/modules/applications/zoxide.nix
@@ -0,0 +1,20 @@
+{ lib, config, ... }:
+let
+  cfg = config.my.applications.zoxide;
+in
+{
+  options.my.applications.zoxide = {
+    enable = lib.mkEnableOption "zoxide smarter cd command";
+  };
+
+  config = lib.mkIf cfg.enable {
+    home-manager.sharedModules = [
+      {
+        programs.zoxide = {
+          enable = true;
+          enableZshIntegration = true;
+        };
+      }
+    ];
+  };
+}
diff --git a/modules/features/cli/shell.nix b/modules/features/cli/shell.nix
index 533c0e9..9877177 100644
--- a/modules/features/cli/shell.nix
+++ b/modules/features/cli/shell.nix
@@ -8,6 +8,9 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    my.applications.zsh.enable = true;
+    my.applications = {
+      zsh.enable = true;
+      zoxide.enable = true;
+    };
   };
 }