diff --git a/users/profiles/cli/default.nix b/users/profiles/cli/default.nix
index 1bd82529..653ce8de 100644
--- a/users/profiles/cli/default.nix
+++ b/users/profiles/cli/default.nix
@@ -66,6 +66,7 @@
     enableAutosuggestions = true;
 
     initExtra = ''
+      bindkey -v
       flakify() {
         if [ ! -e flake.nix ]; then
           nix flake new -t github:nix-community/nix-direnv .
@@ -75,11 +76,64 @@
         fi
         vim flake.nix
       }
+      autopair-init
     '';
     sessionVariables = {
       EDITOR = "nvim";
     };
+    plugins = [
+      # {
+      #   name = "zsh-autocomplete";
+      #   src = pkgs.fetchFromGitHub {
+      #     owner = "marlonrichert";
+      #     repo = "zsh-autocomplete";
+      #     rev = "22.01.21";
+      #     sha256 = "+UziTYsjgpiumSulrLojuqHtDrgvuG91+XNiaMD7wIs=";
+      #   };
+      # }
+      {
+        name = "zsh-autopair";
+        src = pkgs.fetchFromGitHub {
+          owner = "hlissner";
+          repo = "zsh-autopair";
+          rev = "34a8bca0c18fcf3ab1561caef9790abffc1d3d49";
+          sha256 = "1h0vm2dgrmb8i2pvsgis3lshc5b0ad846836m62y8h3rdb3zmpy1";
+        };
+        file = "autopair.zsh";
+      }
+      {
+        name = "zsh-syntax-highlighting";
+        src = pkgs.fetchFromGitHub {
+          owner = "zsh-users";
+          repo = "zsh-syntax-highlighting";
+          rev = "0.6.0";
+          sha256 = "0zmq66dzasmr5pwribyh4kbkk23jxbpdw4rjxx0i7dx8jjp2lzl4";
+        };
+        file = "zsh-syntax-highlighting.zsh";
+      }
+      {
+        name = "zsh-autoquoter";
+        src = pkgs.fetchFromGitHub {
+          owner = "ianthehenry";
+          repo = "zsh-autoquoter";
+          rev = "819a615fbfd2ad25c5d311080e3a325696b45de7";
+          sha256 = "r0jdo+YFTOejvNMTqzXi5ftcLzDpuKejX0wMFwqKdJY=";
+        };
+        file = "zsh-autoquoter.zsh";
+      }
+      {
+        name = "zsh-nix-shell";
+        file = "nix-shell.plugin.zsh";
+        src = pkgs.fetchFromGitHub {
+          owner = "chisui";
+          repo = "zsh-nix-shell";
+          rev = "v0.5.0";
+          sha256 = "0za4aiwwrlawnia4f29msk822rj9bgcygw6a8a6iikiwzjjz0g91";
+        };
+      }
+    ];
   };
+
   programs.starship = {
     enable = true;
     enableZshIntegration = true;
@@ -93,6 +147,13 @@
   programs.direnv = {
     enable = true;
     enableZshIntegration = true;
+    nix-direnv.enable = true;
+    nix-direnv.enableFlakes = true;
+  };
+
+  programs.zoxide = {
+    enable = true;
+    enableZshIntegration = true;
   };
 
   services.kdeconnect.enable = true;