Neovim: Update neovim module

home/modules/neovim/keybinds.nix

@@ -2,8 +2,8 @@
   lib,
   mylib,
   ...
-}: [
+}: let
-  # No Leader
+  no-leader = [
     {
       mode = "n";
       key = "<C-s>";
@@ -44,43 +44,43 @@
       mode = "n";
       key = "<C-d>";
       action = "<C-d>zz";
-    options.desc = "Jump down";
+      options.desc = "Jump down (centered)";
     }
     {
       mode = "n";
       key = "<C-u>";
       action = "<C-u>zz";
-    options.desc = "Jump up";
+      options.desc = "Jump up (centered)";
     }
     {
       mode = "n";
       key = "n";
       action = "nzzzv";
-    options.desc = "Next match";
+      options.desc = "Next match (centered)";
     }
     {
       mode = "n";
       key = "N";
       action = "Nzzzv";
-    options.desc = "Previous match";
+      options.desc = "Previous match (centered)";
     }
     {
       mode = "i";
       key = "<Tab>";
       action = "<cmd>lua require('intellitab').indent()<CR>";
-    options.desc = "Indent";
+      options.desc = "Indent (IntelliTab)";
     }
     {
       mode = "i";
       key = "<C-BS>";
       action = "<C-w>";
-    options.desc = "Delete previous word";
+      options.desc = "Delete previous word"; # TODO: Breaks backspace <C-v><S-i> multiline cursor?
     }
     {
       mode = "i";
       key = "<M-BS>";
       action = "<C-w>";
-    options.desc = "Delete previous word";
+      options.desc = "Delete previous word"; # TODO: Breaks backspace <C-v><S-i> multiline cursor?
     }
     {
       mode = "i";
@@ -112,20 +112,9 @@
       action = "<cmd>lua vim.lsp.buf.hover()<CR>";
       options.desc = "Show LSP hover";
     }
+  ];
 
-  # General <leader>
+  leader = [
-  {
-    mode = "n";
-    key = "<leader>qq";
-    action = "<cmd>quitall<CR>";
-    options.desc = "Quit";
-  }
-  {
-    mode = "n";
-    key = "<leader>q!";
-    action = "<cmd>quitall!<CR>";
-    options.desc = "Forceful quit";
-  }
     {
       mode = "n";
       key = "<leader>L";
@@ -222,15 +211,29 @@
       action = "<cmd>Telescope help_tags<CR>";
       options.desc = "Show help tags";
     }
+  ];
 
-  # Quit <leader>q
+  leader-quit = [
     {
       mode = "n";
       key = "<leader>q";
       action = "+quit";
     }
+    {
+      mode = "n";
+      key = "<leader>qq";
+      action = "<cmd>quitall<CR>";
+      options.desc = "Quit";
+    }
+    {
+      mode = "n";
+      key = "<leader>q!";
+      action = "<cmd>quitall!<CR>";
+      options.desc = "Quit forcefully";
+    }
+  ];
 
-  # Buffers <leader>b
+  leader-buffers = [
     {
       mode = "n";
       key = "<leader>b";
@@ -260,8 +263,9 @@
       action = "<cmd>Bdelete<CR>";
       options.desc = "Close current buffer";
     }
+  ];
 
-  # Windows <leader>w
+  leader-windows = [
     {
       mode = "n";
       key = "<leader>w";
@@ -279,18 +283,18 @@
       action = "<C-w>v";
       options.desc = "Split window vertically";
     }
+    {
+      mode = "n";
+      key = "<leader>w=";
+      action = "<C-w>=";
+      options.desc = "Balance windows";
+    }
     {
       mode = "n";
       key = "<leader>wd";
       action = "<C-w>c";
       options.desc = "Close current window";
     }
-  # {
-  #   mode = "n";
-  #   key = "<leader>wh";
-  #   action = "<C-W>s";
-  #   options.desc = "Split window horizontally";
-  # }
     {
       mode = "n";
       key = "<leader>wh";
@@ -321,25 +325,26 @@
       action = "<C-w>p";
       options.desc = "Goto other window";
     }
+  ];
 
-  # Toggles <leader>t
+  leader-toggles = [
     {
       mode = "n";
       key = "<leader>t";
       action = "+toggle";
     }
-  # {
-  #   mode = "n";
-  #   key = "<leader>tt";
-  #   action = "<cmd>Neotree action=show toggle=true<CR>";
-  #   options.desc = "Toggle NeoTree";
-  # }
     {
       mode = "n";
       key = "<leader>tt";
-    action = "<cmd>CHADopen --nofocus<CR>";
+      action = "<cmd>Neotree action=show toggle=true<CR>";
-    options.desc = "Toggle CHADtree";
+      options.desc = "Toggle NeoTree";
     }
+    # {
+    #   mode = "n";
+    #   key = "<leader>tt";
+    #   action = "<cmd>CHADopen --nofocus<CR>";
+    #   options.desc = "Toggle CHADtree";
+    # }
     {
       mode = "n";
       key = "<leader>tn";
@@ -352,18 +357,9 @@
       action = "<cmd>TroubleToggle focus=false<CR>";
       options.desc = "Toggle Trouble";
     }
-  # {
+  ];
-  #   mode = "n";
-  #   key = "<leader>tg";
-  #   action = "<cmd>LazyGit<CR>";
-  # }
-  # {
-  #   mode = "n";
-  #   key = "<leader>tp";
-  #   action = "<cmd>TroubleToggle<CR>";
-  # }
 
-  # Git <leader>g
+  leader-git = [
     {
       mode = "n";
       key = "<leader>g";
@@ -381,11 +377,6 @@
       action = "<cmd>GitMessenger<CR>";
       options.desc = "Show GitMessenger";
     }
-  # {
-  #   mode = "n";
-  #   key = "<leader>gs";
-  #   action = "<cmd>Git status<CR>";
-  # }
     {
       mode = "n";
       key = "<leader>gs";
@@ -410,8 +401,9 @@
       action = "<cmd>Telescope git_bcommits<CR>";
       options.desc = "Show Git log for current file";
     }
+  ];
 
-  # LSP <leader>l
+  leader-lsp = [
     {
       mode = "n";
       key = "<leader>l";
@@ -453,8 +445,9 @@
       action = "<cmd>Telescope lsp_outgoing_calls<CR>";
       options.desc = "Show outgoing calls";
     }
+  ];
 
-  # Code <leader>c
+  leader-code = [
     {
       mode = "n";
       key = "<leader>c";
@@ -490,4 +483,16 @@
       action = "<cmd>lua vim.diagnostic.open_float()<CR>";
       options.desc = "Show LSP line diagnostics";
     }
-]
+  ];
+in
+  builtins.concatLists [
+    no-leader
+    leader
+    leader-quit
+    leader-buffers
+    leader-windows
+    leader-toggles
+    leader-git
+    leader-lsp
+    leader-code
+  ]

home/modules/neovim/neovide_config.ini

@@ -1,6 +1,6 @@
 fork = true # Start neovide detached
 frame = "none" # full, buttonless, none
 idle = true # Don't render frames without changes
-# maximized = true
 title-hidden = true
+# maximized = true
 # vsync = true