update system

2025-12-12 03:26:17 +00:00 · 2024-08-14 19:37:00 +02:00
parent ac1773445f
commit a060be6995
12 changed files with 291 additions and 105 deletions
--- a/modules/home-manager/programs/nixvim/presets/auto-format.nix
+++ b/modules/home-manager/programs/nixvim/presets/auto-format.nix
@@ -47,13 +47,23 @@ in
    ];

    plugins = {
-      which-key.registrations = {
-        "<leader>a" = {
-          name = "Auto Actions";
-          f = "Toggle auto-format";
-          F = "Toggle auto-format (buffer)";
-        };
-      };
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "<leader>a";
+          group = "Auto Actions";
+          icon = "󰁨";
+        }
+        {
+          __unkeyed-1 = "<leader>af";
+          desc = "Tggle auto-format";
+          icon = "󱌓";
+        }
+        {
+          __unkeyed-1 = "<leader>aF";
+          desc = "Tggle auto-format (buffer)";
+          icon = "󱌓";
+        }
+      ];

      conform-nvim.formatAfterSave = # lua
        ''
--- a/modules/home-manager/programs/nixvim/presets/auto-save.nix
+++ b/modules/home-manager/programs/nixvim/presets/auto-save.nix
@@ -78,16 +78,28 @@ in
    ];

    plugins = {
-      which-key.registrations = {
-        "<leader>a" = {
-          name = "Auto Actions";
-          s = "Toggle auto-save";
-          S = "Toggle auto-save (buffer)";
-        };
-      };
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "<leader>a";
+          group = "Auto Actions";
+          icon = "󰁨";
+        }
+        {
+          __unkeyed-1 = "<leader>as";
+          desc = "Tggle auto-save";
+          icon = "󱙃";
+        }
+        {
+          __unkeyed-1 = "<leader>aS";
+          desc = "Tggle auto-save (buffer)";
+          icon = "󱙃";
+        }
+      ];

-      /*neo-tree.eventHandlers.window_before_open = # lua
-        "function() PerformAutoSave() end";*/
+      /*
+        neo-tree.eventHandlers.window_before_open = # lua
+        "function() PerformAutoSave() end";
+      */

      lualine.sections.lualine_x = lib.mkOrder 700 [
        # lua
--- a/modules/home-manager/programs/nixvim/presets/base/diagnostics.nix
+++ b/modules/home-manager/programs/nixvim/presets/base/diagnostics.nix
@@ -85,20 +85,68 @@ in
        };
      };
      inc-rename.enable = true;
-      which-key.registrations."<leader>s" = {
-        name = "LSP";
-        n = "Hover";
-        r = "References";
-        c = "Incremental Rename";
-        R = "Restart LSP";
-        d = "Definitions";
-        i = "Implementations";
-        w = "Workspace Symbols";
-        t = "Type Definitions";
-        h = "Diagnostics";
-        a = "Code Actions";
-        x = "LSP Format";
-      };
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "<leader>s";
+          group = "LSP";
+          icon = "󱐋";
+        }
+        {
+          __unkeyed-1 = "<leader>sn";
+          desc = "Hover";
+          icon = "";
+        }
+        {
+          __unkeyed-1 = "<leader>sr";
+          desc = "References";
+          icon = "󱁉";
+        }
+        {
+          __unkeyed-1 = "<leader>sc";
+          desc = "Incremental Rename";
+          icon = "󰑕";
+        }
+        {
+          __unkeyed-1 = "<leader>sR";
+          desc = "Restart LSP";
+          icon = "󰜉";
+        }
+        {
+          __unkeyed-1 = "<leader>sd";
+          desc = "Definitions";
+          icon = "󰜬";
+        }
+        {
+          __unkeyed-1 = "<leader>si";
+          desc = "Implementations";
+          icon = "󰴽";
+        }
+        {
+          __unkeyed-1 = "<leader>sw";
+          desc = "Workspace Symbols";
+          icon = "󰷐";
+        }
+        {
+          __unkeyed-1 = "<leader>st";
+          desc = "Type Definitions";
+          icon = "󱍕";
+        }
+        {
+          __unkeyed-1 = "<leader>sh";
+          icon = "󱖫";
+          desc = "Diagnostics";
+        }
+        {
+          __unkeyed-1 = "<leader>sa";
+          desc = "Code Actions";
+          icon = "";
+        }
+        {
+          __unkeyed-1 = "<leader>sx";
+          desc = "LSP Format";
+          icon = "󰉢";
+        }
+      ];
    };
    extraPlugins = [ pkgs.vimPlugins.actions-preview-nvim ];
  };
--- a/modules/home-manager/programs/nixvim/presets/base/find.nix
+++ b/modules/home-manager/programs/nixvim/presets/base/find.nix
@@ -18,13 +18,33 @@ in
          "<leader>fb" = "buffers";
        };
      };
-      which-key.registrations."<leader>f" = {
-        name = "Find";
-        f = "File";
-        a = "Untracked Files";
-        g = "Grep";
-        b = "Buffer";
-      };
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "<leader>f";
+          group = "Find";
+          icon = "󰍉";
+        }
+        {
+          __unkeyed-1 = "<leader>ff";
+          desc = "File";
+          icon = "󰈢";
+        }
+        {
+          __unkeyed-1 = "<leader>fa";
+          desc = "Untracked Files";
+          icon = "󱪡";
+        }
+        {
+          __unkeyed-1 = "<leader>fg";
+          desc = "Grep";
+          icon = "󰑑";
+        }
+        {
+          __unkeyed-1 = "<leader>fb";
+          desc = "Buffer";
+          icon = "󰈙";
+        }
+      ];
    };
  };
 }
--- a/modules/home-manager/programs/nixvim/presets/base/status-line.nix
+++ b/modules/home-manager/programs/nixvim/presets/base/status-line.nix
@@ -19,7 +19,13 @@ in
        keymaps."<leader>n" = # vim
          "notify";
      };
-      which-key.registrations."<leader>n" = "Notifications";
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "<leader>n";
+          desc = "Notifications";
+          icon = "󰍩";
+        }
+      ];
      lualine = {
        enable = true;
        globalstatus = true;
--- a/modules/home-manager/programs/nixvim/presets/base/tree.nix
+++ b/modules/home-manager/programs/nixvim/presets/base/tree.nix
@@ -35,10 +35,18 @@ in
            end
          '';
      };
-      which-key.registrations = {
-        "<leader>f".t = "Tree";
-        "<leader>s".s = "Document Symbols";
-      };
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "<leader>ft";
+          desc = "Tree";
+          icon = "󰙅";
+        }
+        {
+          __unkeyed-1 = "<leader>ss";
+          desc = "Document Symbols";
+          icon = "󱏒";
+        }
+      ];
    };
  };
 }
--- a/modules/home-manager/programs/nixvim/presets/harpoon.nix
+++ b/modules/home-manager/programs/nixvim/presets/harpoon.nix
@@ -26,13 +26,33 @@ in
          navPrev = "hp";
        };
      };
-      which-key.registrations.h = {
-        name = "Harpoon";
-        h = "Marks";
-        m = "Mark";
-        n = "Next";
-        p = "Prev";
-      };
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "h";
+          group = "Harpoon";
+          icon = "󱀺";
+        }
+        {
+          __unkeyed-1 = "hh";
+          desc = "Marks";
+          icon = "󰈢";
+        }
+        {
+          __unkeyed-1 = "hm";
+          desc = "Add File";
+          icon = "󱪝";
+        }
+        {
+          __unkeyed-1 = "hn";
+          desc = "Next";
+          icon = "";
+        }
+        {
+          __unkeyed-1 = "hp";
+          desc = "Prev";
+          icon = "";
+        }
+      ];
    };
  };
 }
--- a/modules/home-manager/programs/nixvim/presets/lazygit.nix
+++ b/modules/home-manager/programs/nixvim/presets/lazygit.nix
@@ -67,7 +67,13 @@ in
        };
      };

-      which-key.registrations.${cfg.toggleBind} = "Git";
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = cfg.toggleBind;
+          desc = "Git";
+          icon = "";
+        }
+      ];
    };
  };
 }
--- a/modules/home-manager/programs/nixvim/presets/remaps/paste-keep-buffer.nix
+++ b/modules/home-manager/programs/nixvim/presets/remaps/paste-keep-buffer.nix
@@ -21,7 +21,13 @@ in
    ];
    plugins.which-key = {
      enable = true;
-      registrations."<leader>p" = "Paste Keep Buffer";
+      settings.spec = [
+        {
+          __unkeyed-1 = "<leader>p";
+          desc = "Paste Keep Buffer";
+          icon = "";
+        }
+      ];
    };
  };
 }
--- a/modules/home-manager/programs/nixvim/presets/trouble.nix
+++ b/modules/home-manager/programs/nixvim/presets/trouble.nix
@@ -45,14 +45,41 @@ in
        enable = true;
        settings.use_diagnostic_signs = true;
      };
-      which-key.registrations."<leader>x" = {
-        name = "Trouble";
-        x = "Toggle";
-        w = "Workspace Diagnostics";
-        d = "Document Diagnostics";
-        q = "Quickfix";
-        l = "Loclist";
-      };
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "<leader>x";
+          group = "Trouble";
+          icon = {
+            icon = "";
+            color = "red";
+          };
+        }
+        {
+          __unkeyed-1 = "<leader>xx";
+          desc = "Toggle";
+          icon = "󰺲";
+        }
+        {
+          __unkeyed-1 = "<leader>xw";
+          desc = "Workspace Diagnostics";
+          icon = "󰙅";
+        }
+        {
+          __unkeyed-1 = "<leader>xd";
+          desc = "Document Diagnostics";
+          icon = "󱪗";
+        }
+        {
+          __unkeyed-1 = "<leader>xq";
+          desc = "Quickfix";
+          icon = "";
+        }
+        {
+          __unkeyed-1 = "<leader>xl";
+          desc = "Loclist";
+          icon = "󰷐";
+        }
+      ];
    };
  };
 }
--- a/modules/home-manager/programs/nixvim/presets/undotree.nix
+++ b/modules/home-manager/programs/nixvim/presets/undotree.nix
@@ -22,7 +22,13 @@ in
    ];
    plugins = {
      undotree.enable = true;
-      which-key.registrations."<leader>u" = "Undotree";
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "<leader>u";
+          desc = "Undotree";
+          icon = "󰕌";
+        }
+      ];
    };
  };
 }