feat(development/nixvim): moved NvimTree keybindings

3 files changed, 52 insertions, 41 deletions

diff --git a/modules/development/nixvim/keymaps.nix b/modules/development/nixvim/keymaps.nix
index 972429f..fee21e5 100644
--- a/modules/development/nixvim/keymaps.nix
+++ b/modules/development/nixvim/keymaps.nix
@@ -13,6 +13,7 @@
       action = "<nop>";
       options.desc = "Disable leader delay";
     }
+    # pane navigation
     {
       key = "<c-h>";
       action = "<c-w>h";
@@ -33,15 +34,7 @@
       action = "<c-w>l";
       options.desc = "Move to right window";
     }
-    {
-      key = "<c-n>";
-      action = "<cmd>NvimTreeToggle<cr>";
-      mode = [
-        "n"
-        "i"
-      ];
-      options.desc = "Toggle file explorer";
-    }
+    # scrolling
     {
       key = "<c-d>";
       action = "<c-d>zz";
diff --git a/modules/development/nixvim/plugins/nvim-tree.nix b/modules/development/nixvim/plugins/nvim-tree.nix
index 2f35e3c..67f61fd 100644
--- a/modules/development/nixvim/plugins/nvim-tree.nix
+++ b/modules/development/nixvim/plugins/nvim-tree.nix
@@ -1,43 +1,57 @@
 # File explorer sidebar
 { config, lib, ... }:
 {
-  config.programs.nixvim.plugins.nvim-tree = lib.mkIf config.development.nixvim.enable {
-    enable = true;
-    settings = {
-      filters = {
-        dotfiles = false;
-        git_clean = false;
-        no_buffer = false;
-        custom = { };
-      };
-      git = {
-        enable = true;
-        ignore = false;
-      };
-      view = {
-        width = 30;
-      };
-      renderer = {
-        indent_markers = {
+  config.programs.nixvim = lib.mkIf config.development.nixvim.enable {
+    plugins.nvim-tree = {
+      enable = true;
+      settings = {
+        filters = {
+          dotfiles = false;
+          git_clean = false;
+          no_buffer = false;
+          custom = { };
+        };
+        git = {
           enable = true;
-          inline_arrows = false;
-          icons = {
-            corner = "└";
-            edge = "│";
-            item = "├";
-            bottom = "─";
-            none = " ";
-          };
+          ignore = false;
+        };
+        view = {
+          width = 30;
         };
-        icons = {
-          show = {
-            folder = true;
-            folder_arrow = false;
-            file = true;
-            git = true;
+        renderer = {
+          indent_markers = {
+            enable = true;
+            inline_arrows = false;
+            icons = {
+              corner = "└";
+              edge = "│";
+              item = "├";
+              bottom = "─";
+              none = " ";
+            };
+          };
+          icons = {
+            show = {
+              folder = true;
+              folder_arrow = false;
+              file = true;
+              git = true;
+            };
           };
         };
       };
     };
+
+    keymaps = [
+      {
+        key = "<leader>nt";
+        action = "<cmd>NvimTreeToggle<cr>";
+        mode = [
+          "n"
+          "i"
+        ];
+        options.desc = "Toggle file explorer";
+      }
+    ];
   };
 }
diff --git a/modules/development/nixvim/plugins/which-key.nix b/modules/development/nixvim/plugins/which-key.nix
index e400edd..3a0c0ef 100644
--- a/modules/development/nixvim/plugins/which-key.nix
+++ b/modules/development/nixvim/plugins/which-key.nix
@@ -37,6 +37,10 @@
           __unkeyed-1 = "<leader>c";
           group = "+Comment";
         }
+        {
+          __unkeyed-1 = "<leader>n";
+          group = "+Explorer";
+        }
       ];
     };
   };