a lot of changes

1 files changed, 84 insertions, 24 deletions

diff --git a/hm/editors/nixvim.nix b/hm/editors/nixvim.nix
index b4d24a7..51fdf95 100644
--- a/hm/editors/nixvim.nix
+++ b/hm/editors/nixvim.nix
@@ -17,23 +17,84 @@ in
       waylandSupport = true;
       colorschemes.gruvbox.enable = true;
 
+      globals.mapleader = " ";
+
+      keymaps = [
+        {
+          # mode = [ "n" "i" "v" ];
+          key = "<F1>";
+          action = "<NOP>";
+          options.silent = true;
+        }
+        {
+          mode = "n";
+          key = "<leader>ff";
+          action = "<cmd>Telescope find_files<CR>";
+          options.desc = "Find Files";
+        }
+        {
+          mode = "n";
+          key = "<leader>fg";
+          action = "<cmd>Telescope live_grep<CR>";
+          options.desc = "Live Grep";
+        }
+        {
+          mode = "n";
+          key = "<leader>ma";
+          action = "<cmd>MCpattern<CR>";
+          options.desc = "Select all matches of pattern";
+        }
+        {
+          mode = "n";
+          key = "<leader>ha";
+          action = ''<cmd>lua require("harpoon.mark").add_file()<CR>'';
+          options.desc = "Harpoon: Mark File";
+        }
+        {
+          mode = "n";
+          key = "<leader>hh";
+          action = ''<cmd>lua require("harpoon.ui").toggle_quick_menu()<CR>'';
+          options.desc = "Harpoon: Show Menu";
+        }
+        {
+          mode = "n";
+          key = "<leader>xx";
+          action = "<cmd>Trouble diagnostics toggle<CR>";
+          options.desc = "Toggle Trouble (Diagnostics)";
+        }
+      ];
+
        plugins = {
-         lualine.enable = true;
+         lualine = {
+           enable = true;
+           settings.options.theme = "gruvbox-material";
+         };
+         multicursors.enable = true;
+        treesitter-context = {
+          enable = true;
+          settings = {
+            max_lines = 2;
+            trim_scope = "outer";
+          };
+        };
          oil.enable = true;
-         lazygit.enable = true;
          persistence.enable = true;
          nvim-autopairs.enable = true;
          neoscroll.enable = true;
          bufferline.enable = true;
          web-devicons.enable = true;
 
+         blink-cmp.enable = true;
+         gitsigns.enable = true;
+         which-key.enable = true;
+         harpoon = {
+           enable = true;
+           enableTelescope = true;
+         };
+         toggleterm.enable = true;
          treesitter = {
            enable = true;
-           settings = {
-            indent.enable = true;
-           };
          };
-
          telescope = {
            enable = true;
            extensions = {
@@ -43,28 +104,27 @@ in
             };
           };
 
-        notify = {
+        noice.enable = true;
+        dressing.enable = true;
+        trouble.enable = true;
+        conform-nvim = {
           enable = true;
-          settings = {
-            backgroundColour = "#1e1e2e";
-            fps = 60;
-            render = "default";
-            timeout = 500;
-            topDown = true;
+          settings.format_on_save = {
+            lsp_fallback = true;
+            timeout_ms = 500;
           };
         };
 
-         hardtime = {
-           # enable = true;
-           settings = {
-             # disableMouse = true;
-             # enabled = false;
-             restrictionMode = "hint";
-             hint = true;
-             maxCount = 40;
-             maxTime = 1000;
-           };
-         };
+        # notify = {
+        #   enable = true;
+        #   settings = {
+        #     backgroundColour = "#1e1e2e";
+        #     fps = 60;
+        #     render = "default";
+        #     timeout = 500;
+        #     topDown = true;
+        #   };
+        # };
 
          nix.enable = true;
          lsp = {