treewide: standardize unkeyed

khaneliman · Jan 13, 2025 · f1b6cc6 · f1b6cc6
1 parent 0619717
commit f1b6cc6
Show file tree

Hide file tree

Showing 21 changed files with 55 additions and 55 deletions.
diff --git a/modules/nixvim/keymappings.nix b/modules/nixvim/keymappings.nix
@@ -379,15 +379,15 @@
 
   plugins.which-key.settings.spec = [
     {
-      __unkeyed = "<leader>w";
+      __unkeyed-1 = "<leader>w";
       icon = "";
     }
     {
-      __unkeyed = "<leader>W";
+      __unkeyed-1 = "<leader>W";
       icon = "󰽃";
     }
     {
-      __unkeyed = "<leader>/";
+      __unkeyed-1 = "<leader>/";
       icon = "";
     }
   ];

diff --git a/modules/nixvim/plugins/codesnap.nix b/modules/nixvim/plugins/codesnap.nix
@@ -35,7 +35,7 @@
 
     which-key.settings.spec = lib.optionals config.plugins.codesnap.enable [
       {
-        __unkeyed = "<leader>c";
+        __unkeyed-1 = "<leader>c";
         mode = "v";
         group = "Codesnap";
         icon = "󰄄 ";

diff --git a/modules/nixvim/plugins/comment-box.nix b/modules/nixvim/plugins/comment-box.nix
@@ -37,7 +37,7 @@
 
     which-key.settings.spec = lib.optionals config.plugins.comment-box.enable [
       {
-        __unkeyed = "<leader>C";
+        __unkeyed-1 = "<leader>C";
         group = "Comment-box";
         icon = " ";
       }

diff --git a/modules/nixvim/plugins/compiler.nix b/modules/nixvim/plugins/compiler.nix
@@ -18,7 +18,7 @@
 
     which-key.settings.spec = lib.optionals config.plugins.compiler.enable [
       {
-        __unkeyed = "<leader>R";
+        __unkeyed-1 = "<leader>R";
         group = "Compiler";
         icon = "";
       }

diff --git a/modules/nixvim/plugins/copilot.nix b/modules/nixvim/plugins/copilot.nix
@@ -29,7 +29,7 @@
 
     which-key.settings.spec = lib.optionals config.plugins.copilot-chat.enable [
       {
-        __unkeyed = "<leader>a";
+        __unkeyed-1 = "<leader>a";
         group = "Copilot";
         icon = "";
       }

diff --git a/modules/nixvim/plugins/dap.nix b/modules/nixvim/plugins/dap.nix
@@ -262,7 +262,7 @@ in
 
     which-key.settings.spec = lib.optionals config.plugins.dap.extensions.dap-ui.enable [
       {
-        __unkeyed = "<leader>d";
+        __unkeyed-1 = "<leader>d";
         mode = "n";
         desc = "Debug";
         # icon = " ";

diff --git a/modules/nixvim/plugins/git-conflict.nix b/modules/nixvim/plugins/git-conflict.nix
@@ -34,7 +34,7 @@
 
     which-key.settings.spec = lib.optionals config.plugins.git-conflict.enable [
       {
-        __unkeyed = "<leader>gc";
+        __unkeyed-1 = "<leader>gc";
         group = "Conflicts";
         icon = "";
       }

diff --git a/modules/nixvim/plugins/git-worktree.nix b/modules/nixvim/plugins/git-worktree.nix
@@ -19,7 +19,7 @@ in
 
     which-key.settings.spec = lib.optionals (cfg.enableTelescope && cfg.enable) [
       {
-        __unkeyed = "<leader>gW";
+        __unkeyed-1 = "<leader>gW";
         group = "Worktree";
         icon = "󰙅 ";
       }

diff --git a/modules/nixvim/plugins/glance.nix b/modules/nixvim/plugins/glance.nix
@@ -17,7 +17,7 @@
 
     which-key.settings.spec = lib.optionals config.plugins.glance.enable [
       {
-        __unkeyed = "<leader>lg";
+        __unkeyed-1 = "<leader>lg";
         group = "Glance";
         icon = "󰍉";
       }

diff --git a/modules/nixvim/plugins/glow.nix b/modules/nixvim/plugins/glow.nix
@@ -27,7 +27,7 @@ in
 
     which-key.settings.spec = [
       {
-        __unkeyed = "<leader>p";
+        __unkeyed-1 = "<leader>p";
         mode = "n";
         group = "Preview";
         icon = " ";

diff --git a/modules/nixvim/plugins/hardtime.nix b/modules/nixvim/plugins/hardtime.nix
@@ -21,7 +21,7 @@ in
 
     which-key.settings.spec = lib.optionals config.plugins.hardtime.enable [
       {
-        __unkeyed = "<leader>v";
+        __unkeyed-1 = "<leader>v";
         mode = "n";
         group = "Vim training";
         icon = "󱛊";

diff --git a/modules/nixvim/plugins/harpoon.nix b/modules/nixvim/plugins/harpoon.nix
@@ -20,32 +20,32 @@
 
     which-key.settings.spec = lib.optionals config.plugins.harpoon.enable [
       {
-        __unkeyed = "<leader>h";
+        __unkeyed-1 = "<leader>h";
         group = "Harpoon";
         icon = "󱡀 ";
       }
       {
-        __unkeyed = "<leader>ha";
+        __unkeyed-1 = "<leader>ha";
         desc = "Add";
       }
       {
-        __unkeyed = "<leader>he";
+        __unkeyed-1 = "<leader>he";
         desc = "QuickMenu";
       }
       {
-        __unkeyed = "<leader>hj";
+        __unkeyed-1 = "<leader>hj";
         desc = "1";
       }
       {
-        __unkeyed = "<leader>hk";
+        __unkeyed-1 = "<leader>hk";
         desc = "2";
       }
       {
-        __unkeyed = "<leader>hl";
+        __unkeyed-1 = "<leader>hl";
         desc = "3";
       }
       {
-        __unkeyed = "<leader>hm";
+        __unkeyed-1 = "<leader>hm";
         desc = "4";
       }
     ];

diff --git a/modules/nixvim/plugins/iron.nix b/modules/nixvim/plugins/iron.nix
@@ -64,12 +64,12 @@
     lib.optionals (builtins.elem pkgs.vimPlugins.iron-nvim config.extraPlugins)
       [
         {
-          __unkeyed = "<leader>s";
+          __unkeyed-1 = "<leader>s";
           group = "REPL Send";
           icon = "󱠥";
         }
         {
-          __unkeyed = "<leader>m";
+          __unkeyed-1 = "<leader>m";
           group = "REPL Mark";
           icon = "󱠥";
         }

diff --git a/modules/nixvim/plugins/lsp.nix b/modules/nixvim/plugins/lsp.nix
@@ -133,52 +133,52 @@ in
 
     which-key.settings.spec = [
       {
-        __unkeyed = "<leader>l";
+        __unkeyed-1 = "<leader>l";
         group = "LSP";
         icon = " ";
       }
       {
-        __unkeyed = "<leader>la";
+        __unkeyed-1 = "<leader>la";
         desc = "Code Action";
       }
       {
-        __unkeyed = "<leader>ld";
+        __unkeyed-1 = "<leader>ld";
         desc = "Definition";
       }
       {
-        __unkeyed = "<leader>lD";
+        __unkeyed-1 = "<leader>lD";
         desc = "References";
       }
       {
-        __unkeyed = "<leader>lf";
+        __unkeyed-1 = "<leader>lf";
         desc = "Format";
       }
       {
-        __unkeyed = "<leader>l[";
+        __unkeyed-1 = "<leader>l[";
         desc = "Prev";
       }
       {
-        __unkeyed = "<leader>l]";
+        __unkeyed-1 = "<leader>l]";
         desc = "Next";
       }
       {
-        __unkeyed = "<leader>lt";
+        __unkeyed-1 = "<leader>lt";
         desc = "Type Definition";
       }
       {
-        __unkeyed = "<leader>li";
+        __unkeyed-1 = "<leader>li";
         desc = "Implementation";
       }
       {
-        __unkeyed = "<leader>lh";
+        __unkeyed-1 = "<leader>lh";
         desc = "Lsp Hover";
       }
       {
-        __unkeyed = "<leader>lH";
+        __unkeyed-1 = "<leader>lH";
         desc = "Diagnostic Hover";
       }
       {
-        __unkeyed = "<leader>lr";
+        __unkeyed-1 = "<leader>lr";
         desc = "Rename";
       }
     ];

diff --git a/modules/nixvim/plugins/lualine.nix b/modules/nixvim/plugins/lualine.nix
@@ -48,7 +48,7 @@ in
 
           # Show active language server
           {
-            __unkeyed.__raw = ''
+            __unkeyed-1.__raw = ''
               function()
                   local msg = ""
                   local buf_ft = vim.api.nvim_buf_get_option(0, 'filetype')
@@ -75,7 +75,7 @@ in
 
         lualine_y = [
           {
-            __unkeyed = "aerial";
+            __unkeyed-1 = "aerial";
             inherit cond;
 
             # -- The separator to be used to separate symbols in status line.
@@ -101,7 +101,7 @@ in
 
         lualine_z = [
           {
-            __unkeyed = "location";
+            __unkeyed-1 = "location";
             inherit cond;
           }
         ];
@@ -111,7 +111,7 @@ in
         lualine_a = [
           # NOTE: not high priority since i use bufferline now, but should fix left separator color
           {
-            __unkeyed = "buffers";
+            __unkeyed-1 = "buffers";
             symbols = {
               alternate_file = "";
             };
@@ -123,15 +123,15 @@ in
       winbar = {
         lualine_c = [
           {
-            __unkeyed = "navic";
+            __unkeyed-1 = "navic";
             inherit cond;
           }
         ];
 
         # TODO: Need to dynamically hide/show component so navic takes precedence on smaller width
         lualine_x = [
           {
-            __unkeyed = "filename";
+            __unkeyed-1 = "filename";
             newfile_status = true;
             path = 3;
             # Shorten path names to fit navic component

diff --git a/modules/nixvim/plugins/mini-map.nix b/modules/nixvim/plugins/mini-map.nix
@@ -7,11 +7,11 @@
       modules = {
         map = {
           # __raw = lua code
-          # __unkeyed.* = no key, just the value
+          # __unkeyed-1.* = no key, just the value
           integrations = {
-            "__unkeyed.builtin_search".__raw = "require('mini.map').gen_integration.builtin_search()";
-            "__unkeyed.gitsigns".__raw = "require('mini.map').gen_integration.gitsigns()";
-            "__unkeyed.diagnostic".__raw = "require('mini.map').gen_integration.diagnostic()";
+            "__unkeyed-1.builtin_search".__raw = "require('mini.map').gen_integration.builtin_search()";
+            "__unkeyed-2.gitsigns".__raw = "require('mini.map').gen_integration.gitsigns()";
+            "__unkeyed-3.diagnostic".__raw = "require('mini.map').gen_integration.diagnostic()";
           };
 
           window = {

diff --git a/modules/nixvim/plugins/persistence.nix b/modules/nixvim/plugins/persistence.nix
@@ -7,7 +7,7 @@
 
     which-key.settings.spec = lib.optionals config.plugins.persistence.enable [
       {
-        __unkeyed = "<leader>P";
+        __unkeyed-1 = "<leader>P";
         group = "Persistence";
         icon = "󰘛";
       }

diff --git a/modules/nixvim/plugins/refactoring.nix b/modules/nixvim/plugins/refactoring.nix
@@ -14,7 +14,7 @@
 
     which-key.settings.spec = lib.optionals config.plugins.refactoring.enable [
       {
-        __unkeyed = "<leader>r";
+        __unkeyed-1 = "<leader>r";
         mode = "x";
         group = "Refactor";
         icon = " ";

diff --git a/modules/nixvim/plugins/telescope.nix b/modules/nixvim/plugins/telescope.nix
@@ -41,7 +41,7 @@
       ui-select = {
         enable = true;
         settings = {
-          __unkeyed.__raw = ''require("telescope.themes").get_dropdown{}'';
+          __unkeyed-1.__raw = ''require("telescope.themes").get_dropdown{}'';
         };
       };
 

diff --git a/modules/nixvim/plugins/trouble.nix b/modules/nixvim/plugins/trouble.nix
@@ -46,7 +46,7 @@
 
     which-key.settings.spec = lib.optionals config.plugins.trouble.enable [
       {
-        __unkeyed = "<leader>x";
+        __unkeyed-1 = "<leader>x";
         mode = "n";
         icon = "";
         group = "Trouble";

diff --git a/modules/nixvim/plugins/which-key.nix b/modules/nixvim/plugins/which-key.nix
@@ -7,33 +7,33 @@
     settings = {
       spec = [
         {
-          __unkeyed = "<leader>b";
+          __unkeyed-1 = "<leader>b";
           group = "Buffers";
         }
         {
-          __unkeyed = "<leader>bs";
+          __unkeyed-1 = "<leader>bs";
           group = "󰒺 Sort";
           icon = "";
         }
         {
-          __unkeyed = "<leader>g";
+          __unkeyed-1 = "<leader>g";
           group = "Git";
         }
         {
-          __unkeyed = "<leader>f";
+          __unkeyed-1 = "<leader>f";
           group = "Find";
         }
         {
-          __unkeyed = "<leader>r";
+          __unkeyed-1 = "<leader>r";
           group = "Refactor";
           icon = " ";
         }
         {
-          __unkeyed = "<leader>t";
+          __unkeyed-1 = "<leader>t";
           group = "Terminal";
         }
         {
-          __unkeyed = "<leader>u";
+          __unkeyed-1 = "<leader>u";
           group = "UI/UX";
         }
       ];