From 9365a7753e5b32de6af5b34a3dcb6f8fcccd5dc1 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 5 Apr 2023 00:06:30 +0200
Subject: [PATCH 01/25] feat: toggleterm keybindings

---
 modules/terminal/toggleterm/config.nix     | 2 +-
 modules/terminal/toggleterm/toggleterm.nix | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/terminal/toggleterm/config.nix b/modules/terminal/toggleterm/config.nix
index 9e98bb1..c4934dc 100644
--- a/modules/terminal/toggleterm/config.nix
+++ b/modules/terminal/toggleterm/config.nix
@@ -14,7 +14,7 @@ in {
 
     vim.luaConfigRC.toggleterm = nvim.dag.entryAnywhere ''
       require("toggleterm").setup({
-        open_mapping = [[<c-t>]],
+        open_mapping = '${cfg.mappings.open}',
         direction = '${toString cfg.direction}',
         -- TODO: this should probably be turned into a module that uses the lua function if and only if the user has not set it
         size = function(term)
diff --git a/modules/terminal/toggleterm/toggleterm.nix b/modules/terminal/toggleterm/toggleterm.nix
index e2ed940..8c60ea8 100644
--- a/modules/terminal/toggleterm/toggleterm.nix
+++ b/modules/terminal/toggleterm/toggleterm.nix
@@ -7,6 +7,13 @@ with lib;
 with builtins; {
   options.vim.terminal.toggleterm = {
     enable = mkEnableOption "Enable toggleterm as a replacement to built-in terminal command";
+    mappings = {
+      open = mkOption {
+        type = types.str;
+        description = "The keymapping to open toggleterm";
+        default = "<c-t>";
+      };
+    };
     direction = mkOption {
       type = types.enum ["horizontal" "vertical" "tab" "float"];
       default = "horizontal";

From 5915262864480e71e6b2c6855c4d45a4d4cda962 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 5 Apr 2023 00:53:21 +0200
Subject: [PATCH 02/25] feat: add Copilot keybindings

---
 modules/assistant/copilot/config.nix  | 23 ++++++++++
 modules/assistant/copilot/copilot.nix | 62 +++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)

diff --git a/modules/assistant/copilot/config.nix b/modules/assistant/copilot/config.nix
index 62d0251..4ecac27 100644
--- a/modules/assistant/copilot/config.nix
+++ b/modules/assistant/copilot/config.nix
@@ -7,6 +7,10 @@
 with lib;
 with builtins; let
   cfg = config.vim.assistant.copilot;
+  keyOrFalse = key:
+    if key != null
+    then "'${key}'"
+    else "false";
 in {
   config = mkIf cfg.enable {
     vim.startPlugins = [
@@ -18,6 +22,25 @@ in {
       require("copilot").setup({
         -- available options: https://github.com/zbirenbaum/copilot.lua
         copilot_node_command = "${cfg.copilot_node_command}",
+        panel = {
+          keymap = {
+            jump_prev = ${keyOrFalse cfg.mappings.panel.jumpPrev},
+            jump_next = ${keyOrFalse cfg.mappings.panel.jumpNext},
+            accept = ${keyOrFalse cfg.mappings.panel.accept},
+            refresh = ${keyOrFalse cfg.mappings.panel.refresh},
+            open = ${keyOrFalse cfg.mappings.panel.open},
+          },
+        },
+        suggestion = {
+          keymap = {
+            accept = ${keyOrFalse cfg.mappings.suggestion.accept},
+            accept_word = ${keyOrFalse cfg.mappings.suggestion.acceptWord},
+            accept_line = ${keyOrFalse cfg.mappings.suggestion.acceptLine},
+            next = ${keyOrFalse cfg.mappings.suggestion.next},
+            prev = ${keyOrFalse cfg.mappings.suggestion.prev},
+            dismiss = ${keyOrFalse cfg.mappings.suggestion.dismiss},
+          },
+        },
       })
     '';
   };
diff --git a/modules/assistant/copilot/copilot.nix b/modules/assistant/copilot/copilot.nix
index ad3e622..fcf5a5d 100644
--- a/modules/assistant/copilot/copilot.nix
+++ b/modules/assistant/copilot/copilot.nix
@@ -9,6 +9,68 @@ with builtins; {
   options.vim.assistant.copilot = {
     enable = mkEnableOption "Enable GitHub Copilot";
 
+    mappings = {
+      panel = {
+        jumpPrev = mkOption {
+          type = types.nullOr types.str;
+          default = "[[";
+          description = "Jump to previous suggestion";
+        };
+        jumpNext = mkOption {
+          type = types.nullOr types.str;
+          default = "]]";
+          description = "Jump to next suggestion";
+        };
+        accept = mkOption {
+          type = types.nullOr types.str;
+          default = "<CR>";
+          description = "Accept suggestion";
+        };
+        refresh = mkOption {
+          type = types.nullOr types.str;
+          default = "gr";
+          description = "Refresh suggestions";
+        };
+        open = mkOption {
+          type = types.nullOr types.str;
+          default = "<M-CR>";
+          description = "Open suggestions";
+        };
+      };
+      suggestion = {
+        accept = mkOption {
+          type = types.nullOr types.str;
+          default = "<M-l>";
+          description = "Accept suggetion";
+        };
+        acceptWord = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = "Accept next word";
+        };
+        acceptLine = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = "Accept next line";
+        };
+        prev = mkOption {
+          type = types.nullOr types.str;
+          default = "<M-[>";
+          description = "Previous suggestion";
+        };
+        next = mkOption {
+          type = types.nullOr types.str;
+          default = "<M-]>";
+          description = "Next suggestion";
+        };
+        dismiss = mkOption {
+          type = types.nullOr types.str;
+          default = "<C-]>";
+          description = "Dismiss suggestion";
+        };
+      };
+    };
+
     copilot_node_command = mkOption {
       type = types.str;
       default = "${lib.getExe pkgs.nodejs-slim-16_x}";

From efaf8e81b79b7c78afbb995b3d1d77af87290a11 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 10 Apr 2023 13:42:31 +0200
Subject: [PATCH 03/25] refactor!: use a new keymaps configuration format

---
 modules/basic/config.nix                     |  56 +++-
 modules/core/default.nix                     | 297 +++++++++++++------
 modules/lsp/lspsaga/config.nix               |  30 +-
 modules/lsp/lspsaga/lspsaga.nix              |  30 +-
 modules/lsp/nvim-code-action-menu/config.nix |   4 +-
 modules/lsp/trouble/config.nix               |  14 +-
 modules/notes/mind-nvim/config.nix           |   8 +-
 modules/notes/todo-comments/config.nix       |   8 +-
 modules/tabline/nvim-bufferline/config.nix   |  36 +--
 modules/utility/hop/config.nix               |   4 +-
 modules/utility/telescope/config.nix         |  38 +--
 11 files changed, 343 insertions(+), 182 deletions(-)

diff --git a/modules/basic/config.nix b/modules/basic/config.nix
index a06cae2..3fdb45e 100644
--- a/modules/basic/config.nix
+++ b/modules/basic/config.nix
@@ -10,21 +10,51 @@ in {
   config = {
     vim.startPlugins = ["plenary-nvim"];
 
-    vim.nmap = mkIf cfg.disableArrows {
-      "<up>" = "<nop>";
-      "<down>" = "<nop>";
-      "<left>" = "<nop>";
-      "<right>" = "<nop>";
-    };
+    vim.maps.normal =
+      mkIf cfg.disableArrows {
+        "<up>" = {
+          action = "<nop>";
 
-    vim.imap = mkIf cfg.disableArrows {
-      "<up>" = "<nop>";
-      "<down>" = "<nop>";
-      "<left>" = "<nop>";
-      "<right>" = "<nop>";
-    };
+          noremap = false;
+        };
+        "<down>" = {
+          action = "<nop>";
 
-    vim.nnoremap = mkIf cfg.mapLeaderSpace {"<space>" = "<nop>";};
+          noremap = false;
+        };
+        "<left>" = {
+          action = "<nop>";
+          noremap = false;
+        };
+        "<right>" = {
+          action = "<nop>";
+          noremap = false;
+        };
+      }
+      // mkIf cfg.mapLeaderSpace {
+        "<space>" = {
+          action = "<nop>";
+        };
+      };
+
+    vim.maps.insert = mkIf cfg.disableArrows {
+      "<up>" = {
+        action = "<nop>";
+        noremap = false;
+      };
+      "<down>" = {
+        action = "<nop>";
+        noremap = false;
+      };
+      "<left>" = {
+        action = "<nop>";
+        noremap = false;
+      };
+      "<right>" = {
+        action = "<nop>";
+        noremap = false;
+      };
+    };
 
     vim.configRC.basic = nvim.dag.entryAfter ["globalsScript"] ''
       " Debug mode settings
diff --git a/modules/core/default.nix b/modules/core/default.nix
index 78232b3..6e92cff 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -19,6 +19,107 @@ with builtins; let
         type = with types; attrsOf (nullOr str);
       }
       // it);
+
+  mkBool = value: description:
+    mkOption {
+      type = types.bool;
+      default = value;
+      description = description;
+    };
+
+  # Most of the keybindings code is highly inspired by pta2002/nixvim. Thank you!
+  mapConfigOptions = {
+    silent =
+      mkBool false
+      "Whether this mapping should be silent. Equivalent to adding <silent> to a map.";
+
+    nowait =
+      mkBool false
+      "Whether to wait for extra input on ambiguous mappings. Equivalent to adding <nowait> to a map.";
+
+    script =
+      mkBool false
+      "Equivalent to adding <script> to a map.";
+
+    expr =
+      mkBool false
+      "Means that the action is actually an expression. Equivalent to adding <expr> to a map.";
+
+    unique =
+      mkBool false
+      "Whether to fail if the map is already defined. Equivalent to adding <unique> to a map.";
+
+    noremap =
+      mkBool true
+      "Whether to use the 'noremap' variant of the command, ignoring any custom mappings on the defined action. It is highly advised to keep this on, which is the default.";
+
+    desc = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = "A description of this keybind, to be shown in which-key, if you have it enabled.";
+    };
+  };
+
+  genMaps = mode: maps: let
+    /*
+    Take a user-defined action (string or attrs) and return the following attribute set:
+    {
+      action = (string) the actual action to map to this key
+      config = (attrs) the configuration options for this mapping (noremap, silent...)
+    }
+    */
+    normalizeAction = action: let
+      # Extract the values of the config options that have been explicitly set by the user
+      config =
+        filterAttrs (n: v: v != null)
+        (getAttrs (attrNames mapConfigOptions) action);
+    in {
+      config =
+        if config == {}
+        then {"__empty" = null;}
+        else config;
+      action =
+        if action.lua
+        then {"__raw" = action.action;}
+        else action.action;
+    };
+  in
+    builtins.attrValues (builtins.mapAttrs
+      (key: action: let
+        normalizedAction = normalizeAction action;
+      in {
+        inherit (normalizedAction) action config;
+        key = key;
+        mode = mode;
+      })
+      maps);
+
+  mapOption = types.submodule {
+    options =
+      mapConfigOptions
+      // {
+        action = mkOption {
+          type = types.str;
+          description = "The action to execute.";
+        };
+
+        lua = mkOption {
+          type = types.bool;
+          description = ''
+            If true, `action` is considered to be lua code.
+            Thus, it will not be wrapped in `""`.
+          '';
+          default = false;
+        };
+      };
+  };
+
+  mapOptions = mode:
+    mkOption {
+      description = "Mappings for ${mode} mode";
+      type = types.attrsOf mapOption;
+      default = {};
+    };
 in {
   options.vim = {
     viAlias = mkOption {
@@ -67,64 +168,39 @@ in {
       type = types.attrs;
     };
 
-    nnoremap =
-      mkMappingOption {description = "Defines 'Normal mode' mappings";};
+    maps = mkOption {
+      type = types.submodule {
+        options = {
+          normal = mapOptions "normal";
+          insert = mapOptions "insert";
+          select = mapOptions "select";
+          visual = mapOptions "visual and select";
+          terminal = mapOptions "terminal";
+          normalVisualOp = mapOptions "normal, visual, select and operator-pending (same as plain 'map')";
 
-    inoremap = mkMappingOption {
-      description = "Defines 'Insert and Replace mode' mappings";
-    };
+          visualOnly = mapOptions "visual only";
+          operator = mapOptions "operator-pending";
+          insertCommand = mapOptions "insert and command-line";
+          lang = mapOptions "insert, command-line and lang-arg";
+          command = mapOptions "command-line";
+        };
+      };
+      default = {};
+      description = ''
+        Custom keybindings for any mode.
 
-    vnoremap = mkMappingOption {
-      description = "Defines 'Visual and Select mode' mappings";
-    };
+        For plain maps (e.g. just 'map' or 'remap') use maps.normalVisualOp.
+      '';
 
-    xnoremap =
-      mkMappingOption {description = "Defines 'Visual mode' mappings";};
-
-    snoremap =
-      mkMappingOption {description = "Defines 'Select mode' mappings";};
-
-    cnoremap =
-      mkMappingOption {description = "Defines 'Command-line mode' mappings";};
-
-    onoremap = mkMappingOption {
-      description = "Defines 'Operator pending mode' mappings";
-    };
-
-    tnoremap = mkMappingOption {
-      description = "Defines 'Terminal mode' mappings";
-    };
-
-    nmap = mkMappingOption {
-      description = "Defines 'Normal mode' mappings";
-    };
-
-    imap = mkMappingOption {
-      description = "Defines 'Insert and Replace mode' mappings";
-    };
-
-    vmap = mkMappingOption {
-      description = "Defines 'Visual and Select mode' mappings";
-    };
-
-    xmap = mkMappingOption {
-      description = "Defines 'Visual mode' mappings";
-    };
-
-    smap = mkMappingOption {
-      description = "Defines 'Select mode' mappings";
-    };
-
-    cmap = mkMappingOption {
-      description = "Defines 'Command-line mode' mappings";
-    };
-
-    omap = mkMappingOption {
-      description = "Defines 'Operator pending mode' mappings";
-    };
-
-    tmap = mkMappingOption {
-      description = "Defines 'Terminal mode' mappings";
+      example = ''
+        maps = {
+          normalVisualOp.";" = ":"; # Same as noremap ; :
+          normal."<leader>m" = {
+            silent = true;
+            action = "<cmd>make<CR>";
+          }; # Same as nnoremap <leader>m <silent> <cmd>make<CR>
+        };
+      '';
     };
   };
 
@@ -148,34 +224,66 @@ in {
       mapAttrsFlatten (name: value: "let g:${name}=${valToVim value}")
       (filterNonNull cfg.globals);
 
-    matchCtrl = it: match "Ctrl-(.)(.*)" it;
-    mapKeyBinding = it: let
-      groups = matchCtrl it;
-    in
-      if groups == null
-      then it
-      else "<C-${toUpper (head groups)}>${head (tail groups)}";
-    mapVimBinding = prefix: mappings:
-      mapAttrsFlatten (name: value: "${prefix} ${mapKeyBinding name} ${value}")
-      (filterNonNull mappings);
+    toLuaObject = args:
+      if builtins.isAttrs args
+      then
+        if hasAttr "__raw" args
+        then args.__raw
+        else if hasAttr "__empty" args
+        then "{ }"
+        else
+          "{"
+          + (concatStringsSep ","
+            (mapAttrsToList
+              (n: v:
+                if head (stringToCharacters n) == "@"
+                then toLuaObject v
+                else "[${toLuaObject n}] = " + (toLuaObject v))
+              (filterAttrs
+                (
+                  n: v:
+                    !isNull v && (toLuaObject v != "{}")
+                )
+                args)))
+          + "}"
+      else if builtins.isList args
+      then "{" + concatMapStringsSep "," toLuaObject args + "}"
+      else if builtins.isString args
+      then
+        # This should be enough!
+        builtins.toJSON args
+      else if builtins.isPath args
+      then builtins.toJSON (toString args)
+      else if builtins.isBool args
+      then "${boolToString args}"
+      else if builtins.isFloat args
+      then "${toString args}"
+      else if builtins.isInt args
+      then "${toString args}"
+      else if isNull args
+      then "nil"
+      else "";
 
-    nmap = mapVimBinding "nmap" config.vim.nmap;
-    imap = mapVimBinding "imap" config.vim.imap;
-    vmap = mapVimBinding "vmap" config.vim.vmap;
-    xmap = mapVimBinding "xmap" config.vim.xmap;
-    smap = mapVimBinding "smap" config.vim.smap;
-    cmap = mapVimBinding "cmap" config.vim.cmap;
-    omap = mapVimBinding "omap" config.vim.omap;
-    tmap = mapVimBinding "tmap" config.vim.tmap;
+    toLuaBindings = mode: maps:
+      builtins.map (value: ''
+        map("${mode}", "${value.key}", ${
+          if value.action ? "__raw"
+          then value.action."__raw"
+          else "\"${value.action}\""
+        }, ${toLuaObject value.config})'') (genMaps mode maps);
 
-    nnoremap = mapVimBinding "nnoremap" config.vim.nnoremap;
-    inoremap = mapVimBinding "inoremap" config.vim.inoremap;
-    vnoremap = mapVimBinding "vnoremap" config.vim.vnoremap;
-    xnoremap = mapVimBinding "xnoremap" config.vim.xnoremap;
-    snoremap = mapVimBinding "snoremap" config.vim.snoremap;
-    cnoremap = mapVimBinding "cnoremap" config.vim.cnoremap;
-    onoremap = mapVimBinding "onoremap" config.vim.onoremap;
-    tnoremap = mapVimBinding "tnoremap" config.vim.tnoremap;
+    # I'm not sure if every one of these will work.
+    allmap = toLuaBindings "" config.vim.maps.normalVisualOp;
+    nmap = toLuaBindings "n" config.vim.maps.normal;
+    vmap = toLuaBindings "v" config.vim.maps.visual;
+    xmap = toLuaBindings "x" config.vim.maps.visualOnly;
+    smap = toLuaBindings "s" config.vim.maps.select;
+    imap = toLuaBindings "u" config.vim.maps.insert;
+    cmap = toLuaBindings "c" config.vim.maps.command;
+    tmap = toLuaBindings "t" config.vim.maps.terminal;
+    lmap = toLuaBindings "l" config.vim.maps.lang;
+    omap = toLuaBindings "o" config.vim.maps.operator;
+    icmap = toLuaBindings "ic" config.vim.maps.insertCommand;
 
     resolveDag = {
       name,
@@ -209,8 +317,31 @@ in {
           nvim.dag.entryAfter ["globalsScript"] luaConfig;
 
         mappings = let
-          maps = [nmap imap vmap xmap smap cmap omap tmap nnoremap inoremap vnoremap xnoremap snoremap cnoremap onoremap tnoremap];
-          mapConfig = concatStringsSep "\n" (map (v: concatStringsSep "\n" v) maps);
+          maps = [
+            (splitString
+              "\n"
+              ''
+                local function map(mode, lhs, rhs, opts)
+                  local options = { noremap=true, silent=true }
+                  if opts then
+                    options = vim.tbl_extend('force', options, opts)
+                  end
+                  vim.api.nvim_set_keymap(mode, lhs, rhs, options)
+                end
+              '')
+            nmap
+            imap
+            vmap
+            xmap
+            smap
+            cmap
+            omap
+            tmap
+            lmap
+            icmap
+            allmap
+          ];
+          mapConfig = wrapLuaConfig (concatStringsSep "\n" (map (v: concatStringsSep "\n" v) maps));
         in
           nvim.dag.entryAfter ["globalsScript"] mapConfig;
       };
diff --git a/modules/lsp/lspsaga/config.nix b/modules/lsp/lspsaga/config.nix
index f8f8024..e8c71fa 100644
--- a/modules/lsp/lspsaga/config.nix
+++ b/modules/lsp/lspsaga/config.nix
@@ -10,34 +10,34 @@ in {
   config = mkIf (cfg.enable && cfg.lspsaga.enable) {
     vim.startPlugins = ["lspsaga"];
 
-    vim.vnoremap = {
-      "<silent><leader>ca" = ":<C-U>lua require('lspsaga.codeaction').range_code_action()<CR>";
+    vim.maps.visual = {
+      "<silent><leader>ca" = {action = ":<C-U>lua require('lspsaga.codeaction').range_code_action()<CR>";};
     };
 
-    vim.nnoremap =
+    vim.maps.normal =
       {
-        "<silent><leader>lf" = "<cmd>lua require'lspsaga.provider'.lsp_finder()<CR>";
-        "<silent><leader>lh" = "<cmd>lua require('lspsaga.hover').render_hover_doc()<CR>";
-        "<silent><C-f>" = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(1)<CR>";
-        "<silent><C-b>" = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(-1)<CR>";
-        "<silent><leader>lr" = "<cmd>lua require'lspsaga.rename'.rename()<CR>";
-        "<silent><leader>ld" = "<cmd>lua require'lspsaga.provider'.preview_definition()<CR>";
-        "<silent><leader>ll" = "<cmd>lua require'lspsaga.diagnostic'.show_line_diagnostics()<CR>";
-        "<silent><leader>lc" = "<cmd>lua require'lspsaga.diagnostic'.show_cursor_diagnostics()<CR>";
-        "<silent><leader>lp" = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_prev()<CR>";
-        "<silent><leader>ln" = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_next()<CR>";
+        "<silent><leader>lf" = {action = "<cmd>lua require'lspsaga.provider'.lsp_finder()<CR>";};
+        "<silent><leader>lh" = {action = "<cmd>lua require('lspsaga.hover').render_hover_doc()<CR>";};
+        "<silent><C-f>" = {action = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(1)<CR>";};
+        "<silent><C-b>" = {action = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(-1)<CR>";};
+        "<silent><leader>lr" = {action = "<cmd>lua require'lspsaga.rename'.rename()<CR>";};
+        "<silent><leader>ld" = {action = "<cmd>lua require'lspsaga.provider'.preview_definition()<CR>";};
+        "<silent><leader>ll" = {action = "<cmd>lua require'lspsaga.diagnostic'.show_line_diagnostics()<CR>";};
+        "<silent><leader>lc" = {action = "<cmd>lua require'lspsaga.diagnostic'.show_cursor_diagnostics()<CR>";};
+        "<silent><leader>lp" = {action = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_prev()<CR>";};
+        "<silent><leader>ln" = {action = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_next()<CR>";};
       }
       // (
         if (!cfg.nvimCodeActionMenu.enable)
         then {
-          "<silent><leader>ca" = "<cmd>lua require('lspsaga.codeaction').code_action()<CR>";
+          "<silent><leader>ca" = {action = "<cmd>lua require('lspsaga.codeaction').code_action()<CR>";};
         }
         else {}
       )
       // (
         if (!cfg.lspSignature.enable)
         then {
-          "<silent><leader>ls" = "<cmd>lua require('lspsaga.signaturehelp').signature_help()<CR>";
+          "<silent><leader>ls" = {action = "<cmd>lua require('lspsaga.signaturehelp').signature_help()<CR>";};
         }
         else {}
       );
diff --git a/modules/lsp/lspsaga/lspsaga.nix b/modules/lsp/lspsaga/lspsaga.nix
index eecfa42..6107273 100644
--- a/modules/lsp/lspsaga/lspsaga.nix
+++ b/modules/lsp/lspsaga/lspsaga.nix
@@ -12,34 +12,34 @@ in {
   config = mkIf (cfg.enable && cfg.lspsaga.enable) {
     vim.startPlugins = ["lspsaga"];
 
-    vim.vnoremap = {
-      "<silent><leader>ca" = ":<C-U>lua require('lspsaga.codeaction').range_code_action()<CR>";
+    vim.maps.visual = {
+      "<silent><leader>ca" = {action = ":<C-U>lua require('lspsaga.codeaction').range_code_action()<CR>";};
     };
 
-    vim.nnoremap =
+    vim.maps.normal =
       {
-        "<silent><leader>lf" = "<cmd>lua require'lspsaga.provider'.lsp_finder()<CR>";
-        "<silent><leader>lh" = "<cmd>lua require('lspsaga.hover').render_hover_doc()<CR>";
-        "<silent><C-f>" = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(1)<CR>";
-        "<silent><C-b>" = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(-1)<CR>";
-        "<silent><leader>lr" = "<cmd>lua require'lspsaga.rename'.rename()<CR>";
-        "<silent><leader>ld" = "<cmd>lua require'lspsaga.provider'.preview_definition()<CR>";
-        "<silent><leader>ll" = "<cmd>lua require'lspsaga.diagnostic'.show_line_diagnostics()<CR>";
-        "<silent><leader>lc" = "<cmd>lua require'lspsaga.diagnostic'.show_cursor_diagnostics()<CR>";
-        "<silent><leader>lp" = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_prev()<CR>";
-        "<silent><leader>ln" = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_next()<CR>";
+        "<silent><leader>lf" = {action = "<cmd>lua require'lspsaga.provider'.lsp_finder()<CR>";};
+        "<silent><leader>lh" = {action = "<cmd>lua require('lspsaga.hover').render_hover_doc()<CR>";};
+        "<silent><C-f>" = {action = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(1)<CR>";};
+        "<silent><C-b>" = {action = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(-1)<CR>";};
+        "<silent><leader>lr" = {action = "<cmd>lua require'lspsaga.rename'.rename()<CR>";};
+        "<silent><leader>ld" = {action = "<cmd>lua require'lspsaga.provider'.preview_definition()<CR>";};
+        "<silent><leader>ll" = {action = "<cmd>lua require'lspsaga.diagnostic'.show_line_diagnostics()<CR>";};
+        "<silent><leader>lc" = {action = "<cmd>lua require'lspsaga.diagnostic'.show_cursor_diagnostics()<CR>";};
+        "<silent><leader>lp" = {action = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_prev()<CR>";};
+        "<silent><leader>ln" = {action = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_next()<CR>";};
       }
       // (
         if (!cfg.nvimCodeActionMenu.enable)
         then {
-          "<silent><leader>ca" = "<cmd>lua require('lspsaga.codeaction').code_action()<CR>";
+          "<silent><leader>ca" = {action = "<cmd>lua require('lspsaga.codeaction').code_action()<CR>";};
         }
         else {}
       )
       // (
         if (!cfg.lspSignature.enable)
         then {
-          "<silent><leader>ls" = "<cmd>lua require('lspsaga.signaturehelp').signature_help()<CR>";
+          "<silent><leader>ls" = {action = "<cmd>lua require('lspsaga.signaturehelp').signature_help()<CR>";};
         }
         else {}
       );
diff --git a/modules/lsp/nvim-code-action-menu/config.nix b/modules/lsp/nvim-code-action-menu/config.nix
index 27d3cbb..dd7a1a5 100644
--- a/modules/lsp/nvim-code-action-menu/config.nix
+++ b/modules/lsp/nvim-code-action-menu/config.nix
@@ -10,8 +10,8 @@ in {
   config = mkIf (cfg.enable && cfg.nvimCodeActionMenu.enable) {
     vim.startPlugins = ["nvim-code-action-menu"];
 
-    vim.nnoremap = {
-      "<silent><leader>ca" = ":CodeActionMenu<CR>";
+    vim.maps.normal = {
+      "<silent><leader>ca" = {action = ":CodeActionMenu<CR>";};
     };
   };
 }
diff --git a/modules/lsp/trouble/config.nix b/modules/lsp/trouble/config.nix
index 092802a..bb6536c 100644
--- a/modules/lsp/trouble/config.nix
+++ b/modules/lsp/trouble/config.nix
@@ -10,13 +10,13 @@ in {
   config = mkIf (cfg.enable && cfg.trouble.enable) {
     vim.startPlugins = ["trouble"];
 
-    vim.nnoremap = {
-      "<leader>xx" = "<cmd>TroubleToggle<CR>";
-      "<leader>lwd" = "<cmd>TroubleToggle workspace_diagnostics<CR>";
-      "<leader>ld" = "<cmd>TroubleToggle document_diagnostics<CR>";
-      "<leader>lr" = "<cmd>TroubleToggle lsp_references<CR>";
-      "<leader>xq" = "<cmd>TroubleToggle quickfix<CR>";
-      "<leader>xl" = "<cmd>TroubleToggle loclist<CR>";
+    vim.maps.normal = {
+      "<leader>xx" = {action = "<cmd>TroubleToggle<CR>";};
+      "<leader>lwd" = {action = "<cmd>TroubleToggle workspace_diagnostics<CR>";};
+      "<leader>ld" = {action = "<cmd>TroubleToggle document_diagnostics<CR>";};
+      "<leader>lr" = {action = "<cmd>TroubleToggle lsp_references<CR>";};
+      "<leader>xq" = {action = "<cmd>TroubleToggle quickfix<CR>";};
+      "<leader>xl" = {action = "<cmd>TroubleToggle loclist<CR>";};
     };
 
     vim.luaConfigRC.trouble = nvim.dag.entryAnywhere ''
diff --git a/modules/notes/mind-nvim/config.nix b/modules/notes/mind-nvim/config.nix
index befbf70..5e23f06 100644
--- a/modules/notes/mind-nvim/config.nix
+++ b/modules/notes/mind-nvim/config.nix
@@ -12,10 +12,10 @@ in {
       "mind-nvim"
     ];
 
-    vim.nnoremap = {
-      "<leader>om" = ":MindOpenMain<CR>";
-      "<leader>op" = ":MindOpenProject<CR>";
-      "<leader>oc" = ":MindClose<CR>";
+    vim.maps.normal = {
+      "<leader>om" = {action = ":MindOpenMain<CR>";};
+      "<leader>op" = {action = ":MindOpenProject<CR>";};
+      "<leader>oc" = {action = ":MindClose<CR>";};
     };
 
     vim.luaConfigRC.mind-nvim = nvim.dag.entryAnywhere ''
diff --git a/modules/notes/todo-comments/config.nix b/modules/notes/todo-comments/config.nix
index c04aa8d..45a26bc 100644
--- a/modules/notes/todo-comments/config.nix
+++ b/modules/notes/todo-comments/config.nix
@@ -13,10 +13,10 @@ in {
       "todo-comments"
     ];
 
-    vim.nnoremap = {
-      "<leader>tdq" = ":TodoQuickFix<CR>";
-      "<leader>tds" = ":TodoTelescope<CR>";
-      "<leader>tdt" = ":TodoTrouble<CR>";
+    vim.maps.normal = {
+      "<leader>tdq" = {action = ":TodoQuickFix<CR>";};
+      "<leader>tds" = {action = ":TodoTelescope<CR>";};
+      "<leader>tdt" = {action = ":TodoTrouble<CR>";};
     };
 
     vim.luaConfigRC.todo-comments = ''
diff --git a/modules/tabline/nvim-bufferline/config.nix b/modules/tabline/nvim-bufferline/config.nix
index 4ed2820..960eb00 100644
--- a/modules/tabline/nvim-bufferline/config.nix
+++ b/modules/tabline/nvim-bufferline/config.nix
@@ -23,24 +23,24 @@ in {
         "bufdelete-nvim"
       ];
 
-      vim.nnoremap = {
-        "<silent><leader>bn" = ":BufferLineCycleNext<CR>";
-        "<silent><leader>bp" = ":BufferLineCyclePrev<CR>";
-        "<silent><leader>bc" = ":BufferLinePick<CR>";
-        "<silent><leader>bse" = ":BufferLineSortByExtension<CR>";
-        "<silent><leader>bsd" = ":BufferLineSortByDirectory<CR>";
-        "<silent><leader>bsi" = ":lua require'bufferline'.sort_buffers_by(function (buf_a, buf_b) return buf_a.id < buf_b.id end)<CR>";
-        "<silent><leader>bmn" = ":BufferLineMoveNext<CR>";
-        "<silent><leader>bmp" = ":BufferLineMovePrev<CR>";
-        "<silent><leader>b1" = "<Cmd>BufferLineGoToBuffer 1<CR>";
-        "<silent><leader>b2" = "<Cmd>BufferLineGoToBuffer 2<CR>";
-        "<silent><leader>b3" = "<Cmd>BufferLineGoToBuffer 3<CR>";
-        "<silent><leader>b4" = "<Cmd>BufferLineGoToBuffer 4<CR>";
-        "<silent><leader>b5" = "<Cmd>BufferLineGoToBuffer 5<CR>";
-        "<silent><leader>b6" = "<Cmd>BufferLineGoToBuffer 6<CR>";
-        "<silent><leader>b7" = "<Cmd>BufferLineGoToBuffer 7<CR>";
-        "<silent><leader>b8" = "<Cmd>BufferLineGoToBuffer 8<CR>";
-        "<silent><leader>b9" = "<Cmd>BufferLineGoToBuffer 9<CR>";
+      vim.maps.normal = {
+        "<silent><leader>bn" = {action = ":BufferLineCycleNext<CR>";};
+        "<silent><leader>bp" = {action = ":BufferLineCyclePrev<CR>";};
+        "<silent><leader>bc" = {action = ":BufferLinePick<CR>";};
+        "<silent><leader>bse" = {action = ":BufferLineSortByExtension<CR>";};
+        "<silent><leader>bsd" = {action = ":BufferLineSortByDirectory<CR>";};
+        "<silent><leader>bsi" = {action = ":lua require'bufferline'.sort_buffers_by(function (buf_a, buf_b) return buf_a.id < buf_b.id end)<CR>";};
+        "<silent><leader>bmn" = {action = ":BufferLineMoveNext<CR>";};
+        "<silent><leader>bmp" = {action = ":BufferLineMovePrev<CR>";};
+        "<silent><leader>b1" = {action = "<Cmd>BufferLineGoToBuffer 1<CR>";};
+        "<silent><leader>b2" = {action = "<Cmd>BufferLineGoToBuffer 2<CR>";};
+        "<silent><leader>b3" = {action = "<Cmd>BufferLineGoToBuffer 3<CR>";};
+        "<silent><leader>b4" = {action = "<Cmd>BufferLineGoToBuffer 4<CR>";};
+        "<silent><leader>b5" = {action = "<Cmd>BufferLineGoToBuffer 5<CR>";};
+        "<silent><leader>b6" = {action = "<Cmd>BufferLineGoToBuffer 6<CR>";};
+        "<silent><leader>b7" = {action = "<Cmd>BufferLineGoToBuffer 7<CR>";};
+        "<silent><leader>b8" = {action = "<Cmd>BufferLineGoToBuffer 8<CR>";};
+        "<silent><leader>b9" = {action = "<Cmd>BufferLineGoToBuffer 9<CR>";};
       };
 
       vim.luaConfigRC.nvimBufferline = nvim.dag.entryAnywhere ''
diff --git a/modules/utility/hop/config.nix b/modules/utility/hop/config.nix
index 63c9d38..595b64b 100644
--- a/modules/utility/hop/config.nix
+++ b/modules/utility/hop/config.nix
@@ -10,8 +10,8 @@ in {
   config = mkIf cfg.enable {
     vim.startPlugins = ["hop-nvim"];
 
-    vim.nnoremap = {
-      "<leader>h" = "<cmd> HopPattern<CR>";
+    vim.maps.normal."<leader>h" = {
+      action = "<cmd> HopPattern<CR>";
     };
 
     vim.luaConfigRC.hop-nvim = nvim.dag.entryAnywhere ''
diff --git a/modules/utility/telescope/config.nix b/modules/utility/telescope/config.nix
index 3caae1b..5e7a046 100644
--- a/modules/utility/telescope/config.nix
+++ b/modules/utility/telescope/config.nix
@@ -13,38 +13,38 @@ in {
       "telescope"
     ];
 
-    vim.nnoremap =
+    vim.maps.normal =
       {
-        "<leader>ff" = "<cmd> Telescope find_files<CR>";
-        "<leader>fg" = "<cmd> Telescope live_grep<CR>";
-        "<leader>fb" = "<cmd> Telescope buffers<CR>";
-        "<leader>fh" = "<cmd> Telescope help_tags<CR>";
-        "<leader>ft" = "<cmd> Telescope<CR>";
+        "<leader>ff" = {action = "<cmd> Telescope find_files<CR>";};
+        "<leader>fg" = {action = "<cmd> Telescope live_grep<CR>";};
+        "<leader>fb" = {action = "<cmd> Telescope buffers<CR>";};
+        "<leader>fh" = {action = "<cmd> Telescope help_tags<CR>";};
+        "<leader>ft" = {action = "<cmd> Telescope<CR>";};
 
-        "<leader>fvcw" = "<cmd> Telescope git_commits<CR>";
-        "<leader>fvcb" = "<cmd> Telescope git_bcommits<CR>";
-        "<leader>fvb" = "<cmd> Telescope git_branches<CR>";
-        "<leader>fvs" = "<cmd> Telescope git_status<CR>";
-        "<leader>fvx" = "<cmd> Telescope git_stash<CR>";
+        "<leader>fvcw" = {action = "<cmd> Telescope git_commits<CR>";};
+        "<leader>fvcb" = {action = "<cmd> Telescope git_bcommits<CR>";};
+        "<leader>fvb" = {action = "<cmd> Telescope git_branches<CR>";};
+        "<leader>fvs" = {action = "<cmd> Telescope git_status<CR>";};
+        "<leader>fvx" = {action = "<cmd> Telescope git_stash<CR>";};
       }
       // (
         if config.vim.lsp.enable
         then {
-          "<leader>flsb" = "<cmd> Telescope lsp_document_symbols<CR>";
-          "<leader>flsw" = "<cmd> Telescope lsp_workspace_symbols<CR>";
+          "<leader>flsb" = {action = "<cmd> Telescope lsp_document_symbols<CR>";};
+          "<leader>flsw" = {action = "<cmd> Telescope lsp_workspace_symbols<CR>";};
 
-          "<leader>flr" = "<cmd> Telescope lsp_references<CR>";
-          "<leader>fli" = "<cmd> Telescope lsp_implementations<CR>";
-          "<leader>flD" = "<cmd> Telescope lsp_definitions<CR>";
-          "<leader>flt" = "<cmd> Telescope lsp_type_definitions<CR>";
-          "<leader>fld" = "<cmd> Telescope diagnostics<CR>";
+          "<leader>flr" = {action = "<cmd> Telescope lsp_references<CR>";};
+          "<leader>fli" = {action = "<cmd> Telescope lsp_implementations<CR>";};
+          "<leader>flD" = {action = "<cmd> Telescope lsp_definitions<CR>";};
+          "<leader>flt" = {action = "<cmd> Telescope lsp_type_definitions<CR>";};
+          "<leader>fld" = {action = "<cmd> Telescope diagnostics<CR>";};
         }
         else {}
       )
       // (
         if config.vim.treesitter.enable
         then {
-          "<leader>fs" = "<cmd> Telescope treesitter<CR>";
+          "<leader>fs" = {action = "<cmd> Telescope treesitter<CR>";};
         }
         else {}
       );

From eec0e97ce02e42953f4c89936639ef48bf2fce56 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 10 Apr 2023 22:27:13 +0200
Subject: [PATCH 04/25] fix: properly escale quotes in values

---
 modules/core/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/core/default.nix b/modules/core/default.nix
index 6e92cff..ba257cf 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -266,10 +266,8 @@ in {
 
     toLuaBindings = mode: maps:
       builtins.map (value: ''
-        map("${mode}", "${value.key}", ${
-          if value.action ? "__raw"
-          then value.action."__raw"
-          else "\"${value.action}\""
+        map(${toLuaObject mode}, ${toLuaObject value.key}, ${
+          toLuaObject value.action
         }, ${toLuaObject value.config})'') (genMaps mode maps);
 
     # I'm not sure if every one of these will work.
@@ -316,6 +314,7 @@ in {
         in
           nvim.dag.entryAfter ["globalsScript"] luaConfig;
 
+        # This is probably not the right way to set the config. I'm not sure how it should look like.
         mappings = let
           maps = [
             (splitString

From e64e70aa0ca9ab37505c88402cd75a5a38f0f20e Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 10 Apr 2023 22:43:41 +0200
Subject: [PATCH 05/25] refactor: use builtin nvim function

---
 modules/core/default.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/modules/core/default.nix b/modules/core/default.nix
index ba257cf..0fdd1cb 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -266,7 +266,7 @@ in {
 
     toLuaBindings = mode: maps:
       builtins.map (value: ''
-        map(${toLuaObject mode}, ${toLuaObject value.key}, ${
+        vim.keymap.set(${toLuaObject mode}, ${toLuaObject value.key}, ${
           toLuaObject value.action
         }, ${toLuaObject value.config})'') (genMaps mode maps);
 
@@ -317,17 +317,6 @@ in {
         # This is probably not the right way to set the config. I'm not sure how it should look like.
         mappings = let
           maps = [
-            (splitString
-              "\n"
-              ''
-                local function map(mode, lhs, rhs, opts)
-                  local options = { noremap=true, silent=true }
-                  if opts then
-                    options = vim.tbl_extend('force', options, opts)
-                  end
-                  vim.api.nvim_set_keymap(mode, lhs, rhs, options)
-                end
-              '')
             nmap
             imap
             vmap

From ab8bb2fb5c78586fd9a6794dcee268b70a6db20d Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 10 Apr 2023 22:44:18 +0200
Subject: [PATCH 06/25] fix: correct imap misspelling

---
 modules/core/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/core/default.nix b/modules/core/default.nix
index 0fdd1cb..d16f21d 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -276,7 +276,7 @@ in {
     vmap = toLuaBindings "v" config.vim.maps.visual;
     xmap = toLuaBindings "x" config.vim.maps.visualOnly;
     smap = toLuaBindings "s" config.vim.maps.select;
-    imap = toLuaBindings "u" config.vim.maps.insert;
+    imap = toLuaBindings "i" config.vim.maps.insert;
     cmap = toLuaBindings "c" config.vim.maps.command;
     tmap = toLuaBindings "t" config.vim.maps.terminal;
     lmap = toLuaBindings "l" config.vim.maps.lang;

From a2eeb7333d073f57c7f0c1e3fd9a0d7ebbd43de9 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Tue, 11 Apr 2023 14:38:08 +0200
Subject: [PATCH 07/25] feat: add lib function to quickly mkIf bindings

---
 lib/stdlib-extended.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lib/stdlib-extended.nix b/lib/stdlib-extended.nix
index f43bc15..8a9fdb4 100644
--- a/lib/stdlib-extended.nix
+++ b/lib/stdlib-extended.nix
@@ -7,6 +7,23 @@ in
   nixpkgsLib.extend (self: super: {
     nvim = mkNvimLib {lib = self;};
 
+    mkLuaBinding = key: action: desc:
+      self.mkIf (key != null) {
+        "${key}" = {
+          inherit action desc;
+          lua = true;
+          silent = true;
+        };
+      };
+
+    mkBinding = key: action: desc:
+      self.mkIf (key != null) {
+        "${key}" = {
+          inherit action desc;
+          silent = true;
+        };
+      };
+
     # For forward compatibility.
     literalExpression = super.literalExpression or super.literalExample;
     literalDocBook = super.literalDocBook or super.literalExample;

From 94a2a035172e9d83076e9ff759188bb3788ab7f8 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Tue, 11 Apr 2023 14:38:27 +0200
Subject: [PATCH 08/25] refactor: use new mapping format

---
 modules/assistant/copilot/config.nix       | 49 +++++++++++++++-------
 modules/assistant/copilot/copilot.nix      | 18 ++++++++
 modules/terminal/toggleterm/config.nix     |  4 +-
 modules/terminal/toggleterm/toggleterm.nix |  2 +-
 4 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/modules/assistant/copilot/config.nix b/modules/assistant/copilot/config.nix
index 4ecac27..f147ea0 100644
--- a/modules/assistant/copilot/config.nix
+++ b/modules/assistant/copilot/config.nix
@@ -7,10 +7,6 @@
 with lib;
 with builtins; let
   cfg = config.vim.assistant.copilot;
-  keyOrFalse = key:
-    if key != null
-    then "'${key}'"
-    else "false";
 in {
   config = mkIf cfg.enable {
     vim.startPlugins = [
@@ -24,24 +20,47 @@ in {
         copilot_node_command = "${cfg.copilot_node_command}",
         panel = {
           keymap = {
-            jump_prev = ${keyOrFalse cfg.mappings.panel.jumpPrev},
-            jump_next = ${keyOrFalse cfg.mappings.panel.jumpNext},
-            accept = ${keyOrFalse cfg.mappings.panel.accept},
-            refresh = ${keyOrFalse cfg.mappings.panel.refresh},
-            open = ${keyOrFalse cfg.mappings.panel.open},
+            jump_prev = false,
+            jump_next = false,
+            accept = false,
+            refresh = false,
+            open = false,
+          },
+          layout = {
+            position = "${cfg.panel.position}",
+            ratio = ${toString cfg.panel.ratio},
           },
         },
         suggestion = {
           keymap = {
-            accept = ${keyOrFalse cfg.mappings.suggestion.accept},
-            accept_word = ${keyOrFalse cfg.mappings.suggestion.acceptWord},
-            accept_line = ${keyOrFalse cfg.mappings.suggestion.acceptLine},
-            next = ${keyOrFalse cfg.mappings.suggestion.next},
-            prev = ${keyOrFalse cfg.mappings.suggestion.prev},
-            dismiss = ${keyOrFalse cfg.mappings.suggestion.dismiss},
+            accept = false,
+            accept_word = false,
+            accept_line = false,
+            next = false,
+            prev = false,
+            dismiss = false,
           },
         },
       })
     '';
+
+    vim.maps.normal = mkMerge [
+      (mkLuaBinding cfg.mappings.panel.jumpPrev "require(\"copilot.panel\").jump_prev" "[copilot] Accept suggestion")
+      (mkLuaBinding cfg.mappings.panel.jumpNext "require(\"copilot.panel\").jump_next" "[copilot] Accept suggestion")
+      (mkLuaBinding cfg.mappings.panel.accept "require(\"copilot.panel\").accept" "[copilot] Accept suggestion")
+      (mkLuaBinding cfg.mappings.panel.refresh "require(\"copilot.panel\").refresh" "[copilot] Accept suggestion")
+      (mkLuaBinding cfg.mappings.panel.open ''
+        function() require("copilot.panel").open({ position = "${cfg.panel.position}", ratio = ${toString cfg.panel.ratio}, }) end
+      '' "[copilot] Accept suggestion")
+    ];
+
+    vim.maps.insert = mkMerge [
+      (mkLuaBinding cfg.mappings.suggestion.accept "require(\"copilot.suggestion\").accept" "[copilot] Accept suggestion")
+      (mkLuaBinding cfg.mappings.suggestion.acceptLine "require(\"copilot.suggestion\").accept_line" "[copilot] Accept suggestion (line)")
+      (mkLuaBinding cfg.mappings.suggestion.acceptWord "require(\"copilot.suggestion\").accept_word" "[copilot] Accept suggestion (word)")
+      (mkLuaBinding cfg.mappings.suggestion.next "require(\"copilot.suggestion\").next" "[copilot] next suggestion")
+      (mkLuaBinding cfg.mappings.suggestion.prev "require(\"copilot.suggestion\").prev" "[copilot] previous suggestion")
+      (mkLuaBinding cfg.mappings.suggestion.dismiss "require(\"copilot.suggestion\").dismiss" "[copilot] dismiss suggestion")
+    ];
   };
 }
diff --git a/modules/assistant/copilot/copilot.nix b/modules/assistant/copilot/copilot.nix
index fcf5a5d..5529dcb 100644
--- a/modules/assistant/copilot/copilot.nix
+++ b/modules/assistant/copilot/copilot.nix
@@ -9,6 +9,24 @@ with builtins; {
   options.vim.assistant.copilot = {
     enable = mkEnableOption "Enable GitHub Copilot";
 
+    panel = {
+      position = mkOption {
+        type = types.enum [
+          "bottom"
+          "top"
+          "left"
+          "right"
+        ];
+        default = "bottom";
+        description = "Panel position";
+      };
+      ratio = mkOption {
+        type = types.float;
+        default = 0.4;
+        description = "Panel size";
+      };
+    };
+
     mappings = {
       panel = {
         jumpPrev = mkOption {
diff --git a/modules/terminal/toggleterm/config.nix b/modules/terminal/toggleterm/config.nix
index c4934dc..e60b9b4 100644
--- a/modules/terminal/toggleterm/config.nix
+++ b/modules/terminal/toggleterm/config.nix
@@ -14,7 +14,7 @@ in {
 
     vim.luaConfigRC.toggleterm = nvim.dag.entryAnywhere ''
       require("toggleterm").setup({
-        open_mapping = '${cfg.mappings.open}',
+        open_mapping = null,
         direction = '${toString cfg.direction}',
         -- TODO: this should probably be turned into a module that uses the lua function if and only if the user has not set it
         size = function(term)
@@ -32,5 +32,7 @@ in {
         },
       })
     '';
+
+    vim.maps.normal = mkBinding cfg.mappings.open "<Cmd>execute v:count . \"ToggleTerm\"<CR>" "Toggle terminal";
   };
 }
diff --git a/modules/terminal/toggleterm/toggleterm.nix b/modules/terminal/toggleterm/toggleterm.nix
index 8c60ea8..d563e22 100644
--- a/modules/terminal/toggleterm/toggleterm.nix
+++ b/modules/terminal/toggleterm/toggleterm.nix
@@ -9,7 +9,7 @@ with builtins; {
     enable = mkEnableOption "Enable toggleterm as a replacement to built-in terminal command";
     mappings = {
       open = mkOption {
-        type = types.str;
+        type = types.nullOr types.str;
         description = "The keymapping to open toggleterm";
         default = "<c-t>";
       };

From c45e71a5a50ba005cf78cf45f370d1973770dd28 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 5 Apr 2023 00:06:30 +0200
Subject: [PATCH 09/25] feat: toggleterm keybindings

---
 modules/terminal/toggleterm/config.nix     | 2 +-
 modules/terminal/toggleterm/toggleterm.nix | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/terminal/toggleterm/config.nix b/modules/terminal/toggleterm/config.nix
index 9e98bb1..c4934dc 100644
--- a/modules/terminal/toggleterm/config.nix
+++ b/modules/terminal/toggleterm/config.nix
@@ -14,7 +14,7 @@ in {
 
     vim.luaConfigRC.toggleterm = nvim.dag.entryAnywhere ''
       require("toggleterm").setup({
-        open_mapping = [[<c-t>]],
+        open_mapping = '${cfg.mappings.open}',
         direction = '${toString cfg.direction}',
         -- TODO: this should probably be turned into a module that uses the lua function if and only if the user has not set it
         size = function(term)
diff --git a/modules/terminal/toggleterm/toggleterm.nix b/modules/terminal/toggleterm/toggleterm.nix
index e2ed940..8c60ea8 100644
--- a/modules/terminal/toggleterm/toggleterm.nix
+++ b/modules/terminal/toggleterm/toggleterm.nix
@@ -7,6 +7,13 @@ with lib;
 with builtins; {
   options.vim.terminal.toggleterm = {
     enable = mkEnableOption "Enable toggleterm as a replacement to built-in terminal command";
+    mappings = {
+      open = mkOption {
+        type = types.str;
+        description = "The keymapping to open toggleterm";
+        default = "<c-t>";
+      };
+    };
     direction = mkOption {
       type = types.enum ["horizontal" "vertical" "tab" "float"];
       default = "horizontal";

From 85c3c250f6eab4e62da34ae0eb879f88c7df1954 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 5 Apr 2023 00:53:21 +0200
Subject: [PATCH 10/25] feat: add Copilot keybindings

---
 modules/assistant/copilot/config.nix  | 23 ++++++++++
 modules/assistant/copilot/copilot.nix | 62 +++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)

diff --git a/modules/assistant/copilot/config.nix b/modules/assistant/copilot/config.nix
index 62d0251..4ecac27 100644
--- a/modules/assistant/copilot/config.nix
+++ b/modules/assistant/copilot/config.nix
@@ -7,6 +7,10 @@
 with lib;
 with builtins; let
   cfg = config.vim.assistant.copilot;
+  keyOrFalse = key:
+    if key != null
+    then "'${key}'"
+    else "false";
 in {
   config = mkIf cfg.enable {
     vim.startPlugins = [
@@ -18,6 +22,25 @@ in {
       require("copilot").setup({
         -- available options: https://github.com/zbirenbaum/copilot.lua
         copilot_node_command = "${cfg.copilot_node_command}",
+        panel = {
+          keymap = {
+            jump_prev = ${keyOrFalse cfg.mappings.panel.jumpPrev},
+            jump_next = ${keyOrFalse cfg.mappings.panel.jumpNext},
+            accept = ${keyOrFalse cfg.mappings.panel.accept},
+            refresh = ${keyOrFalse cfg.mappings.panel.refresh},
+            open = ${keyOrFalse cfg.mappings.panel.open},
+          },
+        },
+        suggestion = {
+          keymap = {
+            accept = ${keyOrFalse cfg.mappings.suggestion.accept},
+            accept_word = ${keyOrFalse cfg.mappings.suggestion.acceptWord},
+            accept_line = ${keyOrFalse cfg.mappings.suggestion.acceptLine},
+            next = ${keyOrFalse cfg.mappings.suggestion.next},
+            prev = ${keyOrFalse cfg.mappings.suggestion.prev},
+            dismiss = ${keyOrFalse cfg.mappings.suggestion.dismiss},
+          },
+        },
       })
     '';
   };
diff --git a/modules/assistant/copilot/copilot.nix b/modules/assistant/copilot/copilot.nix
index ad3e622..fcf5a5d 100644
--- a/modules/assistant/copilot/copilot.nix
+++ b/modules/assistant/copilot/copilot.nix
@@ -9,6 +9,68 @@ with builtins; {
   options.vim.assistant.copilot = {
     enable = mkEnableOption "Enable GitHub Copilot";
 
+    mappings = {
+      panel = {
+        jumpPrev = mkOption {
+          type = types.nullOr types.str;
+          default = "[[";
+          description = "Jump to previous suggestion";
+        };
+        jumpNext = mkOption {
+          type = types.nullOr types.str;
+          default = "]]";
+          description = "Jump to next suggestion";
+        };
+        accept = mkOption {
+          type = types.nullOr types.str;
+          default = "<CR>";
+          description = "Accept suggestion";
+        };
+        refresh = mkOption {
+          type = types.nullOr types.str;
+          default = "gr";
+          description = "Refresh suggestions";
+        };
+        open = mkOption {
+          type = types.nullOr types.str;
+          default = "<M-CR>";
+          description = "Open suggestions";
+        };
+      };
+      suggestion = {
+        accept = mkOption {
+          type = types.nullOr types.str;
+          default = "<M-l>";
+          description = "Accept suggetion";
+        };
+        acceptWord = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = "Accept next word";
+        };
+        acceptLine = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = "Accept next line";
+        };
+        prev = mkOption {
+          type = types.nullOr types.str;
+          default = "<M-[>";
+          description = "Previous suggestion";
+        };
+        next = mkOption {
+          type = types.nullOr types.str;
+          default = "<M-]>";
+          description = "Next suggestion";
+        };
+        dismiss = mkOption {
+          type = types.nullOr types.str;
+          default = "<C-]>";
+          description = "Dismiss suggestion";
+        };
+      };
+    };
+
     copilot_node_command = mkOption {
       type = types.str;
       default = "${lib.getExe pkgs.nodejs-slim-16_x}";

From a54216006d076e391c53abb54db5fb268f450b68 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 10 Apr 2023 13:42:31 +0200
Subject: [PATCH 11/25] refactor!: use a new keymaps configuration format

---
 modules/basic/config.nix                     |  56 +++-
 modules/core/default.nix                     | 297 +++++++++++++------
 modules/lsp/lspsaga/config.nix               |  30 +-
 modules/lsp/lspsaga/lspsaga.nix              |  30 +-
 modules/lsp/nvim-code-action-menu/config.nix |   4 +-
 modules/lsp/trouble/config.nix               |  14 +-
 modules/notes/mind-nvim/config.nix           |   8 +-
 modules/notes/todo-comments/config.nix       |   8 +-
 modules/tabline/nvim-bufferline/config.nix   |  36 +--
 modules/utility/motion/hop/config.nix        |   4 +-
 modules/utility/telescope/config.nix         |  38 +--
 11 files changed, 343 insertions(+), 182 deletions(-)

diff --git a/modules/basic/config.nix b/modules/basic/config.nix
index a06cae2..3fdb45e 100644
--- a/modules/basic/config.nix
+++ b/modules/basic/config.nix
@@ -10,21 +10,51 @@ in {
   config = {
     vim.startPlugins = ["plenary-nvim"];
 
-    vim.nmap = mkIf cfg.disableArrows {
-      "<up>" = "<nop>";
-      "<down>" = "<nop>";
-      "<left>" = "<nop>";
-      "<right>" = "<nop>";
-    };
+    vim.maps.normal =
+      mkIf cfg.disableArrows {
+        "<up>" = {
+          action = "<nop>";
 
-    vim.imap = mkIf cfg.disableArrows {
-      "<up>" = "<nop>";
-      "<down>" = "<nop>";
-      "<left>" = "<nop>";
-      "<right>" = "<nop>";
-    };
+          noremap = false;
+        };
+        "<down>" = {
+          action = "<nop>";
 
-    vim.nnoremap = mkIf cfg.mapLeaderSpace {"<space>" = "<nop>";};
+          noremap = false;
+        };
+        "<left>" = {
+          action = "<nop>";
+          noremap = false;
+        };
+        "<right>" = {
+          action = "<nop>";
+          noremap = false;
+        };
+      }
+      // mkIf cfg.mapLeaderSpace {
+        "<space>" = {
+          action = "<nop>";
+        };
+      };
+
+    vim.maps.insert = mkIf cfg.disableArrows {
+      "<up>" = {
+        action = "<nop>";
+        noremap = false;
+      };
+      "<down>" = {
+        action = "<nop>";
+        noremap = false;
+      };
+      "<left>" = {
+        action = "<nop>";
+        noremap = false;
+      };
+      "<right>" = {
+        action = "<nop>";
+        noremap = false;
+      };
+    };
 
     vim.configRC.basic = nvim.dag.entryAfter ["globalsScript"] ''
       " Debug mode settings
diff --git a/modules/core/default.nix b/modules/core/default.nix
index 78232b3..6e92cff 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -19,6 +19,107 @@ with builtins; let
         type = with types; attrsOf (nullOr str);
       }
       // it);
+
+  mkBool = value: description:
+    mkOption {
+      type = types.bool;
+      default = value;
+      description = description;
+    };
+
+  # Most of the keybindings code is highly inspired by pta2002/nixvim. Thank you!
+  mapConfigOptions = {
+    silent =
+      mkBool false
+      "Whether this mapping should be silent. Equivalent to adding <silent> to a map.";
+
+    nowait =
+      mkBool false
+      "Whether to wait for extra input on ambiguous mappings. Equivalent to adding <nowait> to a map.";
+
+    script =
+      mkBool false
+      "Equivalent to adding <script> to a map.";
+
+    expr =
+      mkBool false
+      "Means that the action is actually an expression. Equivalent to adding <expr> to a map.";
+
+    unique =
+      mkBool false
+      "Whether to fail if the map is already defined. Equivalent to adding <unique> to a map.";
+
+    noremap =
+      mkBool true
+      "Whether to use the 'noremap' variant of the command, ignoring any custom mappings on the defined action. It is highly advised to keep this on, which is the default.";
+
+    desc = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = "A description of this keybind, to be shown in which-key, if you have it enabled.";
+    };
+  };
+
+  genMaps = mode: maps: let
+    /*
+    Take a user-defined action (string or attrs) and return the following attribute set:
+    {
+      action = (string) the actual action to map to this key
+      config = (attrs) the configuration options for this mapping (noremap, silent...)
+    }
+    */
+    normalizeAction = action: let
+      # Extract the values of the config options that have been explicitly set by the user
+      config =
+        filterAttrs (n: v: v != null)
+        (getAttrs (attrNames mapConfigOptions) action);
+    in {
+      config =
+        if config == {}
+        then {"__empty" = null;}
+        else config;
+      action =
+        if action.lua
+        then {"__raw" = action.action;}
+        else action.action;
+    };
+  in
+    builtins.attrValues (builtins.mapAttrs
+      (key: action: let
+        normalizedAction = normalizeAction action;
+      in {
+        inherit (normalizedAction) action config;
+        key = key;
+        mode = mode;
+      })
+      maps);
+
+  mapOption = types.submodule {
+    options =
+      mapConfigOptions
+      // {
+        action = mkOption {
+          type = types.str;
+          description = "The action to execute.";
+        };
+
+        lua = mkOption {
+          type = types.bool;
+          description = ''
+            If true, `action` is considered to be lua code.
+            Thus, it will not be wrapped in `""`.
+          '';
+          default = false;
+        };
+      };
+  };
+
+  mapOptions = mode:
+    mkOption {
+      description = "Mappings for ${mode} mode";
+      type = types.attrsOf mapOption;
+      default = {};
+    };
 in {
   options.vim = {
     viAlias = mkOption {
@@ -67,64 +168,39 @@ in {
       type = types.attrs;
     };
 
-    nnoremap =
-      mkMappingOption {description = "Defines 'Normal mode' mappings";};
+    maps = mkOption {
+      type = types.submodule {
+        options = {
+          normal = mapOptions "normal";
+          insert = mapOptions "insert";
+          select = mapOptions "select";
+          visual = mapOptions "visual and select";
+          terminal = mapOptions "terminal";
+          normalVisualOp = mapOptions "normal, visual, select and operator-pending (same as plain 'map')";
 
-    inoremap = mkMappingOption {
-      description = "Defines 'Insert and Replace mode' mappings";
-    };
+          visualOnly = mapOptions "visual only";
+          operator = mapOptions "operator-pending";
+          insertCommand = mapOptions "insert and command-line";
+          lang = mapOptions "insert, command-line and lang-arg";
+          command = mapOptions "command-line";
+        };
+      };
+      default = {};
+      description = ''
+        Custom keybindings for any mode.
 
-    vnoremap = mkMappingOption {
-      description = "Defines 'Visual and Select mode' mappings";
-    };
+        For plain maps (e.g. just 'map' or 'remap') use maps.normalVisualOp.
+      '';
 
-    xnoremap =
-      mkMappingOption {description = "Defines 'Visual mode' mappings";};
-
-    snoremap =
-      mkMappingOption {description = "Defines 'Select mode' mappings";};
-
-    cnoremap =
-      mkMappingOption {description = "Defines 'Command-line mode' mappings";};
-
-    onoremap = mkMappingOption {
-      description = "Defines 'Operator pending mode' mappings";
-    };
-
-    tnoremap = mkMappingOption {
-      description = "Defines 'Terminal mode' mappings";
-    };
-
-    nmap = mkMappingOption {
-      description = "Defines 'Normal mode' mappings";
-    };
-
-    imap = mkMappingOption {
-      description = "Defines 'Insert and Replace mode' mappings";
-    };
-
-    vmap = mkMappingOption {
-      description = "Defines 'Visual and Select mode' mappings";
-    };
-
-    xmap = mkMappingOption {
-      description = "Defines 'Visual mode' mappings";
-    };
-
-    smap = mkMappingOption {
-      description = "Defines 'Select mode' mappings";
-    };
-
-    cmap = mkMappingOption {
-      description = "Defines 'Command-line mode' mappings";
-    };
-
-    omap = mkMappingOption {
-      description = "Defines 'Operator pending mode' mappings";
-    };
-
-    tmap = mkMappingOption {
-      description = "Defines 'Terminal mode' mappings";
+      example = ''
+        maps = {
+          normalVisualOp.";" = ":"; # Same as noremap ; :
+          normal."<leader>m" = {
+            silent = true;
+            action = "<cmd>make<CR>";
+          }; # Same as nnoremap <leader>m <silent> <cmd>make<CR>
+        };
+      '';
     };
   };
 
@@ -148,34 +224,66 @@ in {
       mapAttrsFlatten (name: value: "let g:${name}=${valToVim value}")
       (filterNonNull cfg.globals);
 
-    matchCtrl = it: match "Ctrl-(.)(.*)" it;
-    mapKeyBinding = it: let
-      groups = matchCtrl it;
-    in
-      if groups == null
-      then it
-      else "<C-${toUpper (head groups)}>${head (tail groups)}";
-    mapVimBinding = prefix: mappings:
-      mapAttrsFlatten (name: value: "${prefix} ${mapKeyBinding name} ${value}")
-      (filterNonNull mappings);
+    toLuaObject = args:
+      if builtins.isAttrs args
+      then
+        if hasAttr "__raw" args
+        then args.__raw
+        else if hasAttr "__empty" args
+        then "{ }"
+        else
+          "{"
+          + (concatStringsSep ","
+            (mapAttrsToList
+              (n: v:
+                if head (stringToCharacters n) == "@"
+                then toLuaObject v
+                else "[${toLuaObject n}] = " + (toLuaObject v))
+              (filterAttrs
+                (
+                  n: v:
+                    !isNull v && (toLuaObject v != "{}")
+                )
+                args)))
+          + "}"
+      else if builtins.isList args
+      then "{" + concatMapStringsSep "," toLuaObject args + "}"
+      else if builtins.isString args
+      then
+        # This should be enough!
+        builtins.toJSON args
+      else if builtins.isPath args
+      then builtins.toJSON (toString args)
+      else if builtins.isBool args
+      then "${boolToString args}"
+      else if builtins.isFloat args
+      then "${toString args}"
+      else if builtins.isInt args
+      then "${toString args}"
+      else if isNull args
+      then "nil"
+      else "";
 
-    nmap = mapVimBinding "nmap" config.vim.nmap;
-    imap = mapVimBinding "imap" config.vim.imap;
-    vmap = mapVimBinding "vmap" config.vim.vmap;
-    xmap = mapVimBinding "xmap" config.vim.xmap;
-    smap = mapVimBinding "smap" config.vim.smap;
-    cmap = mapVimBinding "cmap" config.vim.cmap;
-    omap = mapVimBinding "omap" config.vim.omap;
-    tmap = mapVimBinding "tmap" config.vim.tmap;
+    toLuaBindings = mode: maps:
+      builtins.map (value: ''
+        map("${mode}", "${value.key}", ${
+          if value.action ? "__raw"
+          then value.action."__raw"
+          else "\"${value.action}\""
+        }, ${toLuaObject value.config})'') (genMaps mode maps);
 
-    nnoremap = mapVimBinding "nnoremap" config.vim.nnoremap;
-    inoremap = mapVimBinding "inoremap" config.vim.inoremap;
-    vnoremap = mapVimBinding "vnoremap" config.vim.vnoremap;
-    xnoremap = mapVimBinding "xnoremap" config.vim.xnoremap;
-    snoremap = mapVimBinding "snoremap" config.vim.snoremap;
-    cnoremap = mapVimBinding "cnoremap" config.vim.cnoremap;
-    onoremap = mapVimBinding "onoremap" config.vim.onoremap;
-    tnoremap = mapVimBinding "tnoremap" config.vim.tnoremap;
+    # I'm not sure if every one of these will work.
+    allmap = toLuaBindings "" config.vim.maps.normalVisualOp;
+    nmap = toLuaBindings "n" config.vim.maps.normal;
+    vmap = toLuaBindings "v" config.vim.maps.visual;
+    xmap = toLuaBindings "x" config.vim.maps.visualOnly;
+    smap = toLuaBindings "s" config.vim.maps.select;
+    imap = toLuaBindings "u" config.vim.maps.insert;
+    cmap = toLuaBindings "c" config.vim.maps.command;
+    tmap = toLuaBindings "t" config.vim.maps.terminal;
+    lmap = toLuaBindings "l" config.vim.maps.lang;
+    omap = toLuaBindings "o" config.vim.maps.operator;
+    icmap = toLuaBindings "ic" config.vim.maps.insertCommand;
 
     resolveDag = {
       name,
@@ -209,8 +317,31 @@ in {
           nvim.dag.entryAfter ["globalsScript"] luaConfig;
 
         mappings = let
-          maps = [nmap imap vmap xmap smap cmap omap tmap nnoremap inoremap vnoremap xnoremap snoremap cnoremap onoremap tnoremap];
-          mapConfig = concatStringsSep "\n" (map (v: concatStringsSep "\n" v) maps);
+          maps = [
+            (splitString
+              "\n"
+              ''
+                local function map(mode, lhs, rhs, opts)
+                  local options = { noremap=true, silent=true }
+                  if opts then
+                    options = vim.tbl_extend('force', options, opts)
+                  end
+                  vim.api.nvim_set_keymap(mode, lhs, rhs, options)
+                end
+              '')
+            nmap
+            imap
+            vmap
+            xmap
+            smap
+            cmap
+            omap
+            tmap
+            lmap
+            icmap
+            allmap
+          ];
+          mapConfig = wrapLuaConfig (concatStringsSep "\n" (map (v: concatStringsSep "\n" v) maps));
         in
           nvim.dag.entryAfter ["globalsScript"] mapConfig;
       };
diff --git a/modules/lsp/lspsaga/config.nix b/modules/lsp/lspsaga/config.nix
index f8f8024..e8c71fa 100644
--- a/modules/lsp/lspsaga/config.nix
+++ b/modules/lsp/lspsaga/config.nix
@@ -10,34 +10,34 @@ in {
   config = mkIf (cfg.enable && cfg.lspsaga.enable) {
     vim.startPlugins = ["lspsaga"];
 
-    vim.vnoremap = {
-      "<silent><leader>ca" = ":<C-U>lua require('lspsaga.codeaction').range_code_action()<CR>";
+    vim.maps.visual = {
+      "<silent><leader>ca" = {action = ":<C-U>lua require('lspsaga.codeaction').range_code_action()<CR>";};
     };
 
-    vim.nnoremap =
+    vim.maps.normal =
       {
-        "<silent><leader>lf" = "<cmd>lua require'lspsaga.provider'.lsp_finder()<CR>";
-        "<silent><leader>lh" = "<cmd>lua require('lspsaga.hover').render_hover_doc()<CR>";
-        "<silent><C-f>" = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(1)<CR>";
-        "<silent><C-b>" = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(-1)<CR>";
-        "<silent><leader>lr" = "<cmd>lua require'lspsaga.rename'.rename()<CR>";
-        "<silent><leader>ld" = "<cmd>lua require'lspsaga.provider'.preview_definition()<CR>";
-        "<silent><leader>ll" = "<cmd>lua require'lspsaga.diagnostic'.show_line_diagnostics()<CR>";
-        "<silent><leader>lc" = "<cmd>lua require'lspsaga.diagnostic'.show_cursor_diagnostics()<CR>";
-        "<silent><leader>lp" = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_prev()<CR>";
-        "<silent><leader>ln" = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_next()<CR>";
+        "<silent><leader>lf" = {action = "<cmd>lua require'lspsaga.provider'.lsp_finder()<CR>";};
+        "<silent><leader>lh" = {action = "<cmd>lua require('lspsaga.hover').render_hover_doc()<CR>";};
+        "<silent><C-f>" = {action = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(1)<CR>";};
+        "<silent><C-b>" = {action = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(-1)<CR>";};
+        "<silent><leader>lr" = {action = "<cmd>lua require'lspsaga.rename'.rename()<CR>";};
+        "<silent><leader>ld" = {action = "<cmd>lua require'lspsaga.provider'.preview_definition()<CR>";};
+        "<silent><leader>ll" = {action = "<cmd>lua require'lspsaga.diagnostic'.show_line_diagnostics()<CR>";};
+        "<silent><leader>lc" = {action = "<cmd>lua require'lspsaga.diagnostic'.show_cursor_diagnostics()<CR>";};
+        "<silent><leader>lp" = {action = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_prev()<CR>";};
+        "<silent><leader>ln" = {action = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_next()<CR>";};
       }
       // (
         if (!cfg.nvimCodeActionMenu.enable)
         then {
-          "<silent><leader>ca" = "<cmd>lua require('lspsaga.codeaction').code_action()<CR>";
+          "<silent><leader>ca" = {action = "<cmd>lua require('lspsaga.codeaction').code_action()<CR>";};
         }
         else {}
       )
       // (
         if (!cfg.lspSignature.enable)
         then {
-          "<silent><leader>ls" = "<cmd>lua require('lspsaga.signaturehelp').signature_help()<CR>";
+          "<silent><leader>ls" = {action = "<cmd>lua require('lspsaga.signaturehelp').signature_help()<CR>";};
         }
         else {}
       );
diff --git a/modules/lsp/lspsaga/lspsaga.nix b/modules/lsp/lspsaga/lspsaga.nix
index eecfa42..6107273 100644
--- a/modules/lsp/lspsaga/lspsaga.nix
+++ b/modules/lsp/lspsaga/lspsaga.nix
@@ -12,34 +12,34 @@ in {
   config = mkIf (cfg.enable && cfg.lspsaga.enable) {
     vim.startPlugins = ["lspsaga"];
 
-    vim.vnoremap = {
-      "<silent><leader>ca" = ":<C-U>lua require('lspsaga.codeaction').range_code_action()<CR>";
+    vim.maps.visual = {
+      "<silent><leader>ca" = {action = ":<C-U>lua require('lspsaga.codeaction').range_code_action()<CR>";};
     };
 
-    vim.nnoremap =
+    vim.maps.normal =
       {
-        "<silent><leader>lf" = "<cmd>lua require'lspsaga.provider'.lsp_finder()<CR>";
-        "<silent><leader>lh" = "<cmd>lua require('lspsaga.hover').render_hover_doc()<CR>";
-        "<silent><C-f>" = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(1)<CR>";
-        "<silent><C-b>" = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(-1)<CR>";
-        "<silent><leader>lr" = "<cmd>lua require'lspsaga.rename'.rename()<CR>";
-        "<silent><leader>ld" = "<cmd>lua require'lspsaga.provider'.preview_definition()<CR>";
-        "<silent><leader>ll" = "<cmd>lua require'lspsaga.diagnostic'.show_line_diagnostics()<CR>";
-        "<silent><leader>lc" = "<cmd>lua require'lspsaga.diagnostic'.show_cursor_diagnostics()<CR>";
-        "<silent><leader>lp" = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_prev()<CR>";
-        "<silent><leader>ln" = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_next()<CR>";
+        "<silent><leader>lf" = {action = "<cmd>lua require'lspsaga.provider'.lsp_finder()<CR>";};
+        "<silent><leader>lh" = {action = "<cmd>lua require('lspsaga.hover').render_hover_doc()<CR>";};
+        "<silent><C-f>" = {action = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(1)<CR>";};
+        "<silent><C-b>" = {action = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(-1)<CR>";};
+        "<silent><leader>lr" = {action = "<cmd>lua require'lspsaga.rename'.rename()<CR>";};
+        "<silent><leader>ld" = {action = "<cmd>lua require'lspsaga.provider'.preview_definition()<CR>";};
+        "<silent><leader>ll" = {action = "<cmd>lua require'lspsaga.diagnostic'.show_line_diagnostics()<CR>";};
+        "<silent><leader>lc" = {action = "<cmd>lua require'lspsaga.diagnostic'.show_cursor_diagnostics()<CR>";};
+        "<silent><leader>lp" = {action = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_prev()<CR>";};
+        "<silent><leader>ln" = {action = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_next()<CR>";};
       }
       // (
         if (!cfg.nvimCodeActionMenu.enable)
         then {
-          "<silent><leader>ca" = "<cmd>lua require('lspsaga.codeaction').code_action()<CR>";
+          "<silent><leader>ca" = {action = "<cmd>lua require('lspsaga.codeaction').code_action()<CR>";};
         }
         else {}
       )
       // (
         if (!cfg.lspSignature.enable)
         then {
-          "<silent><leader>ls" = "<cmd>lua require('lspsaga.signaturehelp').signature_help()<CR>";
+          "<silent><leader>ls" = {action = "<cmd>lua require('lspsaga.signaturehelp').signature_help()<CR>";};
         }
         else {}
       );
diff --git a/modules/lsp/nvim-code-action-menu/config.nix b/modules/lsp/nvim-code-action-menu/config.nix
index 27d3cbb..dd7a1a5 100644
--- a/modules/lsp/nvim-code-action-menu/config.nix
+++ b/modules/lsp/nvim-code-action-menu/config.nix
@@ -10,8 +10,8 @@ in {
   config = mkIf (cfg.enable && cfg.nvimCodeActionMenu.enable) {
     vim.startPlugins = ["nvim-code-action-menu"];
 
-    vim.nnoremap = {
-      "<silent><leader>ca" = ":CodeActionMenu<CR>";
+    vim.maps.normal = {
+      "<silent><leader>ca" = {action = ":CodeActionMenu<CR>";};
     };
   };
 }
diff --git a/modules/lsp/trouble/config.nix b/modules/lsp/trouble/config.nix
index 092802a..bb6536c 100644
--- a/modules/lsp/trouble/config.nix
+++ b/modules/lsp/trouble/config.nix
@@ -10,13 +10,13 @@ in {
   config = mkIf (cfg.enable && cfg.trouble.enable) {
     vim.startPlugins = ["trouble"];
 
-    vim.nnoremap = {
-      "<leader>xx" = "<cmd>TroubleToggle<CR>";
-      "<leader>lwd" = "<cmd>TroubleToggle workspace_diagnostics<CR>";
-      "<leader>ld" = "<cmd>TroubleToggle document_diagnostics<CR>";
-      "<leader>lr" = "<cmd>TroubleToggle lsp_references<CR>";
-      "<leader>xq" = "<cmd>TroubleToggle quickfix<CR>";
-      "<leader>xl" = "<cmd>TroubleToggle loclist<CR>";
+    vim.maps.normal = {
+      "<leader>xx" = {action = "<cmd>TroubleToggle<CR>";};
+      "<leader>lwd" = {action = "<cmd>TroubleToggle workspace_diagnostics<CR>";};
+      "<leader>ld" = {action = "<cmd>TroubleToggle document_diagnostics<CR>";};
+      "<leader>lr" = {action = "<cmd>TroubleToggle lsp_references<CR>";};
+      "<leader>xq" = {action = "<cmd>TroubleToggle quickfix<CR>";};
+      "<leader>xl" = {action = "<cmd>TroubleToggle loclist<CR>";};
     };
 
     vim.luaConfigRC.trouble = nvim.dag.entryAnywhere ''
diff --git a/modules/notes/mind-nvim/config.nix b/modules/notes/mind-nvim/config.nix
index befbf70..5e23f06 100644
--- a/modules/notes/mind-nvim/config.nix
+++ b/modules/notes/mind-nvim/config.nix
@@ -12,10 +12,10 @@ in {
       "mind-nvim"
     ];
 
-    vim.nnoremap = {
-      "<leader>om" = ":MindOpenMain<CR>";
-      "<leader>op" = ":MindOpenProject<CR>";
-      "<leader>oc" = ":MindClose<CR>";
+    vim.maps.normal = {
+      "<leader>om" = {action = ":MindOpenMain<CR>";};
+      "<leader>op" = {action = ":MindOpenProject<CR>";};
+      "<leader>oc" = {action = ":MindClose<CR>";};
     };
 
     vim.luaConfigRC.mind-nvim = nvim.dag.entryAnywhere ''
diff --git a/modules/notes/todo-comments/config.nix b/modules/notes/todo-comments/config.nix
index c04aa8d..45a26bc 100644
--- a/modules/notes/todo-comments/config.nix
+++ b/modules/notes/todo-comments/config.nix
@@ -13,10 +13,10 @@ in {
       "todo-comments"
     ];
 
-    vim.nnoremap = {
-      "<leader>tdq" = ":TodoQuickFix<CR>";
-      "<leader>tds" = ":TodoTelescope<CR>";
-      "<leader>tdt" = ":TodoTrouble<CR>";
+    vim.maps.normal = {
+      "<leader>tdq" = {action = ":TodoQuickFix<CR>";};
+      "<leader>tds" = {action = ":TodoTelescope<CR>";};
+      "<leader>tdt" = {action = ":TodoTrouble<CR>";};
     };
 
     vim.luaConfigRC.todo-comments = ''
diff --git a/modules/tabline/nvim-bufferline/config.nix b/modules/tabline/nvim-bufferline/config.nix
index 4ed2820..960eb00 100644
--- a/modules/tabline/nvim-bufferline/config.nix
+++ b/modules/tabline/nvim-bufferline/config.nix
@@ -23,24 +23,24 @@ in {
         "bufdelete-nvim"
       ];
 
-      vim.nnoremap = {
-        "<silent><leader>bn" = ":BufferLineCycleNext<CR>";
-        "<silent><leader>bp" = ":BufferLineCyclePrev<CR>";
-        "<silent><leader>bc" = ":BufferLinePick<CR>";
-        "<silent><leader>bse" = ":BufferLineSortByExtension<CR>";
-        "<silent><leader>bsd" = ":BufferLineSortByDirectory<CR>";
-        "<silent><leader>bsi" = ":lua require'bufferline'.sort_buffers_by(function (buf_a, buf_b) return buf_a.id < buf_b.id end)<CR>";
-        "<silent><leader>bmn" = ":BufferLineMoveNext<CR>";
-        "<silent><leader>bmp" = ":BufferLineMovePrev<CR>";
-        "<silent><leader>b1" = "<Cmd>BufferLineGoToBuffer 1<CR>";
-        "<silent><leader>b2" = "<Cmd>BufferLineGoToBuffer 2<CR>";
-        "<silent><leader>b3" = "<Cmd>BufferLineGoToBuffer 3<CR>";
-        "<silent><leader>b4" = "<Cmd>BufferLineGoToBuffer 4<CR>";
-        "<silent><leader>b5" = "<Cmd>BufferLineGoToBuffer 5<CR>";
-        "<silent><leader>b6" = "<Cmd>BufferLineGoToBuffer 6<CR>";
-        "<silent><leader>b7" = "<Cmd>BufferLineGoToBuffer 7<CR>";
-        "<silent><leader>b8" = "<Cmd>BufferLineGoToBuffer 8<CR>";
-        "<silent><leader>b9" = "<Cmd>BufferLineGoToBuffer 9<CR>";
+      vim.maps.normal = {
+        "<silent><leader>bn" = {action = ":BufferLineCycleNext<CR>";};
+        "<silent><leader>bp" = {action = ":BufferLineCyclePrev<CR>";};
+        "<silent><leader>bc" = {action = ":BufferLinePick<CR>";};
+        "<silent><leader>bse" = {action = ":BufferLineSortByExtension<CR>";};
+        "<silent><leader>bsd" = {action = ":BufferLineSortByDirectory<CR>";};
+        "<silent><leader>bsi" = {action = ":lua require'bufferline'.sort_buffers_by(function (buf_a, buf_b) return buf_a.id < buf_b.id end)<CR>";};
+        "<silent><leader>bmn" = {action = ":BufferLineMoveNext<CR>";};
+        "<silent><leader>bmp" = {action = ":BufferLineMovePrev<CR>";};
+        "<silent><leader>b1" = {action = "<Cmd>BufferLineGoToBuffer 1<CR>";};
+        "<silent><leader>b2" = {action = "<Cmd>BufferLineGoToBuffer 2<CR>";};
+        "<silent><leader>b3" = {action = "<Cmd>BufferLineGoToBuffer 3<CR>";};
+        "<silent><leader>b4" = {action = "<Cmd>BufferLineGoToBuffer 4<CR>";};
+        "<silent><leader>b5" = {action = "<Cmd>BufferLineGoToBuffer 5<CR>";};
+        "<silent><leader>b6" = {action = "<Cmd>BufferLineGoToBuffer 6<CR>";};
+        "<silent><leader>b7" = {action = "<Cmd>BufferLineGoToBuffer 7<CR>";};
+        "<silent><leader>b8" = {action = "<Cmd>BufferLineGoToBuffer 8<CR>";};
+        "<silent><leader>b9" = {action = "<Cmd>BufferLineGoToBuffer 9<CR>";};
       };
 
       vim.luaConfigRC.nvimBufferline = nvim.dag.entryAnywhere ''
diff --git a/modules/utility/motion/hop/config.nix b/modules/utility/motion/hop/config.nix
index 3f25a07..b2b1a8e 100644
--- a/modules/utility/motion/hop/config.nix
+++ b/modules/utility/motion/hop/config.nix
@@ -9,8 +9,8 @@ in {
   config = mkIf cfg.enable {
     vim.startPlugins = ["hop-nvim"];
 
-    vim.nnoremap = {
-      "<leader>h" = "<cmd> HopPattern<CR>";
+    vim.maps.normal."<leader>h" = {
+      action = "<cmd> HopPattern<CR>";
     };
 
     vim.luaConfigRC.hop-nvim = nvim.dag.entryAnywhere ''
diff --git a/modules/utility/telescope/config.nix b/modules/utility/telescope/config.nix
index 36b1823..01a96a3 100644
--- a/modules/utility/telescope/config.nix
+++ b/modules/utility/telescope/config.nix
@@ -13,38 +13,38 @@ in {
       "telescope"
     ];
 
-    vim.nnoremap =
+    vim.maps.normal =
       {
-        "<leader>ff" = "<cmd> Telescope find_files<CR>";
-        "<leader>fg" = "<cmd> Telescope live_grep<CR>";
-        "<leader>fb" = "<cmd> Telescope buffers<CR>";
-        "<leader>fh" = "<cmd> Telescope help_tags<CR>";
-        "<leader>ft" = "<cmd> Telescope<CR>";
+        "<leader>ff" = {action = "<cmd> Telescope find_files<CR>";};
+        "<leader>fg" = {action = "<cmd> Telescope live_grep<CR>";};
+        "<leader>fb" = {action = "<cmd> Telescope buffers<CR>";};
+        "<leader>fh" = {action = "<cmd> Telescope help_tags<CR>";};
+        "<leader>ft" = {action = "<cmd> Telescope<CR>";};
 
-        "<leader>fvcw" = "<cmd> Telescope git_commits<CR>";
-        "<leader>fvcb" = "<cmd> Telescope git_bcommits<CR>";
-        "<leader>fvb" = "<cmd> Telescope git_branches<CR>";
-        "<leader>fvs" = "<cmd> Telescope git_status<CR>";
-        "<leader>fvx" = "<cmd> Telescope git_stash<CR>";
+        "<leader>fvcw" = {action = "<cmd> Telescope git_commits<CR>";};
+        "<leader>fvcb" = {action = "<cmd> Telescope git_bcommits<CR>";};
+        "<leader>fvb" = {action = "<cmd> Telescope git_branches<CR>";};
+        "<leader>fvs" = {action = "<cmd> Telescope git_status<CR>";};
+        "<leader>fvx" = {action = "<cmd> Telescope git_stash<CR>";};
       }
       // (
         if config.vim.lsp.enable
         then {
-          "<leader>flsb" = "<cmd> Telescope lsp_document_symbols<CR>";
-          "<leader>flsw" = "<cmd> Telescope lsp_workspace_symbols<CR>";
+          "<leader>flsb" = {action = "<cmd> Telescope lsp_document_symbols<CR>";};
+          "<leader>flsw" = {action = "<cmd> Telescope lsp_workspace_symbols<CR>";};
 
-          "<leader>flr" = "<cmd> Telescope lsp_references<CR>";
-          "<leader>fli" = "<cmd> Telescope lsp_implementations<CR>";
-          "<leader>flD" = "<cmd> Telescope lsp_definitions<CR>";
-          "<leader>flt" = "<cmd> Telescope lsp_type_definitions<CR>";
-          "<leader>fld" = "<cmd> Telescope diagnostics<CR>";
+          "<leader>flr" = {action = "<cmd> Telescope lsp_references<CR>";};
+          "<leader>fli" = {action = "<cmd> Telescope lsp_implementations<CR>";};
+          "<leader>flD" = {action = "<cmd> Telescope lsp_definitions<CR>";};
+          "<leader>flt" = {action = "<cmd> Telescope lsp_type_definitions<CR>";};
+          "<leader>fld" = {action = "<cmd> Telescope diagnostics<CR>";};
         }
         else {}
       )
       // (
         if config.vim.treesitter.enable
         then {
-          "<leader>fs" = "<cmd> Telescope treesitter<CR>";
+          "<leader>fs" = {action = "<cmd> Telescope treesitter<CR>";};
         }
         else {}
       );

From fbf1cbc763033b191d8f9d9ecfb127810492c1e0 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 10 Apr 2023 22:27:13 +0200
Subject: [PATCH 12/25] fix: properly escale quotes in values

---
 modules/core/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/core/default.nix b/modules/core/default.nix
index 6e92cff..ba257cf 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -266,10 +266,8 @@ in {
 
     toLuaBindings = mode: maps:
       builtins.map (value: ''
-        map("${mode}", "${value.key}", ${
-          if value.action ? "__raw"
-          then value.action."__raw"
-          else "\"${value.action}\""
+        map(${toLuaObject mode}, ${toLuaObject value.key}, ${
+          toLuaObject value.action
         }, ${toLuaObject value.config})'') (genMaps mode maps);
 
     # I'm not sure if every one of these will work.
@@ -316,6 +314,7 @@ in {
         in
           nvim.dag.entryAfter ["globalsScript"] luaConfig;
 
+        # This is probably not the right way to set the config. I'm not sure how it should look like.
         mappings = let
           maps = [
             (splitString

From 641abe6b5ceb333c8111b50f40dc514537b6b143 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 10 Apr 2023 22:43:41 +0200
Subject: [PATCH 13/25] refactor: use builtin nvim function

---
 modules/core/default.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/modules/core/default.nix b/modules/core/default.nix
index ba257cf..0fdd1cb 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -266,7 +266,7 @@ in {
 
     toLuaBindings = mode: maps:
       builtins.map (value: ''
-        map(${toLuaObject mode}, ${toLuaObject value.key}, ${
+        vim.keymap.set(${toLuaObject mode}, ${toLuaObject value.key}, ${
           toLuaObject value.action
         }, ${toLuaObject value.config})'') (genMaps mode maps);
 
@@ -317,17 +317,6 @@ in {
         # This is probably not the right way to set the config. I'm not sure how it should look like.
         mappings = let
           maps = [
-            (splitString
-              "\n"
-              ''
-                local function map(mode, lhs, rhs, opts)
-                  local options = { noremap=true, silent=true }
-                  if opts then
-                    options = vim.tbl_extend('force', options, opts)
-                  end
-                  vim.api.nvim_set_keymap(mode, lhs, rhs, options)
-                end
-              '')
             nmap
             imap
             vmap

From 0bb56fb1a726aa45ff0c3326db6daa01e8126056 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 10 Apr 2023 22:44:18 +0200
Subject: [PATCH 14/25] fix: correct imap misspelling

---
 modules/core/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/core/default.nix b/modules/core/default.nix
index 0fdd1cb..d16f21d 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -276,7 +276,7 @@ in {
     vmap = toLuaBindings "v" config.vim.maps.visual;
     xmap = toLuaBindings "x" config.vim.maps.visualOnly;
     smap = toLuaBindings "s" config.vim.maps.select;
-    imap = toLuaBindings "u" config.vim.maps.insert;
+    imap = toLuaBindings "i" config.vim.maps.insert;
     cmap = toLuaBindings "c" config.vim.maps.command;
     tmap = toLuaBindings "t" config.vim.maps.terminal;
     lmap = toLuaBindings "l" config.vim.maps.lang;

From 86d91dbac5f1bce8f90d0e2e57b8c6022a2f8761 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Tue, 11 Apr 2023 14:38:08 +0200
Subject: [PATCH 15/25] feat: add lib function to quickly mkIf bindings

---
 lib/stdlib-extended.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lib/stdlib-extended.nix b/lib/stdlib-extended.nix
index f43bc15..8a9fdb4 100644
--- a/lib/stdlib-extended.nix
+++ b/lib/stdlib-extended.nix
@@ -7,6 +7,23 @@ in
   nixpkgsLib.extend (self: super: {
     nvim = mkNvimLib {lib = self;};
 
+    mkLuaBinding = key: action: desc:
+      self.mkIf (key != null) {
+        "${key}" = {
+          inherit action desc;
+          lua = true;
+          silent = true;
+        };
+      };
+
+    mkBinding = key: action: desc:
+      self.mkIf (key != null) {
+        "${key}" = {
+          inherit action desc;
+          silent = true;
+        };
+      };
+
     # For forward compatibility.
     literalExpression = super.literalExpression or super.literalExample;
     literalDocBook = super.literalDocBook or super.literalExample;

From 136958af36019737902027b326f53cea46563a53 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Tue, 11 Apr 2023 14:38:27 +0200
Subject: [PATCH 16/25] refactor: use new mapping format

---
 modules/assistant/copilot/config.nix       | 49 +++++++++++++++-------
 modules/assistant/copilot/copilot.nix      | 18 ++++++++
 modules/terminal/toggleterm/config.nix     |  4 +-
 modules/terminal/toggleterm/toggleterm.nix |  2 +-
 4 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/modules/assistant/copilot/config.nix b/modules/assistant/copilot/config.nix
index 4ecac27..f147ea0 100644
--- a/modules/assistant/copilot/config.nix
+++ b/modules/assistant/copilot/config.nix
@@ -7,10 +7,6 @@
 with lib;
 with builtins; let
   cfg = config.vim.assistant.copilot;
-  keyOrFalse = key:
-    if key != null
-    then "'${key}'"
-    else "false";
 in {
   config = mkIf cfg.enable {
     vim.startPlugins = [
@@ -24,24 +20,47 @@ in {
         copilot_node_command = "${cfg.copilot_node_command}",
         panel = {
           keymap = {
-            jump_prev = ${keyOrFalse cfg.mappings.panel.jumpPrev},
-            jump_next = ${keyOrFalse cfg.mappings.panel.jumpNext},
-            accept = ${keyOrFalse cfg.mappings.panel.accept},
-            refresh = ${keyOrFalse cfg.mappings.panel.refresh},
-            open = ${keyOrFalse cfg.mappings.panel.open},
+            jump_prev = false,
+            jump_next = false,
+            accept = false,
+            refresh = false,
+            open = false,
+          },
+          layout = {
+            position = "${cfg.panel.position}",
+            ratio = ${toString cfg.panel.ratio},
           },
         },
         suggestion = {
           keymap = {
-            accept = ${keyOrFalse cfg.mappings.suggestion.accept},
-            accept_word = ${keyOrFalse cfg.mappings.suggestion.acceptWord},
-            accept_line = ${keyOrFalse cfg.mappings.suggestion.acceptLine},
-            next = ${keyOrFalse cfg.mappings.suggestion.next},
-            prev = ${keyOrFalse cfg.mappings.suggestion.prev},
-            dismiss = ${keyOrFalse cfg.mappings.suggestion.dismiss},
+            accept = false,
+            accept_word = false,
+            accept_line = false,
+            next = false,
+            prev = false,
+            dismiss = false,
           },
         },
       })
     '';
+
+    vim.maps.normal = mkMerge [
+      (mkLuaBinding cfg.mappings.panel.jumpPrev "require(\"copilot.panel\").jump_prev" "[copilot] Accept suggestion")
+      (mkLuaBinding cfg.mappings.panel.jumpNext "require(\"copilot.panel\").jump_next" "[copilot] Accept suggestion")
+      (mkLuaBinding cfg.mappings.panel.accept "require(\"copilot.panel\").accept" "[copilot] Accept suggestion")
+      (mkLuaBinding cfg.mappings.panel.refresh "require(\"copilot.panel\").refresh" "[copilot] Accept suggestion")
+      (mkLuaBinding cfg.mappings.panel.open ''
+        function() require("copilot.panel").open({ position = "${cfg.panel.position}", ratio = ${toString cfg.panel.ratio}, }) end
+      '' "[copilot] Accept suggestion")
+    ];
+
+    vim.maps.insert = mkMerge [
+      (mkLuaBinding cfg.mappings.suggestion.accept "require(\"copilot.suggestion\").accept" "[copilot] Accept suggestion")
+      (mkLuaBinding cfg.mappings.suggestion.acceptLine "require(\"copilot.suggestion\").accept_line" "[copilot] Accept suggestion (line)")
+      (mkLuaBinding cfg.mappings.suggestion.acceptWord "require(\"copilot.suggestion\").accept_word" "[copilot] Accept suggestion (word)")
+      (mkLuaBinding cfg.mappings.suggestion.next "require(\"copilot.suggestion\").next" "[copilot] next suggestion")
+      (mkLuaBinding cfg.mappings.suggestion.prev "require(\"copilot.suggestion\").prev" "[copilot] previous suggestion")
+      (mkLuaBinding cfg.mappings.suggestion.dismiss "require(\"copilot.suggestion\").dismiss" "[copilot] dismiss suggestion")
+    ];
   };
 }
diff --git a/modules/assistant/copilot/copilot.nix b/modules/assistant/copilot/copilot.nix
index fcf5a5d..5529dcb 100644
--- a/modules/assistant/copilot/copilot.nix
+++ b/modules/assistant/copilot/copilot.nix
@@ -9,6 +9,24 @@ with builtins; {
   options.vim.assistant.copilot = {
     enable = mkEnableOption "Enable GitHub Copilot";
 
+    panel = {
+      position = mkOption {
+        type = types.enum [
+          "bottom"
+          "top"
+          "left"
+          "right"
+        ];
+        default = "bottom";
+        description = "Panel position";
+      };
+      ratio = mkOption {
+        type = types.float;
+        default = 0.4;
+        description = "Panel size";
+      };
+    };
+
     mappings = {
       panel = {
         jumpPrev = mkOption {
diff --git a/modules/terminal/toggleterm/config.nix b/modules/terminal/toggleterm/config.nix
index c4934dc..e60b9b4 100644
--- a/modules/terminal/toggleterm/config.nix
+++ b/modules/terminal/toggleterm/config.nix
@@ -14,7 +14,7 @@ in {
 
     vim.luaConfigRC.toggleterm = nvim.dag.entryAnywhere ''
       require("toggleterm").setup({
-        open_mapping = '${cfg.mappings.open}',
+        open_mapping = null,
         direction = '${toString cfg.direction}',
         -- TODO: this should probably be turned into a module that uses the lua function if and only if the user has not set it
         size = function(term)
@@ -32,5 +32,7 @@ in {
         },
       })
     '';
+
+    vim.maps.normal = mkBinding cfg.mappings.open "<Cmd>execute v:count . \"ToggleTerm\"<CR>" "Toggle terminal";
   };
 }
diff --git a/modules/terminal/toggleterm/toggleterm.nix b/modules/terminal/toggleterm/toggleterm.nix
index 8c60ea8..d563e22 100644
--- a/modules/terminal/toggleterm/toggleterm.nix
+++ b/modules/terminal/toggleterm/toggleterm.nix
@@ -9,7 +9,7 @@ with builtins; {
     enable = mkEnableOption "Enable toggleterm as a replacement to built-in terminal command";
     mappings = {
       open = mkOption {
-        type = types.str;
+        type = types.nullOr types.str;
         description = "The keymapping to open toggleterm";
         default = "<c-t>";
       };

From 0770b9609865b2d50d92f4d420edc20ef9e21e0f Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Tue, 11 Apr 2023 15:37:24 +0200
Subject: [PATCH 17/25] feat: add leap keybindings

---
 modules/utility/motion/leap/config.nix | 62 +++++++++++++++++++++-----
 modules/utility/motion/leap/leap.nix   | 40 +++++++++++++----
 2 files changed, 82 insertions(+), 20 deletions(-)

diff --git a/modules/utility/motion/leap/config.nix b/modules/utility/motion/leap/config.nix
index f4c8b38..4a6c571 100644
--- a/modules/utility/motion/leap/config.nix
+++ b/modules/utility/motion/leap/config.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib; let
@@ -13,18 +12,59 @@ in {
       "vim-repeat"
     ];
 
-    vim.nnoremap = {
-      "<leader>h" = "<cmd> HopPattern<CR>";
-    };
+    vim.maps.normal = mkMerge [
+      (mkBinding cfg.mappings.leapForwardTo "<Plug>(leap-forward-to)" "Leap forward to")
+      (mkBinding cfg.mappings.leapBackwardTo "<Plug>(leap-backward-to)" "Leap backward to")
+      (mkBinding cfg.mappings.leapFromWindow "<Plug>(leap-from-window)" "Leap from window")
+    ];
+
+    vim.maps.operator = mkMerge [
+      (mkBinding cfg.mappings.leapForwardTo "<Plug>(leap-forward-to)" "Leap forward to")
+      (mkBinding cfg.mappings.leapBackwardTo "<Plug>(leap-backward-to)" "Leap backward to")
+      (mkBinding cfg.mappings.leapForwardTill "<Plug>(leap-forward-till)" "Leap forward till")
+      (mkBinding cfg.mappings.leapBackwardTill "<Plug>(leap-backward-till)" "Leap backward till")
+      (mkBinding cfg.mappings.leapFromWindow "<Plug>(leap-from-window)" "Leap from window")
+    ];
+
+    vim.maps.visualOnly = mkMerge [
+      (mkBinding cfg.mappings.leapForwardTo "<Plug>(leap-forward-to)" "Leap forward to")
+      (mkBinding cfg.mappings.leapBackwardTo "<Plug>(leap-backward-to)" "Leap backward to")
+      (mkBinding cfg.mappings.leapForwardTill "<Plug>(leap-forward-till)" "Leap forward till")
+      (mkBinding cfg.mappings.leapBackwardTill "<Plug>(leap-backward-till)" "Leap backward till")
+      (mkBinding cfg.mappings.leapFromWindow "<Plug>(leap-from-window)" "Leap from window")
+    ];
 
     vim.luaConfigRC.leap-nvim = nvim.dag.entryAnywhere ''
-      require('leap').add_default_mappings()
-      -- TODO: register custom keybinds
-      -- require('leap').leap {
-      --   opts = {
-      --     labels = {}
-      --   }
-      -- }
+      require('leap').opts = {
+        max_phase_one_targets = nil,
+        highlight_unlabeled_phase_one_targets = false,
+        max_highlighted_traversal_targets = 10,
+        case_sensitive = false,
+        equivalence_classes = { ' \t\r\n', },
+        substitute_chars = {},
+        safe_labels = {
+          "s", "f", "n", "u", "t", "/",
+          "S", "F", "N", "L", "H", "M", "U", "G", "T", "?", "Z"
+        },
+        labels = {
+          "s", "f", "n",
+          "j", "k", "l", "h", "o", "d", "w", "e", "m", "b",
+          "u", "y", "v", "r", "g", "t", "c", "x", "/", "z",
+          "S", "F", "N",
+          "J", "K", "L", "H", "O", "D", "W", "E", "M", "B",
+          "U", "Y", "V", "R", "G", "T", "C", "X", "?", "Z"
+        },
+        special_keys = {
+          repeat_search = '<enter>',
+          next_phase_one_target = '<enter>',
+          next_target = {'<enter>', ';'},
+          prev_target = {'<tab>', ','},
+          next_group = '<space>',
+          prev_group = '<tab>',
+          multi_accept = '<enter>',
+          multi_revert = '<backspace>',
+        },
+      }
     '';
   };
 }
diff --git a/modules/utility/motion/leap/leap.nix b/modules/utility/motion/leap/leap.nix
index 6a48995..045562d 100644
--- a/modules/utility/motion/leap/leap.nix
+++ b/modules/utility/motion/leap/leap.nix
@@ -1,13 +1,35 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.vim.utility.motion.leap;
-in {
+{lib, ...}:
+with lib;
+with builtins; {
   options.vim.utility.motion.leap = {
     enable = mkEnableOption "Enable leap.nvim plugin (easy motion)";
+
+    mappings = {
+      leapForwardTo = mkOption {
+        type = types.nullOr types.str;
+        description = "Leap forward to";
+        default = "s";
+      };
+      leapBackwardTo = mkOption {
+        type = types.nullOr types.str;
+        description = "Leap backward to";
+        default = "S";
+      };
+      leapForwardTill = mkOption {
+        type = types.nullOr types.str;
+        description = "Leap forward till";
+        default = "x";
+      };
+      leapBackwardTill = mkOption {
+        type = types.nullOr types.str;
+        description = "Leap backward till";
+        default = "X";
+      };
+      leapFromWindow = mkOption {
+        type = types.nullOr types.str;
+        description = "Leap from window";
+        default = "gs";
+      };
+    };
   };
 }

From 25eda4662954defb65501fcabe5b2ba50661e684 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Tue, 11 Apr 2023 15:42:45 +0200
Subject: [PATCH 18/25] feat: add nvim-session-manager keybindings

---
 .../session/nvim-session-manager/config.nix   | 12 +++++-----
 .../nvim-session-manager.nix                  | 23 +++++++++++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/modules/session/nvim-session-manager/config.nix b/modules/session/nvim-session-manager/config.nix
index b2ce8b7..a65b21f 100644
--- a/modules/session/nvim-session-manager/config.nix
+++ b/modules/session/nvim-session-manager/config.nix
@@ -15,13 +15,13 @@ in {
       ]
       ++ optionals (cfg.usePicker) ["dressing-nvim"];
 
-    vim.nnoremap = {
-      "<leader>sl" = ":SessionManager load_session<CR>";
-      "<leader>sd" = ":SessionManager delete_session<CR>";
-      "<leader>sc" = ":SessionManager save_current_session<CR>";
-      "<leader>slt" = ":SessionManager load_last_session<CR>";
+    vim.maps.normal = mkMerge [
+      (mkBinding cfg.mappings.loadSession ":SessionManager load_session<CR>" "Load session")
+      (mkBinding cfg.mappings.deleteSession ":SessionManager delete_session<CR>" "Delete session")
+      (mkBinding cfg.mappings.saveCurrentSession ":SessionManager save_current_session<CR>" "Save current session")
+      (mkBinding cfg.mappings.loadLastSession ":SessionManager load_last_session<CR>" "Load last session")
       # TODO: load_current_dir_session
-    };
+    ];
 
     vim.luaConfigRC.nvim-session-manager = nvim.dag.entryAnywhere ''
       local Path = require('plenary.path')
diff --git a/modules/session/nvim-session-manager/nvim-session-manager.nix b/modules/session/nvim-session-manager/nvim-session-manager.nix
index 74ec434..7f84c21 100644
--- a/modules/session/nvim-session-manager/nvim-session-manager.nix
+++ b/modules/session/nvim-session-manager/nvim-session-manager.nix
@@ -8,6 +8,29 @@ with builtins; {
   options.vim.session.nvim-session-manager = {
     enable = mkEnableOption "Enable nvim-session-manager";
 
+    mappings = {
+      loadSession = mkOption {
+        type = types.nullOr types.str;
+        description = "Load session";
+        default = "<leader>sl";
+      };
+      deleteSession = mkOption {
+        type = types.nullOr types.str;
+        description = "Delete session";
+        default = "<leader>sd";
+      };
+      saveCurrentSession = mkOption {
+        type = types.nullOr types.str;
+        description = "Save current session";
+        default = "<leader>sc";
+      };
+      loadLastSession = mkOption {
+        type = types.nullOr types.str;
+        description = "Load last session";
+        default = "<leader>slt";
+      };
+    };
+
     usePicker = mkOption {
       type = types.bool;
       default = true;

From e372fb1ccc16a25094416fdaf2ebfb15e2d13489 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 12 Apr 2023 17:17:23 +0200
Subject: [PATCH 19/25] feat: add nvimtree keybindings

---
 modules/filetree/nvimtree-lua/config.nix      | 25 +++++++++----------
 .../filetree/nvimtree-lua/nvimtree-lua.nix    | 24 +++++++++++++++++-
 modules/utility/binds/which-key/config.nix    |  1 +
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/modules/filetree/nvimtree-lua/config.nix b/modules/filetree/nvimtree-lua/config.nix
index 6546232..e0d598a 100644
--- a/modules/filetree/nvimtree-lua/config.nix
+++ b/modules/filetree/nvimtree-lua/config.nix
@@ -1,30 +1,29 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
 with lib;
 with builtins; let
   cfg = config.vim.filetree.nvimTreeLua;
+  self = import ./nvimtree-lua.nix {
+    inherit pkgs;
+    lib = lib;
+  };
+  mappings = self.options.vim.filetree.nvimTreeLua.mappings;
 in {
   config = mkIf cfg.enable {
     vim.startPlugins = ["nvim-tree-lua"];
 
-    # vim.nnoremap = {
-    #   "<C-n>" = ":NvimTreeToggle<CR>";
-    #   "<leader>tr" = ":NvimTreeRefresh<CR>";
-    #   "<leader>tg" = ":NvimTreeFindFile<CR>";
-    #   "<leader>tf" = ":NvimTreeFocus<CR>";
-    # };
+    vim.maps.normal = mkMerge [
+      (mkBinding cfg.mappings.toggle ":NvimTreeToggle<cr>" mappings.toggle.description)
+      (mkBinding cfg.mappings.refresh ":NvimTreeRefresh<cr>" mappings.refresh.description)
+      (mkBinding cfg.mappings.findFile ":NvimTreeFindFile<cr>" mappings.findFile.description)
+      (mkBinding cfg.mappings.focus ":NvimTreeFocus<cr>" mappings.focus.description)
+    ];
 
     vim.luaConfigRC.nvimtreelua = nvim.dag.entryAnywhere ''
-        local opts = { silent = true, noremap = true }
-
-        vim.api.nvim_set_keymap("n", "<C-n>", ":NvimTreeToggle<cr>", opts)
-        vim.api.nvim_set_keymap("n", "<leader>tr", ":NvimTreeRefresh<cr>", opts)
-        vim.api.nvim_set_keymap("n", "<leader>tg", ":NvimTreeFindFile<cr>", opts)
-        vim.api.nvim_set_keymap("n", "<leader>tf", ":NvimTreeFocus<cr>", opts)
-
         local function open_nvim_tree(data)
             local IGNORED_FT = {
                 "markdown",
diff --git a/modules/filetree/nvimtree-lua/nvimtree-lua.nix b/modules/filetree/nvimtree-lua/nvimtree-lua.nix
index fbd0fb6..373ace3 100644
--- a/modules/filetree/nvimtree-lua/nvimtree-lua.nix
+++ b/modules/filetree/nvimtree-lua/nvimtree-lua.nix
@@ -1,6 +1,5 @@
 {
   pkgs,
-  config,
   lib,
   ...
 }:
@@ -13,6 +12,29 @@ with builtins; {
       description = "Enable nvim-tree-lua";
     };
 
+    mappings = {
+      toggle = mkOption {
+        type = types.nullOr types.str;
+        default = "<C-n>";
+        description = "Toggle NvimTree";
+      };
+      refresh = mkOption {
+        type = types.nullOr types.str;
+        default = "<leader>tr";
+        description = "Refresh NvimTree";
+      };
+      findFile = mkOption {
+        type = types.nullOr types.str;
+        default = "<leader>tg";
+        description = "Find file in NvimTree";
+      };
+      focus = mkOption {
+        type = types.nullOr types.str;
+        default = "<leader>tf";
+        description = "Focus NvimTree";
+      };
+    };
+
     sortBy = mkOption {
       default = "name";
       description = "Sort by name or extension";
diff --git a/modules/utility/binds/which-key/config.nix b/modules/utility/binds/which-key/config.nix
index e2f5ae1..5035ce3 100644
--- a/modules/utility/binds/which-key/config.nix
+++ b/modules/utility/binds/which-key/config.nix
@@ -88,6 +88,7 @@ in {
       }
 
         ${
+        # TODO: This probably will need to be reworked for custom-keybinds
         if config.vim.filetree.nvimTreeLua.enable
         then ''
           -- NvimTree

From 475acf90cb285c7cb3c91d26c8c0005a499b606d Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 12 Apr 2023 20:13:30 +0200
Subject: [PATCH 20/25] feat: add lib function to quickly mkOption mappings

---
 lib/stdlib-extended.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/stdlib-extended.nix b/lib/stdlib-extended.nix
index 8a9fdb4..d536194 100644
--- a/lib/stdlib-extended.nix
+++ b/lib/stdlib-extended.nix
@@ -24,6 +24,12 @@ in
         };
       };
 
+    mkMappingOption = description: default:
+      self.mkOption {
+        type = self.types.nullOr self.types.str;
+        inherit default description;
+      };
+
     # For forward compatibility.
     literalExpression = super.literalExpression or super.literalExample;
     literalDocBook = super.literalDocBook or super.literalExample;

From df61441651e53a116ee682e8da82acf58b33ff33 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 12 Apr 2023 20:16:28 +0200
Subject: [PATCH 21/25] refactor: use icon because underline is buggy

---
 modules/tabline/nvim-bufferline/config.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/tabline/nvim-bufferline/config.nix b/modules/tabline/nvim-bufferline/config.nix
index 960eb00..e770eeb 100644
--- a/modules/tabline/nvim-bufferline/config.nix
+++ b/modules/tabline/nvim-bufferline/config.nix
@@ -51,8 +51,8 @@ in {
               close_command = ${mouse.close},
               right_mouse_command = ${mouse.right},
               indicator = {
-                style = 'underline',
-                -- indicator_icon = '▎',
+                style = 'icon',
+                indicator_icon = '▎',
               },
               buffer_close_icon = '',
               modified_icon = '●',

From 562e1847b0083c28cc67434d6f2d43b937c1fa2b Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 12 Apr 2023 21:13:00 +0200
Subject: [PATCH 22/25] feat: add nvim-bufferline keybindings

---
 modules/tabline/nvim-bufferline/config.nix    | 35 +++++++++----------
 .../nvim-bufferline/nvim-bufferline.nix       | 18 +++++++---
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/modules/tabline/nvim-bufferline/config.nix b/modules/tabline/nvim-bufferline/config.nix
index e770eeb..9e73cbe 100644
--- a/modules/tabline/nvim-bufferline/config.nix
+++ b/modules/tabline/nvim-bufferline/config.nix
@@ -6,6 +6,10 @@
 with lib;
 with builtins; let
   cfg = config.vim.tabline.nvimBufferline;
+  self = import ./nvim-bufferline.nix {
+    inherit lib;
+  };
+  mappings = self.options.vim.tabline.nvimBufferline.mappings;
 in {
   config = mkIf cfg.enable (
     let
@@ -23,25 +27,18 @@ in {
         "bufdelete-nvim"
       ];
 
-      vim.maps.normal = {
-        "<silent><leader>bn" = {action = ":BufferLineCycleNext<CR>";};
-        "<silent><leader>bp" = {action = ":BufferLineCyclePrev<CR>";};
-        "<silent><leader>bc" = {action = ":BufferLinePick<CR>";};
-        "<silent><leader>bse" = {action = ":BufferLineSortByExtension<CR>";};
-        "<silent><leader>bsd" = {action = ":BufferLineSortByDirectory<CR>";};
-        "<silent><leader>bsi" = {action = ":lua require'bufferline'.sort_buffers_by(function (buf_a, buf_b) return buf_a.id < buf_b.id end)<CR>";};
-        "<silent><leader>bmn" = {action = ":BufferLineMoveNext<CR>";};
-        "<silent><leader>bmp" = {action = ":BufferLineMovePrev<CR>";};
-        "<silent><leader>b1" = {action = "<Cmd>BufferLineGoToBuffer 1<CR>";};
-        "<silent><leader>b2" = {action = "<Cmd>BufferLineGoToBuffer 2<CR>";};
-        "<silent><leader>b3" = {action = "<Cmd>BufferLineGoToBuffer 3<CR>";};
-        "<silent><leader>b4" = {action = "<Cmd>BufferLineGoToBuffer 4<CR>";};
-        "<silent><leader>b5" = {action = "<Cmd>BufferLineGoToBuffer 5<CR>";};
-        "<silent><leader>b6" = {action = "<Cmd>BufferLineGoToBuffer 6<CR>";};
-        "<silent><leader>b7" = {action = "<Cmd>BufferLineGoToBuffer 7<CR>";};
-        "<silent><leader>b8" = {action = "<Cmd>BufferLineGoToBuffer 8<CR>";};
-        "<silent><leader>b9" = {action = "<Cmd>BufferLineGoToBuffer 9<CR>";};
-      };
+      vim.maps.normal = mkMerge [
+        (mkLuaBinding cfg.mappings.closeCurrent "require(\"bufdelete\").bufdelete" mappings.closeCurrent.description)
+        (mkBinding cfg.mappings.cycleNext ":BufferLineCycleNext<CR>" mappings.cycleNext.description)
+        (mkBinding cfg.mappings.cycleNext ":BufferLineCycleNext<CR>" mappings.cycleNext.description)
+        (mkBinding cfg.mappings.cyclePrevious ":BufferLineCyclePrev<CR>" mappings.cyclePrevious.description)
+        (mkBinding cfg.mappings.pick ":BufferLinePick<CR>" mappings.pick.description)
+        (mkBinding cfg.mappings.sortByExtension ":BufferLineSortByExtension<CR>" mappings.sortByExtension.description)
+        (mkBinding cfg.mappings.sortByDirectory ":BufferLineSortByDirectory<CR>" mappings.sortByDirectory.description)
+        (mkLuaBinding cfg.mappings.sortById "function() require(\"bufferline\").sort_buffers_by(function (buf_a, buf_b) return buf_a.id < buf_b.id end) end" mappings.sortById.description)
+        (mkBinding cfg.mappings.moveNext ":BufferLineMoveNext<CR>" mappings.moveNext.description)
+        (mkBinding cfg.mappings.movePrevious ":BufferLineMovePrev<CR>" mappings.movePrevious.description)
+      ];
 
       vim.luaConfigRC.nvimBufferline = nvim.dag.entryAnywhere ''
         require("bufferline").setup{
diff --git a/modules/tabline/nvim-bufferline/nvim-bufferline.nix b/modules/tabline/nvim-bufferline/nvim-bufferline.nix
index ad707bf..32e2dd3 100644
--- a/modules/tabline/nvim-bufferline/nvim-bufferline.nix
+++ b/modules/tabline/nvim-bufferline/nvim-bufferline.nix
@@ -1,11 +1,19 @@
-{
-  config,
-  lib,
-  ...
-}:
+{lib, ...}:
 with lib;
 with builtins; {
   options.vim.tabline.nvimBufferline = {
+    mappings = {
+      closeCurrent = mkMappingOption "Close buffer" null;
+      cycleNext = mkMappingOption "Next buffer" "<leader>bn";
+      cyclePrevious = mkMappingOption "Previous buffer" "<leader>bp";
+      pick = mkMappingOption "Pick buffer" "<leader>bc";
+      sortByExtension = mkMappingOption "Sort buffers by extension" "<leader>bse";
+      sortByDirectory = mkMappingOption "Sort buffers by directory" "<leader>bsd";
+      sortById = mkMappingOption "Sort buffers by ID" "<leader>bsi";
+      moveNext = mkMappingOption "Move next buffer" "<leader>bmn";
+      movePrevious = mkMappingOption "Move previous buffer" "<leader>bmp";
+    };
+
     enable = mkEnableOption "Enable nvim-bufferline-lua as a bufferline";
   };
 }

From 1439d0d033a2ba4dcd9f39e1a1b8963ccbdf83d0 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 12 Apr 2023 23:42:55 +0200
Subject: [PATCH 23/25] feat: add utility function for binding expressions

---
 lib/stdlib-extended.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/stdlib-extended.nix b/lib/stdlib-extended.nix
index d536194..92945a5 100644
--- a/lib/stdlib-extended.nix
+++ b/lib/stdlib-extended.nix
@@ -16,6 +16,16 @@ in
         };
       };
 
+    mkExprBinding = key: action: desc:
+      self.mkIf (key != null) {
+        "${key}" = {
+          inherit action desc;
+          lua = true;
+          silent = true;
+          expr = true;
+        };
+      };
+
     mkBinding = key: action: desc:
       self.mkIf (key != null) {
         "${key}" = {

From 812d04ee368d1fccec77c995078c093fe63d29ac Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 12 Apr 2023 23:58:09 +0200
Subject: [PATCH 24/25] feat: add comment.nvim keybindings

---
 .../comments/comment-nvim/comment-nvim.nix    | 17 +++++++---
 modules/comments/comment-nvim/config.nix      | 33 ++++++++++++++++++-
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/modules/comments/comment-nvim/comment-nvim.nix b/modules/comments/comment-nvim/comment-nvim.nix
index 0e1369b..6ffbce0 100644
--- a/modules/comments/comment-nvim/comment-nvim.nix
+++ b/modules/comments/comment-nvim/comment-nvim.nix
@@ -1,11 +1,18 @@
-{
-  config,
-  lib,
-  ...
-}:
+{lib, ...}:
 with lib;
 with builtins; {
   options.vim.comments.comment-nvim = {
     enable = mkEnableOption "Enable comment-nvim";
+
+    mappings = {
+      toggleCurrentLine = mkMappingOption "Toggle current line comment" "gcc";
+      toggleCurrentBlock = mkMappingOption "Toggle current block comment" "gbc";
+
+      toggleOpLeaderLine = mkMappingOption "Toggle line comment" "gc";
+      toggleOpLeaderBlock = mkMappingOption "Toggle block comment" "gb";
+
+      toggleSelectedLine = mkMappingOption "Toggle selected comment" "gc";
+      toggleSelectedBlock = mkMappingOption "Toggle selected block" "gb";
+    };
   };
 }
diff --git a/modules/comments/comment-nvim/config.nix b/modules/comments/comment-nvim/config.nix
index 1a2e150..bc29111 100644
--- a/modules/comments/comment-nvim/config.nix
+++ b/modules/comments/comment-nvim/config.nix
@@ -6,14 +6,45 @@
 with lib;
 with builtins; let
   cfg = config.vim.comments.comment-nvim;
+  self = import ./comment-nvim.nix {
+    inherit lib;
+  };
+  mappings = self.options.vim.comments.comment-nvim.mappings;
 in {
   config = mkIf cfg.enable {
     vim.startPlugins = [
       "comment-nvim"
     ];
 
+    vim.maps.normal = mkMerge [
+      (mkBinding cfg.mappings.toggleOpLeaderLine "<Plug>(comment_toggle_linewise)" mappings.toggleOpLeaderLine.description)
+      (mkBinding cfg.mappings.toggleOpLeaderBlock "<Plug>(comment_toggle_blockwise)" mappings.toggleOpLeaderBlock.description)
+
+      (mkExprBinding cfg.mappings.toggleCurrentLine ''
+          function()
+            return vim.api.nvim_get_vvar('count') == 0 and '<Plug>(comment_toggle_linewise_current)'
+                    or '<Plug>(comment_toggle_linewise_count)'
+          end
+        ''
+        mappings.toggleCurrentLine.description)
+      (mkExprBinding cfg.mappings.toggleCurrentBlock ''
+          function()
+            return vim.api.nvim_get_vvar('count') == 0 and '<Plug>(comment_toggle_blockwise_current)'
+                    or '<Plug>(comment_toggle_blockwise_count)'
+          end
+        ''
+        mappings.toggleCurrentBlock.description)
+    ];
+
+    vim.maps.visualOnly = mkMerge [
+      (mkBinding cfg.mappings.toggleSelectedLine "<Plug>(comment_toggle_linewise_visual)" mappings.toggleSelectedLine.description)
+      (mkBinding cfg.mappings.toggleSelectedBlock "<Plug>(comment_toggle_blockwise_visual)" mappings.toggleSelectedBlock.description)
+    ];
+
     vim.luaConfigRC.comment-nvim = nvim.dag.entryAnywhere ''
-      require('Comment').setup()
+      require('Comment').setup({
+        mappings = { basic = false, extra = false, },
+      })
     '';
   };
 }

From 810aae53b2881e034b5d17b3ac1cf6132f30a578 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Sat, 15 Apr 2023 15:35:34 +0200
Subject: [PATCH 25/25] feat: add cellularAutomaton keybindings

---
 modules/visuals/config.nix  |  4 ++--
 modules/visuals/visuals.nix | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/modules/visuals/config.nix b/modules/visuals/config.nix
index ff87b50..967555e 100644
--- a/modules/visuals/config.nix
+++ b/modules/visuals/config.nix
@@ -50,6 +50,8 @@ in {
       )
     ];
 
+    vim.maps.normal = mkIf (cfg.cellularAutomaton.enable) (mkBinding cfg.cellularAutomaton.mappings.makeItRain "<cmd>CellularAutomaton make_it_rain<CR>" "Make it rain");
+
     vim.luaConfigRC.visuals = nvim.dag.entryAnywhere ''
       ${
         if cfg.lspkind.enable
@@ -134,8 +136,6 @@ in {
           end
 
           require("cellular-automaton").register_animation(config)
-
-          vim.keymap.set("n", "<leader>fml", "<cmd>CellularAutomaton make_it_rain<CR>")
         ''
         else ""
       }
diff --git a/modules/visuals/visuals.nix b/modules/visuals/visuals.nix
index 7fe03ad..679d388 100644
--- a/modules/visuals/visuals.nix
+++ b/modules/visuals/visuals.nix
@@ -36,10 +36,16 @@ with builtins; {
       default = false;
     };
 
-    cellularAutomaton.enable = mkOption {
-      type = types.bool;
-      description = "Enable cellular automaton [cellular-automaton]";
-      default = false;
+    cellularAutomaton = {
+      enable = mkOption {
+        type = types.bool;
+        description = "Enable cellular automaton [cellular-automaton]";
+        default = false;
+      };
+
+      mappings = {
+        makeItRain = mkMappingOption "Make it rain [cellular-automaton]" "<leader>fml";
+      };
     };
 
     fidget-nvim = {