diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix
index 023e600..930f836 100644
--- a/home-manager/packages/packages.nix
+++ b/home-manager/packages/packages.nix
@@ -18,5 +18,7 @@
      vesktop
      kitty
      prismlauncher
+     fzf
+     zoxide
   ];
 }
diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix
index c9455d0..8034166 100644
--- a/home-manager/packages/zsh.nix
+++ b/home-manager/packages/zsh.nix
@@ -6,11 +6,7 @@
     enableCompletion = true;
     autosuggestion.enable = true;
     syntaxHighlighting.enable = true;
-    oh-my-zsh = {
-      enable = true;
-      plugins = [ "git" ];
-      theme = "af-magic";
-    };
+    autocd = true;
     shellAliases = {
       hm-switch = "home-manager switch --flake $HOME/.dotfiles"; 
       nx-switch = "sudo nixos-rebuild switch --flake $HOME/.dotfiles";
@@ -22,5 +18,40 @@
       snv = "sudo -E nvim";
       sen = "sudo -E";
     };
+
+    zplug = {
+      enable = true;
+      plugins = [
+        { name = "Aloxaf/fzf-tab"; }
+      ];
+    };
+
+    history = {
+      size = 5000;
+      save = 5000;
+      ignoreAllDups = true;
+      ignoreDups = true;
+      ignoreSpace = true;
+      share = true;
+    };
+
+    initExtra = ''
+      bindkey -v
+      bindkey '^k' history-search-backward
+      bindkey '^j' history-search-forward
+      setopt appendHistory
+      zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
+      zstyle ':completion:*' menu no
+      zstyle ':fzf-tab:complete:cd:*' fzf-preview 'ls --color $realpath'
+      zstyle ':fzf-tab:complete:__zoxide_z:*' fzf-preview 'ls --color $realpath'
+      eval "$(fzf --zsh)"
+      eval "$(zoxide init --cmd cd zsh)"
+    '';
+  };
+
+  programs.oh-my-posh = {
+    enable = true;
+    enableZshIntegration = true;
+    useTheme = "catppuccin_mocha";
   };
 }