Merge branch 'main' into add-supermaven

binds/which-key: allow deregistering binds or groups

docs/release-notes/rl-0.8.md

@@ -445,9 +445,12 @@
 - Restore vim-dirtytalk plugin and fix ordering with spellcheck in generated config.
 - Fix lualine separator options
 - Add [neogit], an interactive and powerful Git interface for Neovim, inspired by Magit
+- Allow deregistering which-key binds or groups by setting them to `null`
+
 [justDeeevin](https://github.com/justDeeevin):
 
 [supermaven-nvim]: https://github.com/supermaven-inc/supermaven-nvim
 
 - Add [supermaven-nvim] plugin in `vim.assistant.supermaven-nvim` with `enable` and
   `setupOpts`
+

modules/plugins/assistant/supermaven-nvim/supermaven-nvim.nix

@@ -9,11 +9,12 @@
     enum
     ;
   inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.assistant.supermaven-nvim = {
     enable = mkEnableOption "Supermaven AI assistant";
 
-    setupOpts = lib.nvim.mkPluginSetupOption "Supermaven" {
+    setupOpts = mkPluginSetupOption "Supermaven" {
       keymaps = {
         accept_suggestion = mkOption {
           type = nullOr str;

modules/plugins/utility/binds/which-key/config.nix

@@ -10,7 +10,7 @@
   inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.binds.whichKey;
-  register = mapAttrsToList (n: v: mkLuaInline "{ '${n}', desc = '${v}' }") cfg.register;
+  register = mapAttrsToList (n: v: lib.lists.optional (! isNull v) (mkLuaInline "{ '${n}', desc = '${v}' }")) cfg.register;
 in {
   config = mkIf cfg.enable {
     vim = {