diff --git a/modules/home/apps/cli-apps/fish/default.nix b/modules/home/apps/cli-apps/fish/default.nix
index 0fae2e5..0d72f49 100644
--- a/modules/home/apps/cli-apps/fish/default.nix
+++ b/modules/home/apps/cli-apps/fish/default.nix
@@ -26,6 +26,7 @@ in {
           shellInit = "
 	zoxide init fish | source
 	starship init fish | source
+	source ~/.config/op/plugins.sh
 	";
           shellAliases = {
             vim = "nvim";
diff --git a/modules/nixos/apps/cli-apps/nixvim/default.nix b/modules/nixos/apps/cli-apps/nixvim/default.nix
index 10d83e3..6a85a93 100644
--- a/modules/nixos/apps/cli-apps/nixvim/default.nix
+++ b/modules/nixos/apps/cli-apps/nixvim/default.nix
@@ -26,6 +26,163 @@ in {
         relativenumber = true;
         shiftwidth = 2;
       };
+
+      keymaps = [
+        {
+          action = "<cmd>Ex<CR>";
+          key = "<leader>e";
+          options.desc = "Open Explorer";
+        }
+        {
+          mode = "n";
+          action = "<cmd>w<CR>";
+          key = "<C-s>";
+          options.desc = "Save";
+        }
+        {
+          mode = "n";
+          action = "<cmd>noh<CR>";
+          key = "<esc>";
+          options.silent = true;
+        }
+        {
+          mode = "n";
+          action = "<cmd>UndotreeToggle<CR>";
+          key = "<leader>ut";
+          options.desc = "Toggle Undotree";
+        }
+        {
+          mode = "n";
+          action = "<cmd>UndotreeToggle<CR>";
+          key = "<leader>uf";
+          options.desc = "Focus Undotree";
+        }
+      ];
+
+      plugins = {
+        telescope = {
+          enable = true;
+          keymaps = {
+            "<leader>sr" = {
+              action = "oldfiles";
+              desc = "[s]earch [r]ecent";
+            };
+
+            "<leader>sk" = {
+              action = "keymaps";
+              desc = "[s]earch [k]eys";
+            };
+
+            "<leader>sg" = {
+              action = "live_grep";
+              desc = "[s]earch [g]rep";
+            };
+          };
+        };
+
+	harpoon = {
+        enable = true;
+        enableTelescope = true;
+        keymaps = {
+          addFile = "<leader>a";
+          toggleQuickMenu = "<leader>ha";
+          navFile = {
+            "1" = "<C-1>";
+            "2" = "<C-2>";
+            "3" = "<C-3>";
+            "4" = "<C-4>";
+          };
+        };
+      };
+
+        treesitter = {
+          enable = true;
+        };
+
+        luasnip.enable = true;
+
+        lualine.enable = true;
+
+        lsp = {
+          enable = true;
+
+          servers = {
+            nixd.enable = true;
+          };
+          keymaps = {
+            lspBuf = {
+              "<leader>K" = "hover";
+              "<leader>gf" = "references";
+              "<leader>gd" = "definition";
+              "<leader>gi" = "implementation";
+              "<leader>gt" = "type_definition";
+            };
+          };
+        };
+
+        lsp-format = {
+          enable = true;
+          setup = {
+            nix = {
+            };
+          };
+        };
+
+        nvim-cmp = {
+          enable = true;
+          autoEnableSources = true;
+          sources = [
+            {
+              name = "nvim_lsp";
+            }
+            {
+              name = "luasnip";
+            }
+            {
+              name = "path";
+            }
+            {
+              name = "buffer";
+            }
+          ];
+          mapping = {
+            "<C-Space>" = "cmp.mapping.complete()";
+            "<C-e>" = "cmp.mapping.close()";
+            "<Tab>" = {
+              modes = ["i" "s"];
+              action = "cmp.mapping.select_next_item()";
+            };
+            "<S-Tab>" = {
+              modes = ["i" "s"];
+              action = "cmp.mapping.select_prev_item()";
+            };
+            "<CR>" = "cmp.mapping.confirm({ select = true })";
+          };
+        };
+
+
+	 rainbow-delimiters = {
+        enable = true;
+      };
+      nvim-colorizer.enable = true;
+
+      undotree.enable = true;
+
+      which-key = {
+        enable = true;
+        registrations = {
+          "<leader>K" = "Code hover";
+          "<leader>gf" = "Code references";
+          "<leader>gd" = "Code definitions";
+          "<leader>gi" = "Implementations";
+          "<leader>gt" = "Type definition";
+        };
+      };
+
+      trouble.enable = true;
+
+      markdown-preview.enable = true;
+      };
     };
   };
 }