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 001/162] 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 002/162] 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 003/162] 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 004/162] 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 005/162] 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 006/162] 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 007/162] 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 008/162] 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 009/162] 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 010/162] 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 011/162] 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 012/162] 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 013/162] 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 014/162] 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 015/162] 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 016/162] 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 017/162] 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 018/162] 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 019/162] 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 020/162] 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 021/162] 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 022/162] 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 023/162] 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 024/162] 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 025/162] 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 = {

From 0938859c1876be068aa2d32342d3c98af5a6566d Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 5 Apr 2023 00:06:30 +0200
Subject: [PATCH 026/162] 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 f5b1844d2e1e3ef2a44f3be696f637931b94db92 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 5 Apr 2023 00:53:21 +0200
Subject: [PATCH 027/162] 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 0649f710beb3af16657a9708d6d226b64e80c292 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 10 Apr 2023 13:42:31 +0200
Subject: [PATCH 028/162] 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 1b4512a..a1db94b 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 cbeedbbab5bba9c7baaeafb7ab7cbd16a68ae3d7 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 10 Apr 2023 22:27:13 +0200
Subject: [PATCH 029/162] 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 fbe4e0ad2fc772d7b0dc5cccfd8b97cbaa891798 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 10 Apr 2023 22:43:41 +0200
Subject: [PATCH 030/162] 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 13783d3d129fa1a52b13955a5f8a01dbe8bdb7ce Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 10 Apr 2023 22:44:18 +0200
Subject: [PATCH 031/162] 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 2d9b24dfdb6f258159b203bc4f79f1015fd25cf0 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Tue, 11 Apr 2023 14:38:08 +0200
Subject: [PATCH 032/162] 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 7e566c9687a6caa468903a77cfba7fe4fe62e2ba Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Tue, 11 Apr 2023 14:38:27 +0200
Subject: [PATCH 033/162] 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 0068af2d661b08d0d685171778596a91c6e144aa Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 10 Apr 2023 13:42:31 +0200
Subject: [PATCH 034/162] refactor!: use a new keymaps configuration format

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

diff --git a/modules/core/default.nix b/modules/core/default.nix
index d16f21d..8db9806 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -266,9 +266,8 @@ in {
 
     toLuaBindings = mode: maps:
       builtins.map (value: ''
-        vim.keymap.set(${toLuaObject mode}, ${toLuaObject value.key}, ${
-          toLuaObject value.action
-        }, ${toLuaObject value.config})'') (genMaps mode maps);
+        vim.keymap.set(${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.
     allmap = toLuaBindings "" config.vim.maps.normalVisualOp;

From 5a56de1b9f567ddbdcd70eba5dc69dac9fab29f0 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Tue, 11 Apr 2023 15:37:24 +0200
Subject: [PATCH 035/162] 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 15185f9ad68eab67270aff627a1fa034b4404f21 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Tue, 11 Apr 2023 15:42:45 +0200
Subject: [PATCH 036/162] 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 f1f0144c6275072cf3e1eae52e5dbcbb8b32ad9c Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 12 Apr 2023 17:17:23 +0200
Subject: [PATCH 037/162] 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 042f5c7..2929394 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 33a5508..e2d63a7 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 2a7b4b8..a5c1569 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 776657db856103bfd3cd2566368c9fe5c76e54bc Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 12 Apr 2023 20:13:30 +0200
Subject: [PATCH 038/162] 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 f1bc76f495d5f75cfd443770beb39fc0d5cb7f31 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 12 Apr 2023 20:16:28 +0200
Subject: [PATCH 039/162] 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 54aad74d8d389545bfc33d5f1005a9f7231ded98 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 12 Apr 2023 21:13:00 +0200
Subject: [PATCH 040/162] 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 ac5c540b2d5337c514e05d1b876fbb85c677f65d Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 12 Apr 2023 23:42:55 +0200
Subject: [PATCH 041/162] 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 e21096203ac98ebd9b851248e704db356b9f98c1 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 12 Apr 2023 23:58:09 +0200
Subject: [PATCH 042/162] 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 6719cddbfd2ccdf78d0f1be6d9888e7ba133acec Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Sat, 15 Apr 2023 15:35:34 +0200
Subject: [PATCH 043/162] feat: add cellularAutomaton keybindings

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

diff --git a/modules/visuals/config.nix b/modules/visuals/config.nix
index 676fb82..307c7d5 100644
--- a/modules/visuals/config.nix
+++ b/modules/visuals/config.nix
@@ -67,6 +67,9 @@ in {
 
     (mkIf cfg.cellularAutomaton.enable {
       vim.startPlugins = ["cellular-automaton"];
+
+      vim.maps.normal = mkBinding cfg.cellularAutomaton.mappings.makeItRain "<cmd>CellularAutomaton make_it_rain<CR>" "Make it rain";
+
       vim.luaConfigRC.cellularAUtomaton = nvim.dag.entryAnywhere ''
         local config = {
               fps = 50,
@@ -90,8 +93,6 @@ in {
             end
 
             require("cellular-automaton").register_animation(config)
-
-            vim.keymap.set("n", "<leader>fml", "<cmd>CellularAutomaton make_it_rain<CR>")
       '';
     })
 
diff --git a/modules/visuals/visuals.nix b/modules/visuals/visuals.nix
index 4981961..ceefe55 100644
--- a/modules/visuals/visuals.nix
+++ b/modules/visuals/visuals.nix
@@ -24,10 +24,16 @@ in {
       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 = {

From 586a7f5b4146e453e21294f466d3d38eaa682d9d Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Tue, 18 Apr 2023 18:14:44 +0200
Subject: [PATCH 044/162] feat: add todo-comments keybindings

---
 modules/notes/todo-comments/config.nix        | 12 +++++++-----
 modules/notes/todo-comments/todo-comments.nix | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/modules/notes/todo-comments/config.nix b/modules/notes/todo-comments/config.nix
index 45a26bc..3adb0f6 100644
--- a/modules/notes/todo-comments/config.nix
+++ b/modules/notes/todo-comments/config.nix
@@ -7,17 +7,19 @@
 with lib;
 with builtins; let
   cfg = config.vim.notes.todo-comments;
+  self = import ./todo-comments.nix {inherit lib;};
+  mappings = self.options.vim.notes.todo-comments.mappings;
 in {
   config = mkIf (cfg.enable) {
     vim.startPlugins = [
       "todo-comments"
     ];
 
-    vim.maps.normal = {
-      "<leader>tdq" = {action = ":TodoQuickFix<CR>";};
-      "<leader>tds" = {action = ":TodoTelescope<CR>";};
-      "<leader>tdt" = {action = ":TodoTrouble<CR>";};
-    };
+    vim.maps.normal = mkMerge [
+      (mkBinding cfg.mappings.quickFix ":TodoQuickFix<CR>" mappings.quickFix.description)
+      (mkIf config.vim.telescope.enable (mkBinding cfg.mappings.telescope ":TodoTelescope<CR>" mappings.telescope.description))
+      (mkIf config.vim.lsp.trouble.enable (mkBinding cfg.mappings.trouble ":TodoTrouble<CR>" mappings.trouble.description))
+    ];
 
     vim.luaConfigRC.todo-comments = ''
       require('todo-comments').setup {
diff --git a/modules/notes/todo-comments/todo-comments.nix b/modules/notes/todo-comments/todo-comments.nix
index 3064e75..39b8aad 100644
--- a/modules/notes/todo-comments/todo-comments.nix
+++ b/modules/notes/todo-comments/todo-comments.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}:
+{lib, ...}:
 with lib;
 with builtins; {
   options.vim.notes.todo-comments = {
@@ -21,5 +17,11 @@ with builtins; {
         description = "ripgrep regex pattern used for searching comments";
       };
     };
+
+    mappings = {
+      quickFix = mkMappingOption "Open Todo-s in a quickfix list" "<leader>tdq";
+      telescope = mkMappingOption "Open Todo-s in telescope" "<leader>tds";
+      trouble = mkMappingOption "Open Todo-s in Trouble" "<leader>tdt";
+    };
   };
 }

From 1b1743dc5a0c76675764705fdb505c28de8fa67b Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Sat, 22 Apr 2023 15:48:10 +0200
Subject: [PATCH 045/162] feat: create utility functions to make adding
 bindings even easier

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

diff --git a/lib/stdlib-extended.nix b/lib/stdlib-extended.nix
index 92945a5..0455983 100644
--- a/lib/stdlib-extended.nix
+++ b/lib/stdlib-extended.nix
@@ -4,7 +4,7 @@
 nixpkgsLib: let
   mkNvimLib = import ./.;
 in
-  nixpkgsLib.extend (self: super: {
+  nixpkgsLib.extend (self: super: rec {
     nvim = mkNvimLib {lib = self;};
 
     mkLuaBinding = key: action: desc:
@@ -40,6 +40,24 @@ in
         inherit default description;
       };
 
+    # Utility function that takes two attrsets:
+    # { someKey = "some_value" } and
+    # { someKey = { description = "Some Description"; }; }
+    # and merges them into
+    # { someKey = { value = "some_value"; description = "Some Description"; }; }
+    addDescriptionsToMappings = actualMappings: mappingDefinitions:
+      self.attrsets.mapAttrs (name: value: {
+        value = value;
+        description = mappingDefinitions."${name}".description;
+      })
+      actualMappings;
+
+    mkSetBinding = binding: action:
+      mkBinding binding.value action binding.description;
+
+    mkSetLuaBinding = binding: action:
+      mkLuaBinding binding.value action binding.description;
+
     # For forward compatibility.
     literalExpression = super.literalExpression or super.literalExample;
     literalDocBook = super.literalDocBook or super.literalExample;

From eb8c841b4a014c3b0f3d4bfd3854db9c529a2cb0 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Sat, 22 Apr 2023 15:48:21 +0200
Subject: [PATCH 046/162] feat:32;2uadd telescope keybindings

---
 modules/utility/telescope/config.nix    | 62 ++++++++++++-------------
 modules/utility/telescope/telescope.nix | 30 ++++++++++--
 2 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/modules/utility/telescope/config.nix b/modules/utility/telescope/config.nix
index 01a96a3..e7e00dc 100644
--- a/modules/utility/telescope/config.nix
+++ b/modules/utility/telescope/config.nix
@@ -7,47 +7,45 @@
 with lib;
 with builtins; let
   cfg = config.vim.telescope;
+  self = import ./telescope.nix {inherit lib;};
+  mappingDefinitions = self.options.vim.telescope.mappings;
+
+  mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf (cfg.enable) {
     vim.startPlugins = [
       "telescope"
     ];
 
-    vim.maps.normal =
-      {
-        "<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>";};
+    vim.maps.normal = mkMerge [
+      (mkSetBinding mappings.findFiles "<cmd> Telescope find_files<CR>")
+      (mkSetBinding mappings.liveGrep "<cmd> Telescope live_grep<CR>")
+      (mkSetBinding mappings.buffers "<cmd> Telescope buffers<CR>")
+      (mkSetBinding mappings.helpTags "<cmd> Telescope help_tags<CR>")
+      (mkSetBinding mappings.open "<cmd> Telescope<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" = {action = "<cmd> Telescope lsp_document_symbols<CR>";};
-          "<leader>flsw" = {action = "<cmd> Telescope lsp_workspace_symbols<CR>";};
+      (mkSetBinding mappings.gitCommits "<cmd> Telescope git_commits<CR>")
+      (mkSetBinding mappings.gitBufferCommits "<cmd> Telescope git_bcommits<CR>")
+      (mkSetBinding mappings.gitBranches "<cmd> Telescope git_branches<CR>")
+      (mkSetBinding mappings.gitStatus "<cmd> Telescope git_status<CR>")
+      (mkSetBinding mappings.gitStash "<cmd> Telescope git_stash<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 {}
+      (mkIf config.vim.lsp.enable (mkMerge [
+        (mkSetBinding mappings.lspDocumentSymbols "<cmd> Telescope lsp_document_symbols<CR>")
+        (mkSetBinding mappings.lspWorkspaceSymbols "<cmd> Telescope lsp_workspace_symbols<CR>")
+
+        (mkSetBinding mappings.lspReferences "<cmd> Telescope lsp_references<CR>")
+        (mkSetBinding mappings.lspImplementations "<cmd> Telescope lsp_implementations<CR>")
+        (mkSetBinding mappings.lspDefinitions "<cmd> Telescope lsp_definitions<CR>")
+        (mkSetBinding mappings.lspTypeDefinitions "<cmd> Telescope lsp_type_definitions<CR>")
+        (mkSetBinding mappings.diagnostics "<cmd> Telescope diagnostics<CR>")
+      ]))
+
+      (
+        mkIf config.vim.treesitter.enable
+        (mkSetBinding mappings.treesitter "<cmd> Telescope treesitter<CR>")
       )
-      // (
-        if config.vim.treesitter.enable
-        then {
-          "<leader>fs" = {action = "<cmd> Telescope treesitter<CR>";};
-        }
-        else {}
-      );
+    ];
 
     vim.luaConfigRC.telescope = nvim.dag.entryAnywhere ''
       local telescope = require('telescope')
diff --git a/modules/utility/telescope/telescope.nix b/modules/utility/telescope/telescope.nix
index 1ba45b8..fa77fdc 100644
--- a/modules/utility/telescope/telescope.nix
+++ b/modules/utility/telescope/telescope.nix
@@ -1,11 +1,31 @@
-{
-  config,
-  lib,
-  ...
-}:
+{lib, ...}:
 with lib;
 with builtins; {
   options.vim.telescope = {
+    mappings = {
+      findFiles = mkMappingOption "Find files [Telescope]" "<leader>ff";
+      liveGrep = mkMappingOption  "Live grep [Telescope]" "<leader>fg";
+      buffers = mkMappingOption  "Buffers [Telescope]" "<leader>fb";
+      helpTags = mkMappingOption  "Help tags [Telescope]" "<leader>fh";
+      open = mkMappingOption  "Open [Telescope]" "<leader>ft";
+
+      gitCommits = mkMappingOption  "Git commits [Telescope]" "<leader>fvcw";
+      gitBufferCommits = mkMappingOption  "Git buffer commits [Telescope]" "<leader>fvcb";
+      gitBranches = mkMappingOption  "Git branches [Telescope]" "<leader>fvb";
+      gitStatus = mkMappingOption  "Git status [Telescope]" "<leader>fvs";
+      gitStash = mkMappingOption  "Git stash [Telescope]" "<leader>fvx";
+
+      lspDocumentSymbols = mkMappingOption  "LSP Document Symbols [Telescope]" "<leader>flsb";
+      lspWorkspaceSymbols = mkMappingOption  "LSP Workspace Symbols [Telescope]" "<leader>flsw";
+      lspReferences = mkMappingOption  "LSP References [Telescope]" "<leader>flr";
+      lspImplementations = mkMappingOption  "LSP Implementations [Telescope]" "<leader>fli";
+      lspDefinitions = mkMappingOption  "LSP Definitions [Telescope]" "<leader>flD";
+      lspTypeDefinitions = mkMappingOption  "LSP Type Definitions [Telescope]" "<leader>flt";
+      diagnostics = mkMappingOption  "Diagnostics [Telescope]" "<leader>fld";
+
+      treesitter = mkMappingOption  "Treesitter [Telescope]" "<leader>fs";
+    };
+
     enable = mkEnableOption "Enable multi-purpose telescope utility";
   };
 }

From 9a84c9e087613548f59cdf275a8d24a24e4248ff Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Sat, 22 Apr 2023 16:06:09 +0200
Subject: [PATCH 047/162] feat: add untested tabnine keybindings

---
 modules/assistant/tabnine/config.nix  | 36 ++++++++++++++++++++++++---
 modules/assistant/tabnine/tabnine.nix | 23 +++++------------
 2 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/modules/assistant/tabnine/config.nix b/modules/assistant/tabnine/config.nix
index d925ed0..b959495 100644
--- a/modules/assistant/tabnine/config.nix
+++ b/modules/assistant/tabnine/config.nix
@@ -10,13 +10,43 @@ in {
   config = mkIf cfg.enable {
     vim.startPlugins = ["tabnine-nvim"];
 
+    vim.maps.insert = mkMerge [
+      (mkExprBinding cfg.mappings.accept ''
+        function()
+          local state = require("tabnine.state")
+          local completion = require("tabnine.completion")
+
+        	if not state.completions_cache then
+          	return "${builtins.toJSON cfg.mappings.accept}"
+          end
+
+          vim.schedule(completion.accept)
+        end
+      '' "orzel")
+      (mkExprBinding cfg.mappings.dismiss ''
+        function()
+          local state = require("tabnine.state")
+          local completion = require("tabnine.completion")
+
+        	if not state.completions_cache then
+          	return "${builtins.toJSON cfg.mappings.dismiss}"
+          end
+
+          vim.schedule(function()
+            completion.clear()
+            state.completions_cache = nil
+          end)
+        end
+      '' "orzel")
+    ];
+
     vim.luaConfigRC.tabnine-nvim = nvim.dag.entryAnywhere ''
       require('tabnine').setup({
         disable_auto_comment = ${boolToString cfg.disable_auto_comment},
-        accept_keymap = ${cfg.accept_keymap},
-        dismiss_keymap = ${cfg.dismiss_keymap},
+        accept_keymap = null,
+        dismiss_keymap = null,
         debounce_ms = ${cfg.debounce_ms},
-      execlude_filetypes = ${cfg.execlude_filetypes},
+        exclude_filetypes = ${cfg.exclude_filetypes},
       })
     '';
   };
diff --git a/modules/assistant/tabnine/tabnine.nix b/modules/assistant/tabnine/tabnine.nix
index f0674cb..b977cef 100644
--- a/modules/assistant/tabnine/tabnine.nix
+++ b/modules/assistant/tabnine/tabnine.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}:
+{lib, ...}:
 with lib;
 with builtins; {
   options.vim.assistant.tabnine = {
@@ -14,16 +10,9 @@ with builtins; {
       description = "Disable auto comment";
     };
 
-    accept_keymap = mkOption {
-      type = types.str;
-      default = "<Tab>";
-      description = "Accept keymap";
-    };
-
-    dismiss_keymap = mkOption {
-      type = types.str;
-      default = "<C-]>";
-      description = "Dismiss keymap";
+    mappings = {
+      accept = mkMappingOption "Accept [Tabnine]" "<Tab>";
+      dismiss = mkMappingOption "Dismiss [Tabnine]" "<C-]>";
     };
 
     debounce_ms = mkOption {
@@ -32,10 +21,10 @@ with builtins; {
       description = "Debounce ms";
     };
 
-    execlude_filetypes = mkOption {
+    exclude_filetypes = mkOption {
       type = types.listOf types.str;
       default = ["TelescopePrompt" "NvimTree" "alpha"];
-      description = "Execlude filetypes";
+      description = "Exclude filetypes";
     };
   };
 }

From bc9caacd788f980184b70e690f38ecb3d39d66d4 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Sat, 22 Apr 2023 17:30:32 +0200
Subject: [PATCH 048/162] fix: stop errors from popping up when panel is not
 open

---
 modules/assistant/copilot/config.nix | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/modules/assistant/copilot/config.nix b/modules/assistant/copilot/config.nix
index f147ea0..112a3f7 100644
--- a/modules/assistant/copilot/config.nix
+++ b/modules/assistant/copilot/config.nix
@@ -7,6 +7,18 @@
 with lib;
 with builtins; let
   cfg = config.vim.assistant.copilot;
+
+  wrapPanelBinding = luaFunction: key: ''
+    function()
+      local s, _ = pcall(${luaFunction})
+
+      if not s then
+        local termcode = vim.api.nvim_replace_termcodes(${builtins.toJSON key}, true, false, true)
+
+        vim.fn.feedkeys(termcode, 'n')
+      end
+    end
+  '';
 in {
   config = mkIf cfg.enable {
     vim.startPlugins = [
@@ -45,13 +57,14 @@ in {
     '';
 
     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")
+      (mkLuaBinding cfg.mappings.panel.jumpPrev (wrapPanelBinding "require(\"copilot.panel\").jump_prev" cfg.mappings.panel.jumpPrev) "[copilot] Accept suggestion")
+      (mkLuaBinding cfg.mappings.panel.jumpNext (wrapPanelBinding "require(\"copilot.panel\").jump_next" cfg.mappings.panel.jumpNext) "[copilot] Accept suggestion")
+      (mkLuaBinding cfg.mappings.panel.accept (wrapPanelBinding ''require("copilot.panel").accept'' cfg.mappings.panel.accept) "[copilot] Accept suggestion")
+      (mkLuaBinding cfg.mappings.panel.refresh (wrapPanelBinding "require(\"copilot.panel\").refresh" cfg.mappings.panel.refresh) "[copilot] Accept suggestion")
+      (mkLuaBinding cfg.mappings.panel.open (wrapPanelBinding ''
+          function() require("copilot.panel").open({ position = "${cfg.panel.position}", ratio = ${toString cfg.panel.ratio}, }) end
+        ''
+        cfg.mappings.panel.open) "[copilot] Accept suggestion")
     ];
 
     vim.maps.insert = mkMerge [

From 49d0fe596a4dea74a0865e6b4b3ef38caaa99538 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Sat, 22 Apr 2023 17:43:58 +0200
Subject: [PATCH 049/162] feat: add nvim-cmp keybindings

---
 modules/completion/nvim-cmp/config.nix   | 175 +++++++++++++++++------
 modules/completion/nvim-cmp/nvim-cmp.nix |  42 ++----
 2 files changed, 145 insertions(+), 72 deletions(-)

diff --git a/modules/completion/nvim-cmp/config.nix b/modules/completion/nvim-cmp/config.nix
index 36aee08..7bdda3d 100644
--- a/modules/completion/nvim-cmp/config.nix
+++ b/modules/completion/nvim-cmp/config.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   config,
   ...
@@ -8,6 +7,12 @@ with lib;
 with builtins; let
   cfg = config.vim.autocomplete;
   lspkindEnabled = config.vim.lsp.enable && config.vim.lsp.lspkind.enable;
+
+  self = import ./nvim-cmp.nix {inherit lib;};
+  mappingDefinitions = self.options.vim.autocomplete.mappings;
+
+  mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
+
   builtSources =
     concatMapStringsSep
     "\n"
@@ -46,6 +51,133 @@ in {
       "path" = "[Path]";
     };
 
+    vim.maps.insert = mkMerge [
+      (mkSetLuaBinding mappings.complete ''
+        require('cmp').complete
+      '')
+      (mkSetLuaBinding mappings.confirm ''
+        function()
+          if not require('cmp').confirm({ select = true }) then
+            local termcode = vim.api.nvim_replace_termcodes(${builtins.toJSON mappings.confirm.value}, true, false, true)
+
+            vim.fn.feedkeys(termcode, 'n')
+          end
+        end
+      '')
+      (mkSetLuaBinding mappings.next ''
+        function()
+          local has_words_before = function()
+            local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+            return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
+          end
+
+          local cmp = require('cmp')
+
+          local feedkey = function(key, mode)
+            vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true)
+          end
+
+          if cmp.visible() then
+            cmp.select_next_item()
+          elseif vim.fn['vsnip#available'](1) == 1 then
+            feedkey("<Plug>(vsnip-expand-or-jump)", "")
+          elseif has_words_before() then
+            cmp.complete()
+          else
+            fallback()
+          end
+        end
+      '')
+      (mkSetLuaBinding mappings.previous ''
+        function()
+          local cmp = require('cmp')
+
+          local feedkey = function(key, mode)
+            vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true)
+          end
+
+          if cmp.visible() then
+            cmp.select_prev_item()
+          elseif vim.fn['vsnip#available'](-1) == 1 then
+            feedkeys("<Plug>(vsnip-jump-prev)", "")
+          end
+        end
+      '')
+      (mkSetLuaBinding mappings.close ''
+        require('cmp').mapping.abort
+      '')
+      (mkSetLuaBinding mappings.scrollDocsUp ''
+        function()
+          require('cmp').mapping.scroll_docs(-4)
+        end
+      '')
+      (mkSetLuaBinding mappings.scrollDocsDown ''
+        function()
+          require('cmp').mapping.scroll_docs(4)
+        end
+      '')
+    ];
+
+    vim.maps.command = mkMerge [
+      (mkSetLuaBinding mappings.complete ''
+        require('cmp').complete
+      '')
+      (mkSetLuaBinding mappings.close ''
+        require('cmp').mapping.close
+      '')
+      (mkSetLuaBinding mappings.scrollDocsUp ''
+        function()
+          require('cmp').mapping.scroll_docs(-4)
+        end
+      '')
+      (mkSetLuaBinding mappings.scrollDocsDown ''
+        function()
+          require('cmp').mapping.scroll_docs(4)
+        end
+      '')
+    ];
+
+    vim.maps.select = mkMerge [
+      (mkSetLuaBinding mappings.next ''
+        function()
+          local cmp = require('cmp')
+          local has_words_before = function()
+            local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+            return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
+          end
+
+          local feedkey = function(key, mode)
+            vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true)
+          end
+
+          if cmp.visible() then
+            cmp.select_next_item()
+          elseif vim.fn['vsnip#available'](1) == 1 then
+            feedkey("<Plug>(vsnip-expand-or-jump)", "")
+          elseif has_words_before() then
+            cmp.complete()
+          else
+            fallback()
+          end
+        end
+      '')
+      (mkSetLuaBinding mappings.previous ''
+        function()
+          local cmp = require('cmp')
+
+          local feedkey = function(key, mode)
+            vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true)
+          end
+
+          if cmp.visible() then
+            cmp.select_prev_item()
+          elseif vim.fn['vsnip#available'](-1) == 1 then
+            feedkeys("<Plug>(vsnip-jump-prev)", "")
+          end
+        end
+      '')
+    ];
+
     vim.luaConfigRC.completion = mkIf (cfg.type == "nvim-cmp") (dagPlacement ''
       local nvim_cmp_menu_map = function(entry, vim_item)
         -- name for each source
@@ -59,16 +191,6 @@ in {
       ${optionalString lspkindEnabled ''
         lspkind_opts.before = ${cfg.formatting.format}
       ''}
-
-      local has_words_before = function()
-        local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-        return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
-      end
-
-      local feedkey = function(key, mode)
-        vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true)
-      end
-
       local cmp = require'cmp'
       cmp.setup({
         snippet = {
@@ -79,37 +201,6 @@ in {
         sources = {
           ${builtSources}
         },
-        mapping = {
-          ['<C-d>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
-          ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c'}),
-          ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c'}),
-          ['<C-y>'] = cmp.config.disable,
-          ['<C-e>'] = cmp.mapping({
-            i = cmp.mapping.abort(),
-            c = cmp.mapping.close(),
-          }),
-          ['<CR>'] = cmp.mapping.confirm({
-            select = true,
-          }),
-          ['<Tab>'] = cmp.mapping(function (fallback)
-            if cmp.visible() then
-              cmp.select_next_item()
-            elseif vim.fn['vsnip#available'](1) == 1 then
-              feedkey("<Plug>(vsnip-expand-or-jump)", "")
-            elseif has_words_before() then
-              cmp.complete()
-            else
-              fallback()
-            end
-          end, { 'i', 's' }),
-          ['<S-Tab>'] = cmp.mapping(function (fallback)
-            if cmp.visible() then
-              cmp.select_prev_item()
-            elseif vim.fn['vsnip#available'](-1) == 1 then
-              feedkeys("<Plug>(vsnip-jump-prev)", "")
-            end
-          end, { 'i', 's' })
-        },
         completion = {
           completeopt = 'menu,menuone,noinsert',
         },
diff --git a/modules/completion/nvim-cmp/nvim-cmp.nix b/modules/completion/nvim-cmp/nvim-cmp.nix
index 9010a99..8011feb 100644
--- a/modules/completion/nvim-cmp/nvim-cmp.nix
+++ b/modules/completion/nvim-cmp/nvim-cmp.nix
@@ -1,34 +1,6 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
+{lib, ...}:
 with lib;
-with builtins; let
-  cfg = config.vim.autocomplete;
-  lspkindEnabled = config.vim.lsp.enable && config.vim.lsp.lspkind.enable;
-  builtSources =
-    concatMapStringsSep
-    "\n"
-    (n: "{ name = '${n}'},")
-    (attrNames cfg.sources);
-
-  builtMaps =
-    concatStringsSep
-    "\n"
-    (mapAttrsToList
-      (n: v:
-        if v == null
-        then ""
-        else "${n} = '${v}',")
-      cfg.sources);
-
-  dagPlacement =
-    if lspkindEnabled
-    then nvim.dag.entryAfter ["lspkind"]
-    else nvim.dag.entryAnywhere;
-in {
+with builtins; {
   options.vim = {
     autocomplete = {
       enable = mkOption {
@@ -37,6 +9,16 @@ in {
         description = "enable autocomplete";
       };
 
+      mappings = {
+        complete = mkMappingOption "Complete [nvim-cmp]" "<C-Space>";
+        confirm = mkMappingOption "Confirm [nvim-cmp]" "<CR>";
+        next = mkMappingOption "Next item [nvim-cmp]" "<Tab>";
+        previous = mkMappingOption "Previous item [nvim-cmp]" "<S-Tab>";
+        close = mkMappingOption "Close [nvim-cmp]" "<C-e>";
+        scrollDocsUp = mkMappingOption "Scroll docs up [nvim-cmp]" "<C-d>";
+        scrollDocsDown = mkMappingOption "Scroll docs down [nvim-cmp]" "<C-f>";
+      };
+
       type = mkOption {
         type = types.enum ["nvim-cmp"];
         default = "nvim-cmp";

From f3061949b6ffb6a566dd6221d7819235572954e8 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Sat, 22 Apr 2023 18:47:07 +0200
Subject: [PATCH 050/162] fix: add missing mkSetExprBinding function

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

diff --git a/lib/stdlib-extended.nix b/lib/stdlib-extended.nix
index 0455983..50fa80b 100644
--- a/lib/stdlib-extended.nix
+++ b/lib/stdlib-extended.nix
@@ -55,6 +55,9 @@ in
     mkSetBinding = binding: action:
       mkBinding binding.value action binding.description;
 
+    mkSetExprBinding = binding: action:
+      mkExprBinding binding.value action binding.description;
+
     mkSetLuaBinding = binding: action:
       mkLuaBinding binding.value action binding.description;
 

From 4adb03cd1dfa2dbc4993166d19bd47796e3831ae Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Sat, 22 Apr 2023 18:47:19 +0200
Subject: [PATCH 051/162] feat: add gitsigns keybindings

---
 modules/git/config.nix | 77 +++++++++++++++++++++++++++---------------
 modules/git/git.nix    | 33 +++++++++++++-----
 2 files changed, 73 insertions(+), 37 deletions(-)

diff --git a/modules/git/config.nix b/modules/git/config.nix
index fffda35..cda7279 100644
--- a/modules/git/config.nix
+++ b/modules/git/config.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...
@@ -7,40 +6,62 @@
 with lib;
 with builtins; let
   cfg = config.vim.git;
+
+  self = import ./git.nix {inherit lib;};
+  gsMappingDefinitions = self.options.vim.git.gitsigns.mappings;
+
+  gsMappings = addDescriptionsToMappings cfg.gitsigns.mappings gsMappingDefinitions;
 in {
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.gitsigns.enable (mkMerge [
       {
         vim.startPlugins = ["gitsigns-nvim"];
 
+        vim.maps.normal = mkMerge [
+          (mkSetExprBinding gsMappings.nextHunk ''
+            function()
+              if vim.wo.diff then return ${toJSON gsMappings.nextHunk.value} end
+
+              vim.schedule(function() package.loaded.gitsigns.next_hunk() end)
+
+              return '<Ignore>'
+            end
+          '')
+          (mkSetExprBinding gsMappings.previousHunk ''
+            function()
+              if vim.wo.diff then return ${toJSON gsMappings.previousHunk.value} end
+
+              vim.schedule(function() package.loaded.gitsigns.prev_hunk() end)
+
+              return '<Ignore>'
+            end
+          '')
+
+          (mkSetLuaBinding gsMappings.stageHunk "package.loaded.gitsigns.stage_hunk")
+          (mkSetLuaBinding gsMappings.resetHunk "package.loaded.gitsigns.reset_hunk")
+          (mkSetLuaBinding gsMappings.undoStageHunk "package.loaded.gitsigns.undo_stage_hunk")
+
+          (mkSetLuaBinding gsMappings.stageBuffer "package.loaded.gitsigns.stage_buffer")
+          (mkSetLuaBinding gsMappings.resetBuffer "package.loaded.gitsigns.reset_buffer")
+
+          (mkSetLuaBinding gsMappings.previewHunk "package.loaded.gitsigns.preview_hunk")
+
+          (mkSetLuaBinding gsMappings.blameLine "function() package.loaded.gitsigns.blame_line{full=true} end")
+          (mkSetLuaBinding gsMappings.toggleBlame "package.loaded.gitsigns.toggle_current_line_blame")
+
+          (mkSetLuaBinding gsMappings.diffThis "package.loaded.gitsigns.diffthis")
+          (mkSetLuaBinding gsMappings.diffProject "function() package.loaded.gitsigns.diffthis('~') end")
+
+          (mkSetLuaBinding gsMappings.toggleDeleted "package.loaded.gitsigns.toggle_deleted")
+        ];
+
+        vim.maps.visual = mkMerge [
+          (mkSetLuaBinding gsMappings.stageHunk "function() package.loaded.gitsigns.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end")
+          (mkSetLuaBinding gsMappings.resetHunk "function() package.loaded.gitsigns.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end")
+        ];
+
         vim.luaConfigRC.gitsigns = nvim.dag.entryAnywhere ''
-          require('gitsigns').setup {
-            keymaps = {
-              noremap = true,
-
-              ['n <leader>gn'] = { expr = true, "&diff ? \'\' : '<cmd>Gitsigns next_hunk<CR>'"},
-              ['n <leader>gp'] = { expr = true, "&diff ? \'\' : '<cmd>Gitsigns prev_hunk<CR>'"},
-
-              ['n <leader>gs'] = '<cmd>Gitsigns stage_hunk<CR>',
-              ['v <leader>gs'] = ':Gitsigns stage_hunk<CR>',
-              ['n <leader>gu'] = '<cmd>Gitsigns undo_stage_hunk<CR>',
-              ['n <leader>gr'] = '<cmd>Gitsigns reset_hunk<CR>',
-              ['v <leader>gr'] = ':Gitsigns reset_hunk<CR>',
-              ['n <leader>gR'] = '<cmd>Gitsigns reset_buffer<CR>',
-              ['n <leader>gp'] = '<cmd>Gitsigns preview_hunk<CR>',
-              ['n <leader>gb'] = '<cmd>lua require"gitsigns".blame_line{full=true}<CR>',
-              ['n <leader>gS'] = '<cmd>Gitsigns stage_buffer<CR>',
-              ['n <leader>gU'] = '<cmd>Gitsigns reset_buffer_index<CR>',
-              ['n <leader>gts'] = ':Gitsigns toggle_signs<CR>',
-              ['n <leader>gtn'] = ':Gitsigns toggle_numhl<CR>',
-              ['n <leader>gtl'] = ':Gitsigns toggle_linehl<CR>',
-              ['n <leader>gtw'] = ':Gitsigns toggle_word_diff<CR>',
-
-              -- Text objects
-              ['o ih'] = ':<C-U>Gitsigns select_hunk<CR>',
-              ['x ih'] = ':<C-U>Gitsigns select_hunk<CR>'
-            },
-          }
+          require('gitsigns').setup{}
         '';
       }
 
diff --git a/modules/git/git.nix b/modules/git/git.nix
index 80da18c..51f162f 100644
--- a/modules/git/git.nix
+++ b/modules/git/git.nix
@@ -1,19 +1,34 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
+{lib, ...}:
 with lib;
-with builtins; let
-  cfg = config.vim.git;
-in {
+with builtins; {
   options.vim.git = {
     enable = mkEnableOption "Git support";
 
     gitsigns = {
       enable = mkEnableOption "gitsigns";
 
+      mappings = {
+        nextHunk = mkMappingOption "Next hunk [Gitsigns]" "]c";
+        previousHunk = mkMappingOption "Previous hunk [Gitsigns]" "[c";
+
+        stageHunk = mkMappingOption "Stage hunk [Gitsigns]" "<leader>hs";
+        undoStageHunk = mkMappingOption "Undo stage hunk [Gitsigns]" "<leader>hu";
+        resetHunk = mkMappingOption "Reset hunk [Gitsigns]" "<leader>hr";
+
+        stageBuffer = mkMappingOption "Stage buffer [Gitsigns]" "<leader>hS";
+        resetBuffer = mkMappingOption "Reset buffer [Gitsigns]" "<leader>hR";
+
+        previewHunk = mkMappingOption "Preview hunk [Gitsigns]" "<leader>hP";
+
+        blameLine = mkMappingOption "Blame line [Gitsigns]" "<leader>hb";
+        toggleBlame = mkMappingOption "Toggle blame [Gitsigns]" "<leader>tb";
+
+        diffThis = mkMappingOption "Diff this [Gitsigns]" "<leader>hd";
+        diffProject = mkMappingOption "Diff project [Gitsigns]" "<leader>hD";
+
+        toggleDeleted = mkMappingOption "Toggle deleted [Gitsigns]" "<leader>td";
+      };
+
       codeActions = mkEnableOption "gitsigns codeactions through null-ls";
     };
   };

From cd98cc29f177e16bcc019a2b84e5cea1fa49945c Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Sat, 22 Apr 2023 19:42:31 +0200
Subject: [PATCH 052/162] feat: add lspsaga keybindings

---
 modules/lsp/lspsaga/config.nix  | 54 ++++++++++++--------------
 modules/lsp/lspsaga/lspsaga.nix | 69 +++++++++++----------------------
 2 files changed, 46 insertions(+), 77 deletions(-)

diff --git a/modules/lsp/lspsaga/config.nix b/modules/lsp/lspsaga/config.nix
index e8c71fa..3b7ea26 100644
--- a/modules/lsp/lspsaga/config.nix
+++ b/modules/lsp/lspsaga/config.nix
@@ -6,41 +6,35 @@
 with lib;
 with builtins; let
   cfg = config.vim.lsp;
+  self = import ./lspsaga.nix {inherit lib;};
+
+  mappingDefinitions = self.options.vim.lsp.lspsaga.mappings;
+  mappings = addDescriptionsToMappings cfg.lspsaga.mappings mappingDefinitions;
 in {
   config = mkIf (cfg.enable && cfg.lspsaga.enable) {
     vim.startPlugins = ["lspsaga"];
 
-    vim.maps.visual = {
-      "<silent><leader>ca" = {action = ":<C-U>lua require('lspsaga.codeaction').range_code_action()<CR>";};
-    };
+    vim.maps.visual = mkSetLuaBinding mappings.codeAction "require('lspsaga.codeaction').range_code_action";
 
-    vim.maps.normal =
-      {
-        "<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" = {action = "<cmd>lua require('lspsaga.codeaction').code_action()<CR>";};
-        }
-        else {}
-      )
-      // (
-        if (!cfg.lspSignature.enable)
-        then {
-          "<silent><leader>ls" = {action = "<cmd>lua require('lspsaga.signaturehelp').signature_help()<CR>";};
-        }
-        else {}
-      );
+    vim.maps.normal = mkMerge [
+      (mkSetLuaBinding mappings.lspFinder "require('lspsaga.provider').lsp_finder")
+      (mkSetLuaBinding mappings.renderHoveredDoc "require('lspsaga.hover').render_hover_doc")
+
+      (mkSetLuaBinding mappings.smartScrollUp "function() require('lspsaga.action').smart_scroll_with_saga(-1) end")
+      (mkSetLuaBinding mappings.smartScrollDown "function() require('lspsaga.action').smart_scroll_with_saga(1) end")
+
+      (mkSetLuaBinding mappings.rename "require('lspsaga.rename').rename")
+      (mkSetLuaBinding mappings.previewDefinition "require('lspsaga.provider').preview_definition")
+
+      (mkSetLuaBinding mappings.showLineDiagnostics "require('lspsaga.diagnostic').show_line_diagnostics")
+      (mkSetLuaBinding mappings.showCursorDiagnostics "require('lspsaga.diagnostic').show_cursor_diagnostics")
+
+      (mkSetLuaBinding mappings.nextDiagnostic "require('lspsaga.diagnostic').navigate('next')")
+      (mkSetLuaBinding mappings.previousDiagnostic "require('lspsaga.diagnostic').navigate('prev')")
+
+      (mkIf (!cfg.nvimCodeActionMenu.enable) (mkSetLuaBinding mappings.codeAction "require('lspsaga.codeaction').code_action"))
+      (mkIf (!cfg.lspSignature.enable) (mkSetLuaBinding mappings.signatureHelp "require('lspsaga.signaturehelp').signature_help"))
+    ];
 
     vim.luaConfigRC.lspsage = nvim.dag.entryAnywhere ''
       -- Enable lspsaga
diff --git a/modules/lsp/lspsaga/lspsaga.nix b/modules/lsp/lspsaga/lspsaga.nix
index 6107273..fec7ef4 100644
--- a/modules/lsp/lspsaga/lspsaga.nix
+++ b/modules/lsp/lspsaga/lspsaga.nix
@@ -1,53 +1,28 @@
-{
-  config,
-  lib,
-  ...
-}:
+{lib, ...}:
 with lib;
-with builtins; let
-  cfg = config.vim.lsp;
-in {
-  options.vim.lsp = {lspsaga = {enable = mkEnableOption "LSP Saga";};};
+with builtins; {
+  options.vim.lsp.lspsaga = {
+    enable = mkEnableOption "LSP Saga";
 
-  config = mkIf (cfg.enable && cfg.lspsaga.enable) {
-    vim.startPlugins = ["lspsaga"];
+    mappings = {
+      lspFinder = mkMappingOption "LSP Finder [LSPSaga]" "<leader>lf";
+      renderHoveredDoc = mkMappingOption "Rendered hovered docs [LSPSaga]" "<leader>lh";
 
-    vim.maps.visual = {
-      "<silent><leader>ca" = {action = ":<C-U>lua require('lspsaga.codeaction').range_code_action()<CR>";};
+      smartScrollUp = mkMappingOption "Smart scroll up [LSPSaga]" "<C-f>";
+      smartScrollDown = mkMappingOption "Smart scroll up [LSPSaga]" "<C-b>";
+
+      rename = mkMappingOption "Rename [LSPSaga]" "<leader>lr";
+      previewDefinition = mkMappingOption "Preview definition [LSPSaga]" "<leader>ld";
+
+      showLineDiagnostics = mkMappingOption "Show line diagnostics [LSPSaga]" "<leader>ll";
+      showCursorDiagnostics = mkMappingOption "Show cursor diagnostics [LSPSaga]" "<leader>lc";
+
+      nextDiagnostic = mkMappingOption "Next diagnostic [LSPSaga]" "<leader>ln";
+      previousDiagnostic = mkMappingOption "Previous diagnostic [LSPSaga]" "<leader>lp";
+
+      codeAction = mkMappingOption "Code action [LSPSaga]" "<leader>ca";
+
+      signatureHelp = mkMappingOption "Signature help [LSPSaga]" "<ledaer>ls";
     };
-
-    vim.maps.normal =
-      {
-        "<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" = {action = "<cmd>lua require('lspsaga.codeaction').code_action()<CR>";};
-        }
-        else {}
-      )
-      // (
-        if (!cfg.lspSignature.enable)
-        then {
-          "<silent><leader>ls" = {action = "<cmd>lua require('lspsaga.signaturehelp').signature_help()<CR>";};
-        }
-        else {}
-      );
-
-    vim.luaConfigRC.lspsage = nvim.dag.entryAnywhere ''
-      -- Enable lspsaga
-      local saga = require 'lspsaga'
-      saga.init_lsp_saga()
-    '';
   };
 }

From d5eb3e87ed34f4b097c87ca60867e5781d7f322e Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Tue, 2 May 2023 21:58:06 +0200
Subject: [PATCH 053/162] feat: add hop keybindings

---
 modules/utility/motion/hop/config.nix |  9 ++++++---
 modules/utility/motion/hop/hop.nix    | 15 ++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/utility/motion/hop/config.nix b/modules/utility/motion/hop/config.nix
index b2b1a8e..a5aa92c 100644
--- a/modules/utility/motion/hop/config.nix
+++ b/modules/utility/motion/hop/config.nix
@@ -5,13 +5,16 @@
 }:
 with lib; let
   cfg = config.vim.utility.motion.hop;
+
+  self = import ./hop.nix {inherit lib;};
+
+  mappingDefinitions = self.options.vim.utility.motion.hop.mappings;
+  mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
     vim.startPlugins = ["hop-nvim"];
 
-    vim.maps.normal."<leader>h" = {
-      action = "<cmd> HopPattern<CR>";
-    };
+    vim.maps.normal = mkSetBinding mappings.hop "<cmd> HopPattern<CR>";
 
     vim.luaConfigRC.hop-nvim = nvim.dag.entryAnywhere ''
       require('hop').setup()
diff --git a/modules/utility/motion/hop/hop.nix b/modules/utility/motion/hop/hop.nix
index d3e3c2f..c57dc7a 100644
--- a/modules/utility/motion/hop/hop.nix
+++ b/modules/utility/motion/hop/hop.nix
@@ -1,13 +1,10 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.vim.utility.motion.hop;
-in {
+{lib, ...}:
+with lib; {
   options.vim.utility.motion.hop = {
+    mappings = {
+      hop = mkMappingOption "Jump to occurences [hop.nvim]" "<leader>h";
+    };
+
     enable = mkEnableOption "Enable Hop.nvim plugin (easy motion)";
   };
 }

From dce3d762d9c060306bcd820e8a5cf30de190f127 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Tue, 2 May 2023 22:12:45 +0200
Subject: [PATCH 054/162] feat: add gesture.nvim keybindings

---
 .../utility/gestures/gesture-nvim/config.nix  | 21 ++++++++++++-------
 .../gestures/gesture-nvim/gesture-nvim.nix    | 14 ++++++-------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/modules/utility/gestures/gesture-nvim/config.nix b/modules/utility/gestures/gesture-nvim/config.nix
index e1e1c34..046c062 100644
--- a/modules/utility/gestures/gesture-nvim/config.nix
+++ b/modules/utility/gestures/gesture-nvim/config.nix
@@ -6,21 +6,26 @@
 with lib;
 with builtins; let
   cfg = config.vim.gestures.gesture-nvim;
+
+  self = import ./gesture-nvim.nix {inherit lib;};
+
+  mappingDefinitions = self.options.vim.gestures.gesture-nvim.mappings;
+  mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
     vim.startPlugins = ["gesture-nvim"];
 
+    vim.maps.normal = mkMerge [
+      (mkSetLuaBinding mappings.draw "require('gesture').draw")
+      (mkSetLuaBinding mappings.finish "require('gesture').finish")
+      (mkIf (mappings.draw.value == "<RightDrag>") {
+        "<RightMouse>" = {action = "<Nop>";};
+      })
+    ];
+
     vim.luaConfigRC.gesture-nvim = nvim.dag.entryAnywhere ''
       vim.opt.mouse = "a"
 
-      vim.keymap.set("n", "<LeftDrag>", [[<Cmd>lua require("gesture").draw()<CR>]], { silent = true })
-      vim.keymap.set("n", "<LeftRelease>", [[<Cmd>lua require("gesture").finish()<CR>]], { silent = true })
-
-      -- or if you would like to use right click
-      -- vim.keymap.set("n", "<RightMouse>", [[<Nop>]])
-      -- vim.keymap.set("n", "<RightDrag>", [[<Cmd>lua require("gesture").draw()<CR>]], { silent = true })
-      -- vim.keymap.set("n", "<RightRelease>", [[<Cmd>lua require("gesture").finish()<CR>]], { silent = true })
-
       local gesture = require("gesture")
       gesture.register({
         name = "scroll to bottom",
diff --git a/modules/utility/gestures/gesture-nvim/gesture-nvim.nix b/modules/utility/gestures/gesture-nvim/gesture-nvim.nix
index 9c37148..d65f4cb 100644
--- a/modules/utility/gestures/gesture-nvim/gesture-nvim.nix
+++ b/modules/utility/gestures/gesture-nvim/gesture-nvim.nix
@@ -1,11 +1,11 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib;
-with builtins; {
+{lib, ...}:
+with lib; {
   options.vim.gestures.gesture-nvim = {
     enable = mkEnableOption "Enable gesture-nvim plugin";
+
+    mappings = {
+      draw = mkMappingOption "Start drawing [gesture.nvim]" "<LeftDrag>";
+      finish = mkMappingOption "Finish drawing [gesture.nvim]" "<LeftRelease>";
+    };
   };
 }

From 25c9bb0962a9153784e05137e533194871e3b551 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Tue, 2 May 2023 23:06:35 +0200
Subject: [PATCH 055/162] feat: add codewindow keybindings

---
 modules/minimap/codewindow/codewindow.nix | 16 +++++++++-------
 modules/minimap/codewindow/config.nix     | 16 +++++++++++++---
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/modules/minimap/codewindow/codewindow.nix b/modules/minimap/codewindow/codewindow.nix
index 58c7a85..802673e 100644
--- a/modules/minimap/codewindow/codewindow.nix
+++ b/modules/minimap/codewindow/codewindow.nix
@@ -1,11 +1,13 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib;
-with builtins; {
+{lib, ...}:
+with lib; {
   options.vim.minimap.codewindow = {
     enable = mkEnableOption "Enable codewindow plugin for minimap view";
+
+    mappings = {
+      open = mkMappingOption "Open minimap [codewindow]" "<leader>mo";
+      close = mkMappingOption "Close minimap [codewindow]" "<leader>mc";
+      toggle = mkMappingOption "Toggle minimap [codewindow]" "<leader>mm";
+      toggleFocus = mkMappingOption "Toggle minimap focus [codewindow]" "<leader>mf";
+    };
   };
 }
diff --git a/modules/minimap/codewindow/config.nix b/modules/minimap/codewindow/config.nix
index dd6a087..1025e63 100644
--- a/modules/minimap/codewindow/config.nix
+++ b/modules/minimap/codewindow/config.nix
@@ -6,19 +6,29 @@
 with lib;
 with builtins; let
   cfg = config.vim.minimap.codewindow;
+
+  self = import ./codewindow.nix {inherit lib;};
+
+  mappingDefinitions = self.options.vim.minimap.codewindow.mappings;
+  mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
     vim.startPlugins = [
       "codewindow-nvim"
     ];
 
+    vim.maps.normal = mkMerge [
+      (mkSetLuaBinding mappings.open "require('codewindow').open_minimap")
+      (mkSetLuaBinding mappings.close "require('codewindow').close_minimap")
+      (mkSetLuaBinding mappings.toggle "require('codewindow').toggle_minimap")
+      (mkSetLuaBinding mappings.toggleFocus "require('codewindow').toggle_focus")
+    ];
+
     vim.luaConfigRC.codewindow = nvim.dag.entryAnywhere ''
       local codewindow = require('codewindow')
       codewindow.setup({
         exclude_filetypes = { 'NvimTree', 'orgagenda'},
-      }
-      )
-      codewindow.apply_default_keybinds()
+      })
     '';
   };
 }

From 46c602f74dca9419f6070e323390e5d392eac0d7 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Tue, 2 May 2023 23:22:35 +0200
Subject: [PATCH 056/162] feat: add nvim-code-action-menu keybindings

---
 modules/lsp/nvim-code-action-menu/config.nix        |  9 ++++++---
 .../nvim-code-action-menu/nvim-code-action-menu.nix | 13 ++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/modules/lsp/nvim-code-action-menu/config.nix b/modules/lsp/nvim-code-action-menu/config.nix
index dd7a1a5..20c402b 100644
--- a/modules/lsp/nvim-code-action-menu/config.nix
+++ b/modules/lsp/nvim-code-action-menu/config.nix
@@ -6,12 +6,15 @@
 with lib;
 with builtins; let
   cfg = config.vim.lsp;
+
+  self = import ./nvim-code-action-menu.nix {inherit lib;};
+
+  mappingDefinitions = self.options.vim.lsp.nvimCodeActionMenu.mappings;
+  mappings = addDescriptionsToMappings cfg.nvimCodeActionMenu.mappings mappingDefinitions;
 in {
   config = mkIf (cfg.enable && cfg.nvimCodeActionMenu.enable) {
     vim.startPlugins = ["nvim-code-action-menu"];
 
-    vim.maps.normal = {
-      "<silent><leader>ca" = {action = ":CodeActionMenu<CR>";};
-    };
+    vim.maps.normal = mkSetBinding mappings.open ":CodeActionMenu<CR>";
   };
 }
diff --git a/modules/lsp/nvim-code-action-menu/nvim-code-action-menu.nix b/modules/lsp/nvim-code-action-menu/nvim-code-action-menu.nix
index 95058e6..83885e2 100644
--- a/modules/lsp/nvim-code-action-menu/nvim-code-action-menu.nix
+++ b/modules/lsp/nvim-code-action-menu/nvim-code-action-menu.nix
@@ -1,13 +1,12 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib;
-with builtins; {
+{lib, ...}:
+with lib; {
   options.vim.lsp = {
     nvimCodeActionMenu = {
       enable = mkEnableOption "Enable nvim code action menu";
+
+      mappings = {
+        open = mkMappingOption "Open code action menu [nvim-code-action-menu]" "<leader>ca";
+      };
     };
   };
 }

From 351803ace076a31eba456ab79101fa9b3aefc1f1 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Tue, 2 May 2023 23:28:40 +0200
Subject: [PATCH 057/162] feat: add trouble keybindings

---
 modules/lsp/trouble/config.nix  | 21 +++++++++++++--------
 modules/lsp/trouble/trouble.nix | 18 +++++++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/modules/lsp/trouble/config.nix b/modules/lsp/trouble/config.nix
index bb6536c..0f3aa11 100644
--- a/modules/lsp/trouble/config.nix
+++ b/modules/lsp/trouble/config.nix
@@ -6,18 +6,23 @@
 with lib;
 with builtins; let
   cfg = config.vim.lsp;
+
+  self = import ./trouble.nix {inherit lib;};
+
+  mappingDefinitions = self.options.vim.lsp.trouble.mappings;
+  mappings = addDescriptionsToMappings cfg.trouble.mappings mappingDefinitions;
 in {
   config = mkIf (cfg.enable && cfg.trouble.enable) {
     vim.startPlugins = ["trouble"];
 
-    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.maps.normal = mkMerge [
+      (mkSetBinding mappings.toggle "<cmd>TroubleToggle<CR>")
+      (mkSetBinding mappings.workspaceDiagnostics "<cmd>TroubleToggle workspace_diagnostics<CR>")
+      (mkSetBinding mappings.documentDiagnostics "<cmd>TroubleToggle document_diagnostics<CR>")
+      (mkSetBinding mappings.lspReferences "<cmd>TroubleToggle lsp_references<CR>")
+      (mkSetBinding mappings.quickfix "<cmd>TroubleToggle quickfix<CR>")
+      (mkSetBinding mappings.locList "<cmd>TroubleToggle loclist<CR>")
+    ];
 
     vim.luaConfigRC.trouble = nvim.dag.entryAnywhere ''
       -- Enable trouble diagnostics viewer
diff --git a/modules/lsp/trouble/trouble.nix b/modules/lsp/trouble/trouble.nix
index 2a5c392..85bf3a3 100644
--- a/modules/lsp/trouble/trouble.nix
+++ b/modules/lsp/trouble/trouble.nix
@@ -1,13 +1,17 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib;
-with builtins; {
+{lib, ...}:
+with lib; {
   options.vim.lsp = {
     trouble = {
       enable = mkEnableOption "Enable trouble diagnostics viewer";
+
+      mappings = {
+        toggle = mkMappingOption "Toggle trouble [trouble]" "<leader>xx";
+        workspaceDiagnostics = mkMappingOption "Workspace diagnostics [trouble]" "<leader>lwd";
+        documentDiagnostics = mkMappingOption "Document diagnostics [trouble]" "<leader>ld";
+        lspReferences = mkMappingOption "LSP References [trouble]" "<leader>lr";
+        quickfix = mkMappingOption "QuickFix [trouble]" "<leader>xq";
+        locList = mkMappingOption "LOCList [trouble]" "<leader>xl";
+      };
     };
   };
 }

From 201a337a0da4122992e7e61bc37c240378c25d0a Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 3 May 2023 00:06:49 +0200
Subject: [PATCH 058/162] fix: make addDescriptionsToMappings recurse on
 attrsets

---
 lib/stdlib-extended.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/stdlib-extended.nix b/lib/stdlib-extended.nix
index 50fa80b..a54e5e9 100644
--- a/lib/stdlib-extended.nix
+++ b/lib/stdlib-extended.nix
@@ -46,10 +46,17 @@ in
     # and merges them into
     # { someKey = { value = "some_value"; description = "Some Description"; }; }
     addDescriptionsToMappings = actualMappings: mappingDefinitions:
-      self.attrsets.mapAttrs (name: value: {
-        value = value;
-        description = mappingDefinitions."${name}".description;
-      })
+      self.attrsets.mapAttrs (name: value: let
+        isNested = self.isAttrs value;
+        returnedValue =
+          if isNested
+          then addDescriptionsToMappings actualMappings."${name}" mappingDefinitions."${name}"
+          else {
+            value = value;
+            description = mappingDefinitions."${name}".description;
+          };
+      in
+        returnedValue)
       actualMappings;
 
     mkSetBinding = binding: action:

From 320cb8007cb41b3cc7b6a8881f1ff0e49bc3aa41 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 3 May 2023 00:15:05 +0200
Subject: [PATCH 059/162] feat: add treesitter keybindings

---
 modules/treesitter/config.nix     | 24 +++++++++++++++++++-----
 modules/treesitter/treesitter.nix | 23 +++++++++++------------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/modules/treesitter/config.nix b/modules/treesitter/config.nix
index b75121b..0bb3a0b 100644
--- a/modules/treesitter/config.nix
+++ b/modules/treesitter/config.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...
@@ -8,6 +7,11 @@ with lib;
 with builtins; let
   cfg = config.vim.treesitter;
   usingNvimCmp = config.vim.autocomplete.enable && config.vim.autocomplete.type == "nvim-cmp";
+
+  self = import ./treesitter.nix {inherit lib;};
+
+  mappingDefinitions = self.options.vim.treesitter.mappings;
+  mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
     vim.startPlugins =
@@ -16,6 +20,16 @@ in {
 
     vim.autocomplete.sources = {"treesitter" = "[Treesitter]";};
 
+    # For some reason, using mkSetLuaBinding and putting the lua code does not work. It just selects the whole file.
+    # This works though, and if it ain't broke, don't fix it.
+    vim.maps.normal = mkSetBinding mappings.incrementalSelection.init ":lua require('nvim-treesitter.incremental_selection').init_selection()<CR>";
+
+    vim.maps.visualOnly = mkMerge [
+      (mkSetBinding mappings.incrementalSelection.incrementByNode ":lua require('nvim-treesitter.incremental_selection').node_incremental()<CR>")
+      (mkSetBinding mappings.incrementalSelection.incrementByScope ":lua require('nvim-treesitter.incremental_selection').scope_incremental()<CR>")
+      (mkSetBinding mappings.incrementalSelection.decrementByNode ":lua require('nvim-treesitter.incremental_selection').node_decremental()<CR>")
+    ];
+
     # For some reason treesitter highlighting does not work on start if this is set before syntax on
     vim.configRC.treesitter-fold = mkIf cfg.fold (nvim.dag.entryBefore ["basic"] ''
       set foldmethod=expr
@@ -36,10 +50,10 @@ in {
         incremental_selection = {
           enable = true,
           keymaps = {
-            init_selection = "gnn",
-            node_incremental = "grn",
-            scope_incremental = "grc",
-            node_decremental = "grm",
+            init_selection = false,
+            node_incremental = false,
+            scope_incremental = false,
+            node_decremental = false,
           },
         },
       }
diff --git a/modules/treesitter/treesitter.nix b/modules/treesitter/treesitter.nix
index cd4476d..e734125 100644
--- a/modules/treesitter/treesitter.nix
+++ b/modules/treesitter/treesitter.nix
@@ -1,14 +1,5 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-with lib;
-with builtins; let
-  cfg = config.vim.treesitter;
-  usingNvimCmp = config.vim.autocomplete.enable && config.vim.autocomplete.type == "nvim-cmp";
-in {
+{lib, ...}:
+with lib; {
   options.vim.treesitter = {
     enable = mkEnableOption "treesitter, also enabled automatically through language options";
 
@@ -16,13 +7,21 @@ in {
 
     autotagHtml = mkEnableOption "autoclose and rename html tag";
 
+    mappings = {
+      incrementalSelection = {
+        init = mkMappingOption "Init selection [treesitter]" "gnn";
+        incrementByNode = mkMappingOption "Increment selection by node [treesitter]" "grn";
+        incrementByScope = mkMappingOption "Increment selection by scope [treesitter]" "grc";
+        decrementByNode = mkMappingOption "Decrement selection by node [treesitter]" "grm";
+      };
+    };
+
     grammars = mkOption {
       type = with types; listOf package;
       default = [];
       description = nvim.nmd.asciiDoc ''
         List of treesitter grammars to install. For supported languages
         use the `vim.language.<lang>.treesitter` option
-
       '';
     };
   };

From c6c04f0d1b3005c34db7e3540d70320f702e9928 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 3 May 2023 00:24:34 +0200
Subject: [PATCH 060/162] feat: add lazygit keybindings

---
 modules/terminal/toggleterm/config.nix     | 6 ++----
 modules/terminal/toggleterm/toggleterm.nix | 4 ++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/terminal/toggleterm/config.nix b/modules/terminal/toggleterm/config.nix
index 6e049a2..9caf691 100644
--- a/modules/terminal/toggleterm/config.nix
+++ b/modules/terminal/toggleterm/config.nix
@@ -6,7 +6,6 @@
 with lib;
 with builtins; let
   cfg = config.vim.terminal.toggleterm;
-  toggleKey = "<c-t>";
 in {
   config = mkMerge [
     (
@@ -14,7 +13,7 @@ in {
         vim.startPlugins = [
           "toggleterm-nvim"
         ];
-        
+
         vim.maps.normal = mkBinding cfg.mappings.open "<Cmd>execute v:count . \"ToggleTerm\"<CR>" "Toggle terminal";
 
         vim.luaConfigRC.toggleterm = nvim.dag.entryAnywhere ''
@@ -57,11 +56,10 @@ in {
             hidden = true,
             on_open = function(term)
               vim.cmd("startinsert!")
-              vim.keymap.set( 't', [[${toggleKey}]], function() term:toggle() end, {silent = true, noremap = true, buffer = term.bufnr})
             end
           })
 
-          vim.keymap.set( 'n', [[<leader>gg]], function() lazygit:toggle() end, {silent = true, noremap = true})
+          vim.keymap.set('n', ${toJSON cfg.lazygit.mappings.open}, function() lazygit:toggle() end, {silent = true, noremap = true, desc = 'Open lazygit [toggleterm]'})
         '';
       }
     )
diff --git a/modules/terminal/toggleterm/toggleterm.nix b/modules/terminal/toggleterm/toggleterm.nix
index 347d579..35effff 100644
--- a/modules/terminal/toggleterm/toggleterm.nix
+++ b/modules/terminal/toggleterm/toggleterm.nix
@@ -37,6 +37,10 @@ with builtins; {
         default = pkgs.lazygit;
         description = "The package that should be used for lazygit. Setting it to null will attempt to use lazygit from your PATH";
       };
+
+      mappings = {
+        open = mkMappingOption "Open lazygit [toggleterm]" "<leader>gg";
+      };
     };
   };
 }

From 221bf566241fc5040640b4d5c4c7f3285320cbcc Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 3 May 2023 00:26:21 +0200
Subject: [PATCH 061/162] style: fix formatting

---
 modules/utility/telescope/telescope.nix | 34 ++++++++++++-------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/modules/utility/telescope/telescope.nix b/modules/utility/telescope/telescope.nix
index fa77fdc..7735fc1 100644
--- a/modules/utility/telescope/telescope.nix
+++ b/modules/utility/telescope/telescope.nix
@@ -4,26 +4,26 @@ with builtins; {
   options.vim.telescope = {
     mappings = {
       findFiles = mkMappingOption "Find files [Telescope]" "<leader>ff";
-      liveGrep = mkMappingOption  "Live grep [Telescope]" "<leader>fg";
-      buffers = mkMappingOption  "Buffers [Telescope]" "<leader>fb";
-      helpTags = mkMappingOption  "Help tags [Telescope]" "<leader>fh";
-      open = mkMappingOption  "Open [Telescope]" "<leader>ft";
+      liveGrep = mkMappingOption "Live grep [Telescope]" "<leader>fg";
+      buffers = mkMappingOption "Buffers [Telescope]" "<leader>fb";
+      helpTags = mkMappingOption "Help tags [Telescope]" "<leader>fh";
+      open = mkMappingOption "Open [Telescope]" "<leader>ft";
 
-      gitCommits = mkMappingOption  "Git commits [Telescope]" "<leader>fvcw";
-      gitBufferCommits = mkMappingOption  "Git buffer commits [Telescope]" "<leader>fvcb";
-      gitBranches = mkMappingOption  "Git branches [Telescope]" "<leader>fvb";
-      gitStatus = mkMappingOption  "Git status [Telescope]" "<leader>fvs";
-      gitStash = mkMappingOption  "Git stash [Telescope]" "<leader>fvx";
+      gitCommits = mkMappingOption "Git commits [Telescope]" "<leader>fvcw";
+      gitBufferCommits = mkMappingOption "Git buffer commits [Telescope]" "<leader>fvcb";
+      gitBranches = mkMappingOption "Git branches [Telescope]" "<leader>fvb";
+      gitStatus = mkMappingOption "Git status [Telescope]" "<leader>fvs";
+      gitStash = mkMappingOption "Git stash [Telescope]" "<leader>fvx";
 
-      lspDocumentSymbols = mkMappingOption  "LSP Document Symbols [Telescope]" "<leader>flsb";
-      lspWorkspaceSymbols = mkMappingOption  "LSP Workspace Symbols [Telescope]" "<leader>flsw";
-      lspReferences = mkMappingOption  "LSP References [Telescope]" "<leader>flr";
-      lspImplementations = mkMappingOption  "LSP Implementations [Telescope]" "<leader>fli";
-      lspDefinitions = mkMappingOption  "LSP Definitions [Telescope]" "<leader>flD";
-      lspTypeDefinitions = mkMappingOption  "LSP Type Definitions [Telescope]" "<leader>flt";
-      diagnostics = mkMappingOption  "Diagnostics [Telescope]" "<leader>fld";
+      lspDocumentSymbols = mkMappingOption "LSP Document Symbols [Telescope]" "<leader>flsb";
+      lspWorkspaceSymbols = mkMappingOption "LSP Workspace Symbols [Telescope]" "<leader>flsw";
+      lspReferences = mkMappingOption "LSP References [Telescope]" "<leader>flr";
+      lspImplementations = mkMappingOption "LSP Implementations [Telescope]" "<leader>fli";
+      lspDefinitions = mkMappingOption "LSP Definitions [Telescope]" "<leader>flD";
+      lspTypeDefinitions = mkMappingOption "LSP Type Definitions [Telescope]" "<leader>flt";
+      diagnostics = mkMappingOption "Diagnostics [Telescope]" "<leader>fld";
 
-      treesitter = mkMappingOption  "Treesitter [Telescope]" "<leader>fs";
+      treesitter = mkMappingOption "Treesitter [Telescope]" "<leader>fs";
     };
 
     enable = mkEnableOption "Enable multi-purpose telescope utility";

From 065bab00ab5693e7079d942f9c2b3374e62a049b Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 3 May 2023 12:17:49 +0200
Subject: [PATCH 062/162] docs: fix docs build

---
 modules/core/default.nix | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/modules/core/default.nix b/modules/core/default.nix
index 8db9806..1c18abc 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -13,13 +13,6 @@ with builtins; let
     EOF
   '';
 
-  mkMappingOption = it:
-    mkOption ({
-        default = {};
-        type = with types; attrsOf (nullOr str);
-      }
-      // it);
-
   mkBool = value: description:
     mkOption {
       type = types.bool;
@@ -31,23 +24,23 @@ with builtins; let
   mapConfigOptions = {
     silent =
       mkBool false
-      "Whether this mapping should be silent. Equivalent to adding <silent> to a map.";
+      (nvim.nmd.asciiDoc "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.";
+      (nvim.nmd.asciiDoc "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.";
+      (nvim.nmd.asciiDoc "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.";
+      (nvim.nmd.asciiDoc "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.";
+      (nvim.nmd.asciiDoc "Whether to fail if the map is already defined. Equivalent to adding <unique> to a map.");
 
     noremap =
       mkBool true
@@ -194,7 +187,6 @@ in {
 
       example = ''
         maps = {
-          normalVisualOp.";" = ":"; # Same as noremap ; :
           normal."<leader>m" = {
             silent = true;
             action = "<cmd>make<CR>";

From 5eeefbab3d10f8d39278d830c17026b123080d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82?= <30625554+n3oney@users.noreply.github.com>
Date: Wed, 3 May 2023 12:32:45 +0200
Subject: [PATCH 063/162] chore: upload docs build artifacts

---
 .github/workflows/check-docs.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/check-docs.yml b/.github/workflows/check-docs.yml
index 95b2af1..ae29751 100644
--- a/.github/workflows/check-docs.yml
+++ b/.github/workflows/check-docs.yml
@@ -40,5 +40,10 @@ jobs:
         run: nix flake check
       - name: Build neovim-flake with default settings
         run: nix build .#${{ matrix.package }} --print-build-logs
+      - name: Upload doc artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: doc
+          path: result/share/doc/neovim-flake/
      
 

From 84b48ced2672ae715b763ae479965bb8ec4dbdb3 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Wed, 3 May 2023 15:03:14 +0200
Subject: [PATCH 064/162] docs: add keymapping adding documentation

---
 .github/CONTRIBUTING.md | 150 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 150 insertions(+)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 558492a..9d24607 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -23,3 +23,153 @@ The contribution process is mostly documented in the [pull request template](.gi
 This project does not quite have a code of conduct yet. And to be honest, I'm not sure if I want one. I'm not expecting this project to be a hotbed of activity, but I do want to make sure that everyone who does contribute feels welcome and safe. As such, I will do my best to make sure that those who distrupt the project are dealt with swiftly and appropriately.
 
 If you feel that you are not being treated with respect, please contact me directly.
+
+## Custom key mappings support for a plugin
+
+To add custom keymappings to a plugin, a couple of helper functions are available in the project.
+
+To set a mapping, you should define it on `vim.maps.<mode>`.
+The available modes are:
+
+- normal
+- insert
+- select
+- visual
+- terminal
+- normalVisualOp
+- visualOnly
+- operator
+- insertCommand
+- lang
+- command
+
+An example, simple keybinding, can look like this:
+
+```nix
+
+{
+  vim.maps.normal = {
+    "<leader>wq" = {
+      action = ":wq<CR>";
+      silent = true;
+      desc = "Save file and quit";
+    };
+  };
+}
+```
+
+There are many settings available in the options. Please refer to [the documentation](https://notashelf.github.io/neovim-flake/options.html#opt-vim.maps.command._name_.action) to see a list of them.
+
+neovim-flake provides a list of helper commands, so that you don't have to write the mapping attribute sets every time:
+
+`mkBinding = key: action: desc:` - makes a basic binding, with `silent` set to true.  
+`mkExprBinding = key: action: desc:` - makes an expression binding, with `lua`, `silent`, and `expr` set to true.  
+`mkLuaBinding = key: action: desc:` - makes an expression binding, with `lua`, and `silent` set to true.  
+Note - the lua in these bindings is _actual_ lua, not pasted into a `:lua`.  
+Therefore, you either pass in a function like `require('someplugin').some_function`, without actually calling it,
+or you define your own function, like `function() require('someplugin').some_function() end`.
+
+Additionally, to not have to repeat the descriptions, there's another utility function with its own set of functions:
+
+```nix
+# Utility function that takes two attrsets:
+# { someKey = "some_value" } and
+# { someKey = { description = "Some Description"; }; }
+# and merges them into
+# { someKey = { value = "some_value"; description = "Some Description"; }; }
+
+addDescriptionsToMappings = actualMappings: mappingDefinitions:
+```
+
+This function can be used in combination with the same mkBinding functions as above, except they only take two arguments - `binding` and `action`, and have different names.  
+`mkSetBinding = binding: action:` - makes a basic binding, with `silent` set to true.  
+`mkSetExprBinding = binding: action:` - makes an expression binding, with `lua`, `silent`, and `expr` set to true.  
+`mkSetLuaBinding = binding: action:` - makes an expression binding, with `lua`, and `silent` set to true.
+
+You can read the source code of some modules to see them in action, but their usage should look something like this:
+
+```nix
+# plugindefinition.nix
+{lib, ...}:
+with lib; {
+  options.vim.plugin = {
+    enable = mkEnableOption "Enable plugin";
+
+    # Mappings should always be inside an attrset called mappings
+    mappings = {
+      # mkMappingOption is a helper function from lib,
+      # that takes a description (which will also appear in which-key),
+      # and a default mapping (which can be null)
+      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";
+    };
+  };
+}
+```
+
+```nix
+# config.nix
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.plugin;
+  self = import ./plugindefinition.nix {inherit lib;};
+  mappingDefinitions = self.options.vim.plugin;
+
+  # addDescriptionsToMappings is a helper function from lib,
+  # that merges mapping values and their descriptions
+  # into one nice attribute set
+  mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
+in {
+  config = mkIf (cfg.enable) {
+    # ...
+
+    vim.maps.normal = mkMerge [
+      # mkSetBinding is another helper function from lib,
+      # that actually adds the mapping with a description.
+      (mkSetBinding mappings.findFiles "<cmd> Telescope find_files<CR>")
+      (mkSetBinding mappings.liveGrep "<cmd> Telescope live_grep<CR>")
+      (mkSetBinding mappings.buffers "<cmd> Telescope buffers<CR>")
+      (mkSetBinding mappings.helpTags "<cmd> Telescope help_tags<CR>")
+      (mkSetBinding mappings.open "<cmd> Telescope<CR>")
+
+      (mkSetBinding mappings.gitCommits "<cmd> Telescope git_commits<CR>")
+      (mkSetBinding mappings.gitBufferCommits "<cmd> Telescope git_bcommits<CR>")
+      (mkSetBinding mappings.gitBranches "<cmd> Telescope git_branches<CR>")
+      (mkSetBinding mappings.gitStatus "<cmd> Telescope git_status<CR>")
+      (mkSetBinding mappings.gitStash "<cmd> Telescope git_stash<CR>")
+
+      (mkIf config.vim.lsp.enable (mkMerge [
+        (mkSetBinding mappings.lspDocumentSymbols "<cmd> Telescope lsp_document_symbols<CR>")
+        (mkSetBinding mappings.lspWorkspaceSymbols "<cmd> Telescope lsp_workspace_symbols<CR>")
+
+        (mkSetBinding mappings.lspReferences "<cmd> Telescope lsp_references<CR>")
+        (mkSetBinding mappings.lspImplementations "<cmd> Telescope lsp_implementations<CR>")
+        (mkSetBinding mappings.lspDefinitions "<cmd> Telescope lsp_definitions<CR>")
+        (mkSetBinding mappings.lspTypeDefinitions "<cmd> Telescope lsp_type_definitions<CR>")
+        (mkSetBinding mappings.diagnostics "<cmd> Telescope diagnostics<CR>")
+      ]))
+
+      (
+        mkIf config.vim.treesitter.enable
+        (mkSetBinding mappings.treesitter "<cmd> Telescope treesitter<CR>")
+      )
+    ];
+
+    # ...
+  };
+}
+```
+
+If you have come across a plugin that has an API that doesn't seem to easily allow custom keybindings, don't be scared to implement a draft PR. We'll help you get it done.

From 1818f4b91098960a0981ede122886ff57ae8b607 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 8 May 2023 13:40:36 +0200
Subject: [PATCH 065/162] fix: remove non-existent fallback function

---
 modules/completion/nvim-cmp/config.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/completion/nvim-cmp/config.nix b/modules/completion/nvim-cmp/config.nix
index 7bdda3d..1cc4fa4 100644
--- a/modules/completion/nvim-cmp/config.nix
+++ b/modules/completion/nvim-cmp/config.nix
@@ -84,7 +84,9 @@ in {
           elseif has_words_before() then
             cmp.complete()
           else
-            fallback()
+            local termcode = vim.api.nvim_replace_termcodes(${builtins.toJSON mappings.next.value}, true, false, true)
+
+            vim.fn.feedkeys(termcode, 'n')
           end
         end
       '')
@@ -157,7 +159,9 @@ in {
           elseif has_words_before() then
             cmp.complete()
           else
-            fallback()
+            local termcode = vim.api.nvim_replace_termcodes(${builtins.toJSON mappings.next.value}, true, false, true)
+
+            vim.fn.feedkeys(termcode, 'n')
           end
         end
       '')

From 425b55167efca73a8de1c8944c6f9395480f730e Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Tue, 9 May 2023 12:14:53 +0200
Subject: [PATCH 066/162] feat: new option to enable lua module loader

---
 modules/basic/module.nix | 2 ++
 modules/core/default.nix | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/modules/basic/module.nix b/modules/basic/module.nix
index 443abee..d06838e 100644
--- a/modules/basic/module.nix
+++ b/modules/basic/module.nix
@@ -144,5 +144,7 @@ with builtins; {
       default = true;
       description = "Follow editorconfig rules in current directory";
     };
+
+    enableLuaLoader = mkEnableOption "Enable the experimental Lua module loader to speed up the start up process";
   };
 }
diff --git a/modules/core/default.nix b/modules/core/default.nix
index 78232b3..f5b6478 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -9,6 +9,9 @@ with builtins; let
 
   wrapLuaConfig = luaConfig: ''
     lua << EOF
+    ${optionalString cfg.enableLuaLoader ''
+      vim.loader.enable()
+    ''}
     ${luaConfig}
     EOF
   '';

From ee2cd6a0b80bb094704c722f3151d859bb976035 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Tue, 9 May 2023 19:28:38 +0200
Subject: [PATCH 067/162] docs: update release notes

---
 docs/release-notes/rl-0.4.adoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index ddf5f75..d8be38b 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -13,3 +13,5 @@ ttps://github.com/horriblename[horriblename]:
 * Added `clangd` as alternative lsp for C/++.
 
 * Added `toggleterm` integration for `lazygit`.
+
+* Added new option `enableLuaLoader` to enable neovim's experimental module loader for faster startup time.

From 20c184178ea198e4e1aec4fe36c763a94eb98e11 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Wed, 10 May 2023 10:44:25 +0300
Subject: [PATCH 068/162] fix: update deprecated buffer_close_icon

---
 modules/tabline/nvim-bufferline/config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tabline/nvim-bufferline/config.nix b/modules/tabline/nvim-bufferline/config.nix
index 9e73cbe..05c6399 100644
--- a/modules/tabline/nvim-bufferline/config.nix
+++ b/modules/tabline/nvim-bufferline/config.nix
@@ -51,7 +51,7 @@ in {
                 style = 'icon',
                 indicator_icon = '▎',
               },
-              buffer_close_icon = '',
+              buffer_close_icon = '󰅖',
               modified_icon = '●',
               close_icon = '',
               left_trunc_marker = '',

From b996c123e624ce831319b75dd4b78fa7466077a0 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Wed, 10 May 2023 12:11:33 +0300
Subject: [PATCH 069/162] feat: make Copilot node package configurable

---
 modules/assistant/copilot/config.nix  |  2 +-
 modules/assistant/copilot/copilot.nix | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/assistant/copilot/config.nix b/modules/assistant/copilot/config.nix
index 112a3f7..c920e35 100644
--- a/modules/assistant/copilot/config.nix
+++ b/modules/assistant/copilot/config.nix
@@ -23,7 +23,7 @@ in {
   config = mkIf cfg.enable {
     vim.startPlugins = [
       "copilot-lua"
-      pkgs.nodejs-slim-16_x
+      cfg.copilotNodePackage
     ];
 
     vim.luaConfigRC.copilot = nvim.dag.entryAnywhere ''
diff --git a/modules/assistant/copilot/copilot.nix b/modules/assistant/copilot/copilot.nix
index 5529dcb..23f2619 100644
--- a/modules/assistant/copilot/copilot.nix
+++ b/modules/assistant/copilot/copilot.nix
@@ -5,7 +5,9 @@
   ...
 }:
 with lib;
-with builtins; {
+with builtins; let
+  cfg = config.vim.assistant.copilot;
+in {
   options.vim.assistant.copilot = {
     enable = mkEnableOption "Enable GitHub Copilot";
 
@@ -91,8 +93,14 @@ with builtins; {
 
     copilot_node_command = mkOption {
       type = types.str;
-      default = "${lib.getExe pkgs.nodejs-slim-16_x}";
+      default = "${lib.getExe cfg.copilotNodePackage}";
       description = "Path to nodejs";
     };
+
+    copilotNodePackage = mkOption {
+      type = with types; nullOr package;
+      default = pkgs.nodejs-slim-16_x;
+      description = "The package that will be used for Copilot. NodeJS v16 is recommended.";
+    };
   };
 }

From 5d7c6b3c3fad8db5a38b46fbd80cde56a9a48206 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Wed, 10 May 2023 12:21:36 +0300
Subject: [PATCH 070/162] docs: changelogs and attributions

---
 .github/README.md                     |  4 +++-
 docs/release-notes/release-notes.adoc |  1 +
 docs/release-notes/rl-0.4.adoc        | 18 +++++++++++++++---
 docs/try-it-out.adoc                  |  2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.github/README.md b/.github/README.md
index 3090046..719a711 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -139,7 +139,9 @@ instead of the `maximal` output. This will reduce size by a lot, but you will lo
 Special thanks to
 
 - [@fufexan](https://github.com/fufexan) - For the transition to flake-parts
-- [@FlafyDev](https://github.com/FlafyDev) - For getting the home-manager to work 
+- [@FlafyDev](https://github.com/FlafyDev) - For getting the home-manager to work
+- [@n3oney](https://github.com/n3oney) - For making custom keybinds finally possible
+- [@horriblename](https://github.com/horriblename) - For actively implementing planned features and quality of life updates
 
 and everyone who has submitted issues or pull requests!
 
diff --git a/docs/release-notes/release-notes.adoc b/docs/release-notes/release-notes.adoc
index 8217fb6..15118f7 100644
--- a/docs/release-notes/release-notes.adoc
+++ b/docs/release-notes/release-notes.adoc
@@ -9,3 +9,4 @@ This section lists the release notes for tagged version of neovim-flake and curr
 include::rl-0.1.adoc[]
 include::rl-0.2.adoc[]
 include::rl-0.3.adoc[]
+include::rl-0.4.adoc[]
diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index d8be38b..75be6b8 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -1,17 +1,29 @@
 [[sec-release-0.4]]
 == Release 0.4
 
-Release notes for release 0.4
+Following the release of v0.3, I have decided to release v0.4 with a massive new change: customizable keybinds. As of the 0.4 release, keybinds will no longer be hardcoded and instead provided by each module's own keybinds section. The old keybind system (`vim.keybinds = {}`) is now considered deprecated and the new lib functions are recommended to be used for adding keybinds for new plugins, or adding keybinds to existing plugins.
+
+Alongside customizable keybinds, there are a few quality of life updates, such as `lazygit` integration and the new experimental Lua loader of Neovim 0.9 thanks to our awesome contributors who made this update possible during my absence.
 
 
 [[sec-release-0.4-changelog]]
 === Changelog
 
 
-ttps://github.com/horriblename[horriblename]:
+https://github.com/n3oney[n3oney]:
+
+* Streamlined keybind adding process towards new functions in extended stdlib.
+
+* Moved default keybinds into keybinds section of each module
+
+https://github.com/horriblename[horriblename]:
 
 * Added `clangd` as alternative lsp for C/++.
 
 * Added `toggleterm` integration for `lazygit`.
 
-* Added new option `enableLuaLoader` to enable neovim's experimental module loader for faster startup time.
+* Added new option `enableluaLoader` to enable neovim's experimental module loader for faster startup time.
+
+https://github.com/notashelf[notashelf]:
+
+* Made Copilot's Node package configurable. It is recommended to keep as default, but providing a different NodeJS version is now possible.
diff --git a/docs/try-it-out.adoc b/docs/try-it-out.adoc
index 2311704..fb8198f 100644
--- a/docs/try-it-out.adoc
+++ b/docs/try-it-out.adoc
@@ -4,7 +4,7 @@
 [source,console]
 ----
 $ cachix use neovim-flake # Optional: it'll save you CPU resources and time
-$ nix run github:notashelf/neovim-flake
+$ nix run github:notashelf/neovim-flake # will run the default configuration
 ----
 
 

From 7eaa559996afa6ec732fa90c7d5fad24b4488e98 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Wed, 10 May 2023 13:45:45 +0300
Subject: [PATCH 071/162] fix: replace deprecated nerdfonts icons

---
 modules/dashboard/alpha/config.nix     | 6 +++---
 modules/statusline/lualine/lualine.nix | 2 +-
 modules/ui/noice/config.nix            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/dashboard/alpha/config.nix b/modules/dashboard/alpha/config.nix
index 05b4900..a0df3be 100644
--- a/modules/dashboard/alpha/config.nix
+++ b/modules/dashboard/alpha/config.nix
@@ -186,10 +186,10 @@ in {
       		{ type = "padding", val = 1 },
           -- TODO: buttons should be added based on whether or not the relevant plugin is available
       		dashboard.button("e", "  New file", "<cmd>ene<CR>"), -- available all the time
-      		dashboard.button("SPC F", "  Find file"), -- telescope
-      		dashboard.button("SPC ff", "  Live grep"), -- telescope
+      		dashboard.button("SPC F", "󰈞  Find file"), -- telescope
+      		dashboard.button("SPC ff", "󰊄  Live grep"), -- telescope
       		dashboard.button("SPC p", "  Projects"), -- any project
-      		dashboard.button("q", "  Quit", "<cmd>qa<CR>"), -- available all the time
+      		dashboard.button("q", "󰅚  Quit", "<cmd>qa<CR>"), -- available all the time
       	},
       	position = "center",
       }
diff --git a/modules/statusline/lualine/lualine.nix b/modules/statusline/lualine/lualine.nix
index f1bd31c..ebc217b 100644
--- a/modules/statusline/lualine/lualine.nix
+++ b/modules/statusline/lualine/lualine.nix
@@ -184,7 +184,7 @@ in {
             {
               "diagnostics",
               sources = {'nvim_lsp', 'nvim_diagnostic', 'coc'},
-              symbols = {error = ' ', warn = ' ', info = ' ', hint = ' '}
+              symbols = {error = '󰅙 ', warn = ' ', info = ' ', hint = '󰌵 '}
             },
           }
         '';
diff --git a/modules/ui/noice/config.nix b/modules/ui/noice/config.nix
index 38d45b6..705256b 100644
--- a/modules/ui/noice/config.nix
+++ b/modules/ui/noice/config.nix
@@ -41,7 +41,7 @@ in {
           search_up = { kind = "search", pattern = "^%?", icon = " ", lang = "regex" },
           filter = { pattern = "^:%s*!", icon = "", lang = "bash" },
           lua = { pattern = "^:%s*lua%s+", icon = "", lang = "lua" },
-          help = { pattern = "^:%s*he?l?p?%s+", icon = "" },
+          help = { pattern = "^:%s*he?l?p?%s+", icon = "󰋖" },
           input = {},
         },
 

From cb4ce03b35cf9f46d1df129c44685bfb4d08f3a3 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Wed, 10 May 2023 14:41:17 +0300
Subject: [PATCH 072/162] feat: vim-wakatime

---
 extra.nix                                 |  1 +
 flake.lock                                | 17 +++++++++++++++++
 flake.nix                                 |  5 +++++
 lib/types/plugins.nix                     |  1 +
 modules/utility/default.nix               |  1 +
 modules/utility/wakatime/config.nix       | 15 +++++++++++++++
 modules/utility/wakatime/default.nix      |  6 ++++++
 modules/utility/wakatime/vim-wakatime.nix |  8 ++++++++
 8 files changed, 54 insertions(+)
 create mode 100644 modules/utility/wakatime/config.nix
 create mode 100644 modules/utility/wakatime/default.nix
 create mode 100644 modules/utility/wakatime/vim-wakatime.nix

diff --git a/extra.nix b/extra.nix
index 767d5dd..6794c48 100644
--- a/extra.nix
+++ b/extra.nix
@@ -151,6 +151,7 @@ inputs: let
 
       vim.utility = {
         colorizer.enable = true;
+        vim-wakatime.enable = true;
         icon-picker.enable = true;
         diffview-nvim.enable = true;
         motion = {
diff --git a/flake.lock b/flake.lock
index 4e4fbde..25eb38f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1359,6 +1359,7 @@
         "vim-repeat": "vim-repeat",
         "vim-startify": "vim-startify",
         "vim-vsnip": "vim-vsnip",
+        "vim-wakatime": "vim-wakatime",
         "which-key": "which-key",
         "zig": "zig"
       }
@@ -1732,6 +1733,22 @@
         "type": "github"
       }
     },
+    "vim-wakatime": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1683640992,
+        "narHash": "sha256-DIj+ps5XfpFHwBJ42EBw5ayHfdzCc+bDvpyYm/p+9Ec=",
+        "owner": "wakatime",
+        "repo": "vim-wakatime",
+        "rev": "02be9238319937e04afea73fd0fc7da5413ee041",
+        "type": "github"
+      },
+      "original": {
+        "owner": "wakatime",
+        "repo": "vim-wakatime",
+        "type": "github"
+      }
+    },
     "vowel-src": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index e488e89..a3a39a4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -373,6 +373,11 @@
     };
 
     # Utilities
+    vim-wakatime = {
+      url = "github:wakatime/vim-wakatime";
+      flake = false;
+    };
+
     colorizer = {
       url = "github:uga-rosa/ccc.nvim";
       flake = false;
diff --git a/lib/types/plugins.nix b/lib/types/plugins.nix
index f99394f..77c3eda 100644
--- a/lib/types/plugins.nix
+++ b/lib/types/plugins.nix
@@ -81,6 +81,7 @@ with lib; let
     "project-nvim"
     "elixir-ls"
     "elixir-tools"
+    "vim-wakatime"
   ];
   # You can either use the name of the plugin or a package.
   pluginsType = with types;
diff --git a/modules/utility/default.nix b/modules/utility/default.nix
index 1bd03c6..96589dd 100644
--- a/modules/utility/default.nix
+++ b/modules/utility/default.nix
@@ -8,5 +8,6 @@ _: {
     ./icon-picker
     ./telescope
     ./diffview
+    ./wakatime
   ];
 }
diff --git a/modules/utility/wakatime/config.nix b/modules/utility/wakatime/config.nix
new file mode 100644
index 0000000..b7e35f4
--- /dev/null
+++ b/modules/utility/wakatime/config.nix
@@ -0,0 +1,15 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.utility.vim-wakatime;
+in {
+  config = mkIf (cfg.enable) {
+    vim.startPlugins = [
+      "vim-wakatime"
+    ];
+  };
+}
diff --git a/modules/utility/wakatime/default.nix b/modules/utility/wakatime/default.nix
new file mode 100644
index 0000000..d6d67d5
--- /dev/null
+++ b/modules/utility/wakatime/default.nix
@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./config.nix
+    ./vim-wakatime.nix
+  ];
+}
diff --git a/modules/utility/wakatime/vim-wakatime.nix b/modules/utility/wakatime/vim-wakatime.nix
new file mode 100644
index 0000000..b97b9ea
--- /dev/null
+++ b/modules/utility/wakatime/vim-wakatime.nix
@@ -0,0 +1,8 @@
+{lib, ...}:
+with lib;
+with builtins; {
+  options.vim.utility.vim-wakatime = {
+    enable = mkEnableOption "Enable vim-wakatime";
+  };
+}
+

From f0bf3a7ae24f5bd4e50df4d407180d4e6223a54a Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Wed, 10 May 2023 14:56:49 +0300
Subject: [PATCH 073/162] dev: get vim-wakatime from nixpkgs

---
 modules/utility/wakatime/config.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/utility/wakatime/config.nix b/modules/utility/wakatime/config.nix
index b7e35f4..9a9b707 100644
--- a/modules/utility/wakatime/config.nix
+++ b/modules/utility/wakatime/config.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
 with lib;
@@ -9,7 +10,7 @@ with builtins; let
 in {
   config = mkIf (cfg.enable) {
     vim.startPlugins = [
-      "vim-wakatime"
+      pkgs.vimPlugins.vim-wakatime
     ];
   };
 }

From a4b7a3ec3c9c4d4d4fad92444e375772dc09b15e Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 8 May 2023 13:40:36 +0200
Subject: [PATCH 074/162] fix: remove non-existent fallback function

---
 modules/completion/nvim-cmp/config.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/completion/nvim-cmp/config.nix b/modules/completion/nvim-cmp/config.nix
index 7bdda3d..1cc4fa4 100644
--- a/modules/completion/nvim-cmp/config.nix
+++ b/modules/completion/nvim-cmp/config.nix
@@ -84,7 +84,9 @@ in {
           elseif has_words_before() then
             cmp.complete()
           else
-            fallback()
+            local termcode = vim.api.nvim_replace_termcodes(${builtins.toJSON mappings.next.value}, true, false, true)
+
+            vim.fn.feedkeys(termcode, 'n')
           end
         end
       '')
@@ -157,7 +159,9 @@ in {
           elseif has_words_before() then
             cmp.complete()
           else
-            fallback()
+            local termcode = vim.api.nvim_replace_termcodes(${builtins.toJSON mappings.next.value}, true, false, true)
+
+            vim.fn.feedkeys(termcode, 'n')
           end
         end
       '')

From 908dbd04b0695bbb558447b3430e750dda3098b1 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Wed, 10 May 2023 15:09:06 +0300
Subject: [PATCH 075/162] dev: drop vim-wakatime flake input

---
 flake.nix             | 5 -----
 lib/types/plugins.nix | 1 -
 2 files changed, 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index a3a39a4..e488e89 100644
--- a/flake.nix
+++ b/flake.nix
@@ -373,11 +373,6 @@
     };
 
     # Utilities
-    vim-wakatime = {
-      url = "github:wakatime/vim-wakatime";
-      flake = false;
-    };
-
     colorizer = {
       url = "github:uga-rosa/ccc.nvim";
       flake = false;
diff --git a/lib/types/plugins.nix b/lib/types/plugins.nix
index 77c3eda..f99394f 100644
--- a/lib/types/plugins.nix
+++ b/lib/types/plugins.nix
@@ -81,7 +81,6 @@ with lib; let
     "project-nvim"
     "elixir-ls"
     "elixir-tools"
-    "vim-wakatime"
   ];
   # You can either use the name of the plugin or a package.
   pluginsType = with types;

From ab35aaf3b7940f1960d2462ef2deb737be003000 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Wed, 10 May 2023 15:09:30 +0300
Subject: [PATCH 076/162] style: formatting

---
 modules/utility/wakatime/vim-wakatime.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/utility/wakatime/vim-wakatime.nix b/modules/utility/wakatime/vim-wakatime.nix
index b97b9ea..7865506 100644
--- a/modules/utility/wakatime/vim-wakatime.nix
+++ b/modules/utility/wakatime/vim-wakatime.nix
@@ -5,4 +5,3 @@ with builtins; {
     enable = mkEnableOption "Enable vim-wakatime";
   };
 }
-

From 4e43b6e0090b6d1657df3787ec2c757447ec4420 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Wed, 10 May 2023 16:46:33 +0300
Subject: [PATCH 077/162] dev: re-lock flake

---
 flake.lock | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 25eb38f..4e4fbde 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1359,7 +1359,6 @@
         "vim-repeat": "vim-repeat",
         "vim-startify": "vim-startify",
         "vim-vsnip": "vim-vsnip",
-        "vim-wakatime": "vim-wakatime",
         "which-key": "which-key",
         "zig": "zig"
       }
@@ -1733,22 +1732,6 @@
         "type": "github"
       }
     },
-    "vim-wakatime": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1683640992,
-        "narHash": "sha256-DIj+ps5XfpFHwBJ42EBw5ayHfdzCc+bDvpyYm/p+9Ec=",
-        "owner": "wakatime",
-        "repo": "vim-wakatime",
-        "rev": "02be9238319937e04afea73fd0fc7da5413ee041",
-        "type": "github"
-      },
-      "original": {
-        "owner": "wakatime",
-        "repo": "vim-wakatime",
-        "type": "github"
-      }
-    },
     "vowel-src": {
       "flake": false,
       "locked": {

From 50c2e916260849f62dfdd68a7ddaee9b44f7f3a8 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Thu, 11 May 2023 16:21:52 +0300
Subject: [PATCH 078/162] feat: provide wakatime-cli package option

---
 modules/utility/wakatime/config.nix       |  8 ++++++++
 modules/utility/wakatime/vim-wakatime.nix | 12 +++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/utility/wakatime/config.nix b/modules/utility/wakatime/config.nix
index 9a9b707..fb99074 100644
--- a/modules/utility/wakatime/config.nix
+++ b/modules/utility/wakatime/config.nix
@@ -12,5 +12,13 @@ in {
     vim.startPlugins = [
       pkgs.vimPlugins.vim-wakatime
     ];
+
+    vim.configRC.vim-wakatime = nvim.dag.entryAnywhere ''
+      ${
+        if cfg.cli-package == null
+        then ""
+        else ''let g:wakatime_CLIPath = "${cfg.cli-package}"''
+      }
+    '';
   };
 }
diff --git a/modules/utility/wakatime/vim-wakatime.nix b/modules/utility/wakatime/vim-wakatime.nix
index 7865506..2df357e 100644
--- a/modules/utility/wakatime/vim-wakatime.nix
+++ b/modules/utility/wakatime/vim-wakatime.nix
@@ -1,7 +1,17 @@
-{lib, ...}:
+{
+  lib,
+  pkgs,
+  ...
+}:
 with lib;
 with builtins; {
   options.vim.utility.vim-wakatime = {
     enable = mkEnableOption "Enable vim-wakatime";
+
+    cli-package = mkOption {
+      type = with types; nullOr package;
+      default = pkgs.wakatime;
+      description = "The package that should be used for wakatime-cli. Set as null to use the default path in `$XDG_DATA_HOME`";
+    };
   };
 }

From 1aa354e4a253cb27f32c9d2f30c3d55eec92f229 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Fri, 12 May 2023 20:30:37 +0200
Subject: [PATCH 079/162] feat: replace eslint with eslint_d for better
 performance

---
 modules/languages/ts.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/languages/ts.nix b/modules/languages/ts.nix
index ecb8f02..940f8d9 100644
--- a/modules/languages/ts.nix
+++ b/modules/languages/ts.nix
@@ -39,15 +39,15 @@ with builtins; let
   };
 
   # TODO: specify packages
-  defaultDiagnostics = ["eslint"];
+  defaultDiagnostics = ["eslint_d"];
   diagnostics = {
-    eslint = {
-      package = pkgs.nodePackages.eslint;
+    eslint_d = {
+      package = pkgs.nodePackages.eslint_d;
       nullConfig = pkg: ''
         table.insert(
           ls_sources,
-          null_ls.builtins.diagnostics.eslint.with({
-            command = "${pkg}/bin/eslint",
+          null_ls.builtins.diagnostics.eslint_d.with({
+            command = "${lib.getExe pkg}",
           })
         )
       '';

From 2b6580e19c3e14b371ce4f773e86302c1fdf6042 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Fri, 12 May 2023 20:07:44 +0200
Subject: [PATCH 080/162] fix: re-work formatting code

---
 modules/lsp/config.nix | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/modules/lsp/config.nix b/modules/lsp/config.nix
index 2bf2567..bcd69d4 100644
--- a/modules/lsp/config.nix
+++ b/modules/lsp/config.nix
@@ -36,20 +36,21 @@ in {
       end
 
       -- Enable formatting
-      format_callback = function(client, bufnr)
-        vim.api.nvim_create_autocmd("BufWritePre", {
-          group = augroup,
-          buffer = bufnr,
-          callback = function()
-            if vim.g.formatsave then
-              if client.supports_method("textDocument/formatting") then
-                local params = require'vim.lsp.util'.make_formatting_params({})
-                client.request('textDocument/formatting', params, nil, bufnr)
+      local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
 
-              end
-            end
-          end
-        })
+      format_callback = function(client, bufnr)
+        if vim.g.formatsave and client.supports_method("textDocument/formatting") then
+          vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
+          vim.api.nvim_create_autocmd("BufWritePre", {
+            group = augroup,
+            buffer = bufnr,
+            callback = function()
+              vim.lsp.buf.format({
+                bufnr = bufnr
+              })
+            end,
+          })
+        end
       end
 
       default_on_attach = function(client, bufnr)

From 062fbe7c1823d589832c942b9254d72814350c41 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Thu, 4 May 2023 19:10:27 +0300
Subject: [PATCH 081/162] flake: bump inputs

---
 flake.lock | 300 ++++++++++++++++++++++++++---------------------------
 1 file changed, 150 insertions(+), 150 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4e4fbde..a2166c0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "alpha-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1681755353,
-        "narHash": "sha256-yiwFWoz7C+VYL0hrDobTINE4K1v4sbB8koZuURAKlzw=",
+        "lastModified": 1682960992,
+        "narHash": "sha256-l/6J/8DhuHdh7IQfPMWsjjzbnH3leUlwTpW2RX4nL2c=",
         "owner": "goolord",
         "repo": "alpha-nvim",
-        "rev": "87c204040e3f5d4c1c95067b35905d8f8a2f2545",
+        "rev": "447b821d22b0c1e80494638f84cb00ff696f4ef6",
         "type": "github"
       },
       "original": {
@@ -35,11 +35,11 @@
     "catppuccin": {
       "flake": false,
       "locked": {
-        "lastModified": 1681530540,
-        "narHash": "sha256-RPwRyuGTbVMAApdRsVUyHlcHYWRQ9bHlumJTov81Z0c=",
+        "lastModified": 1683097744,
+        "narHash": "sha256-yFpGcovn7ZWFuK4QT3QZppnxleUO9D5wNV+TIsEXnAg=",
         "owner": "catppuccin",
         "repo": "nvim",
-        "rev": "fa9a4465672fa81c06b23634c0f04f6a5d622211",
+        "rev": "a7e279d6e019f35dd042670f00748b602fff5568",
         "type": "github"
       },
       "original": {
@@ -179,11 +179,11 @@
     "codewindow-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1681491118,
-        "narHash": "sha256-AwGNTrfa/oro22yBKkzJNlVavnboFdEpMM4qXOZhQ/4=",
+        "lastModified": 1682522119,
+        "narHash": "sha256-B0ZpVjdjXvArl6pUHICM72lBgmmN+BGrDYOgPqlAJUc=",
         "owner": "gorbit99",
         "repo": "codewindow.nvim",
-        "rev": "985046dfb2b35cd3b214b70a9a056ec89b0c5498",
+        "rev": "4451bce3a11acbe4295f5f43f8a31cfcb873a1c5",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
     "colorizer": {
       "flake": false,
       "locked": {
-        "lastModified": 1681750992,
-        "narHash": "sha256-TXKYJY4+ozr54jBa3rUuJuO1Y4nrHfsX0yrQs3wtMDQ=",
+        "lastModified": 1682937058,
+        "narHash": "sha256-BuGqd+b01aksGqLEKFkzmLFcdy4NO8pK/zCdaYM8ce4=",
         "owner": "uga-rosa",
         "repo": "ccc.nvim",
-        "rev": "a4a79302c2389f6852b1a655b47ea2edecccb081",
+        "rev": "0b98a08235e898f1a6e29093ac35478281a5078a",
         "type": "github"
       },
       "original": {
@@ -211,11 +211,11 @@
     "comment-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1681289112,
-        "narHash": "sha256-Zrxf50YlAaCERZFAbg4Ece+wI4buHl+K2IIw0qpASGA=",
+        "lastModified": 1683091103,
+        "narHash": "sha256-CMHkf+0T5FRMcqD6zGFo5IHrgT0xbZXe1UgOs+b1148=",
         "owner": "numToStr",
         "repo": "Comment.nvim",
-        "rev": "a89339ffbee677ab0521a483b6dac7e2e67c907e",
+        "rev": "e1fe53117aab24c378d5e6deaad786789c360123",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
     "copilot-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1681223911,
-        "narHash": "sha256-ttF9LW6PNKk/BBWET2BUqtq5f7OIZ7ohtQevAaP8srg=",
+        "lastModified": 1682747814,
+        "narHash": "sha256-CcdYYXSZnsA0KRTTNz1Q820dWSniN1H9iC3XyVpBCBA=",
         "owner": "zbirenbaum",
         "repo": "copilot.lua",
-        "rev": "a4a37dda9e48986e5d2a90d6a3cbc88fca241dbb",
+        "rev": "19c1c945553918d683a001e697faad933c41bb5d",
         "type": "github"
       },
       "original": {
@@ -243,11 +243,11 @@
     "crates-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1680387248,
-        "narHash": "sha256-Qt3x9I1RzFtknxy3qJaaZczSLvO10OQ6N1+RLhfuQ7I=",
+        "lastModified": 1683202603,
+        "narHash": "sha256-ul2fkHEfyLD/BOcvabMs1d6gM/1AyuQ8HlDLzSpx6OM=",
         "owner": "Saecki",
         "repo": "crates.nvim",
-        "rev": "1d4bb1e7a0fe8bae3f97061be5fbf6f9081a27e2",
+        "rev": "bb5ce73e9c41865e22329da118d91a565089e4d7",
         "type": "github"
       },
       "original": {
@@ -259,11 +259,11 @@
     "dashboard-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1681720765,
-        "narHash": "sha256-7RBjr3svkEYgmWeB3GwksoHS8Ps74YcqNYBfynUaXvM=",
+        "lastModified": 1683093735,
+        "narHash": "sha256-ZmP+AEwmWwnWgGoImXSkYp55Q2qQDzaC8O+ZmPR/bjs=",
         "owner": "glepnir",
         "repo": "dashboard-nvim",
-        "rev": "275e7c8579858c3ee06f32c16bdc687153ca7204",
+        "rev": "0af0ad181db271ef8d5a332f4cfcec9118340497",
         "type": "github"
       },
       "original": {
@@ -275,11 +275,11 @@
     "diffview-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1681231146,
-        "narHash": "sha256-rtJafQUurQP4sVoKZlC8nrl8OwfY7jKI/RyfNfY8Fik=",
+        "lastModified": 1682690200,
+        "narHash": "sha256-6RDVUVLFqSws7ouZ1bRWsGfBpyVOHO+9yEiMFVWUbC0=",
         "owner": "sindrets",
         "repo": "diffview.nvim",
-        "rev": "63720aa5a70ce4aa386be407d0e612cd9e63861a",
+        "rev": "8c1702470fd5186cb401b21f9bf8bdfad6d5cc87",
         "type": "github"
       },
       "original": {
@@ -308,11 +308,11 @@
     "dracula": {
       "flake": false,
       "locked": {
-        "lastModified": 1681364507,
-        "narHash": "sha256-RJT+fYJyTD+8krT/+M6644ycJ2rzenPBd9NQpGjAMGw=",
+        "lastModified": 1681992807,
+        "narHash": "sha256-NJ8BwhxL9v99MzM97P9/8UzhhMZS0kBvCMDq5NXP5ps=",
         "owner": "Mofiqul",
         "repo": "dracula.nvim",
-        "rev": "b5bd9c7e4c6c8f4712610bda92140c735fe90521",
+        "rev": "26d04c8ced02f02207e7aec1d5730c3a9ebadeeb",
         "type": "github"
       },
       "original": {
@@ -324,11 +324,11 @@
     "dressing-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1681303966,
-        "narHash": "sha256-8HSxDkHxrjNCT9OpI3Fxt4bwLM49UmdH2TtQWGzyzXo=",
+        "lastModified": 1683132595,
+        "narHash": "sha256-SE+KhBtGNp0gi6PNp5vCtbCLxK3UxQURUEWXvTyD7hc=",
         "owner": "stevearc",
         "repo": "dressing.nvim",
-        "rev": "0e3e1eba147fee6e638ac1ac28f0495bcde17319",
+        "rev": "540d6e7115fb32b5035ddaf0c1a26cbffb855dac",
         "type": "github"
       },
       "original": {
@@ -340,11 +340,11 @@
     "elixir-ls": {
       "flake": false,
       "locked": {
-        "lastModified": 1681745218,
-        "narHash": "sha256-b3mlcwV4eHR90e9BExhb51T5A7dQVMwXRRIGqKEFBzg=",
+        "lastModified": 1682064134,
+        "narHash": "sha256-F0c1vyeie8sf11SHfDKb8v1DZ5No3Rr3PPj3jMg0veg=",
         "owner": "elixir-lsp",
         "repo": "elixir-ls",
-        "rev": "bf9db5a29efb2331da6cfbc526ecbfc10d372abc",
+        "rev": "46dfc9cbb7d147f05eaf224197ef60f0b5b802be",
         "type": "github"
       },
       "original": {
@@ -356,11 +356,11 @@
     "elixir-tools": {
       "flake": false,
       "locked": {
-        "lastModified": 1681746276,
-        "narHash": "sha256-1ZCFU79xZW52Dtx864hxeANzn+L15fnfso2NBnzBvOU=",
+        "lastModified": 1683059497,
+        "narHash": "sha256-Y6N1nKODqwgL3825B0xFAtGtQDt7kShlseCZkxxCU/s=",
         "owner": "elixir-tools",
         "repo": "elixir-tools.nvim",
-        "rev": "7b42d9131521a11cfd504b450bb445757cf2ef63",
+        "rev": "86bda3872792fe3bfe07b936eeb3f26d5a616b50",
         "type": "github"
       },
       "original": {
@@ -406,11 +406,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1680392223,
-        "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
+        "lastModified": 1682984683,
+        "narHash": "sha256-fSMthG+tp60AHhNmaHc4StT3ltfHkQsJtN8GhfLWmtI=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
+        "rev": "86684881e184f41aa322e653880e497b66429f3e",
         "type": "github"
       },
       "original": {
@@ -455,11 +455,11 @@
     "flutter-tools": {
       "flake": false,
       "locked": {
-        "lastModified": 1681573333,
-        "narHash": "sha256-WKvHoSv8OaVGtrGMq8YUGnnvuuEXLNigT4NQwtx5HC4=",
+        "lastModified": 1683183591,
+        "narHash": "sha256-91JSnbh3/z4/iSDxfcyR5i5J3wDFsWoYjEyZmoO+w+k=",
         "owner": "akinsho",
         "repo": "flutter-tools.nvim",
-        "rev": "dedb571b15e6639792fea528b8c3040558f4ef0d",
+        "rev": "627fadf8200bacb0b55db29d9bbab305a1b43c65",
         "type": "github"
       },
       "original": {
@@ -471,11 +471,11 @@
     "gesture-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1680956101,
-        "narHash": "sha256-oeP8PRBZ8c1iyT1pL95NYgYaWB/6sB0TVxNoS5Jiug4=",
+        "lastModified": 1682809703,
+        "narHash": "sha256-ltYTHYgRjQwltnaXZgnZ96OehyMdF9aKgn/NH6pWCuM=",
         "owner": "notomo",
         "repo": "gesture.nvim",
-        "rev": "c302def60859f62deda34b06f00848b49d05b3ac",
+        "rev": "b78082f85f9e255f97cde9c8e9ac2025f708eee3",
         "type": "github"
       },
       "original": {
@@ -487,11 +487,11 @@
     "gitsigns-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1680593514,
-        "narHash": "sha256-nUVVEO06giiJURxT7qNHbX9C1ljZtchUeOdEoCQBk3E=",
+        "lastModified": 1682681315,
+        "narHash": "sha256-4ZDiDF3qTWKViFgiCqhvqKRtubO2P/pcu9Unxf+AfLw=",
         "owner": "lewis6991",
         "repo": "gitsigns.nvim",
-        "rev": "372d5cb485f2062ac74abc5b33054abac21d8b58",
+        "rev": "e5edefd9976039f5352e0c900f35206770b33a2d",
         "type": "github"
       },
       "original": {
@@ -535,11 +535,11 @@
     "icon-picker-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1673847230,
-        "narHash": "sha256-vPFfpTrCO8AhBRm+1wEu3Uw28L39svfkAT9qgnJ9Zyg=",
+        "lastModified": 1683205244,
+        "narHash": "sha256-/oi2Kj7GDXzN3ccPoxyxXtQTYSxtZndgELZa2XgZ3U8=",
         "owner": "ziontee113",
         "repo": "icon-picker.nvim",
-        "rev": "66d37ceae84099ca76235de44466829eb37118c2",
+        "rev": "e6dca182518eeb7a51470c13605a5bce08a816e4",
         "type": "github"
       },
       "original": {
@@ -583,11 +583,11 @@
     "leap-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1681071698,
-        "narHash": "sha256-CDNaQCbEQZQGklIQ8zvX+kL8AgFz4/otuRf9U5qZYP0=",
+        "lastModified": 1682691590,
+        "narHash": "sha256-8/fxeAE53whU7k0Ak05nJ+7l2UUgi4rXEFS8rkffU/U=",
         "owner": "ggandor",
         "repo": "leap.nvim",
-        "rev": "98a72ad93c629c49bd7127d342960cc1b159b620",
+        "rev": "6f2912755c9c4ae790abd829f0cf1b07c037b2a4",
         "type": "github"
       },
       "original": {
@@ -599,11 +599,11 @@
     "lsp-signature": {
       "flake": false,
       "locked": {
-        "lastModified": 1681633928,
-        "narHash": "sha256-z/jGs2syMW8dp12bUwYkd+k/AFxyid/lJHGww10XukU=",
+        "lastModified": 1683088144,
+        "narHash": "sha256-5CMJsG7jyPc7cJ+SRrSxOBFjA1zgjkQNSZnBQ9KS7jg=",
         "owner": "ray-x",
         "repo": "lsp_signature.nvim",
-        "rev": "72b0d4ece23338fe2d03fc7b6fd8c8bace6bb441",
+        "rev": "7a26ebaa7e36aa2aefa6c1994b2b866c96de32e6",
         "type": "github"
       },
       "original": {
@@ -615,11 +615,11 @@
     "lspkind": {
       "flake": false,
       "locked": {
-        "lastModified": 1663824370,
-        "narHash": "sha256-WwUQ+O2rIfD4yl0GFx70GsZc9nnhS7b2KWfNdaXCLmM=",
+        "lastModified": 1683211699,
+        "narHash": "sha256-HkUsaWYaI8rQqXwPMTEgri0Bl4TdAI4A7wj0Gqm3uK4=",
         "owner": "onsails",
         "repo": "lspkind-nvim",
-        "rev": "c68b3a003483cf382428a43035079f78474cd11e",
+        "rev": "cec39a0651679931ce2e503123c633b0aeae5fc6",
         "type": "github"
       },
       "original": {
@@ -647,11 +647,11 @@
     "lualine": {
       "flake": false,
       "locked": {
-        "lastModified": 1681033736,
-        "narHash": "sha256-u79S3wFJ72vcLp7F0f/s21Kvl/pMRI8CkB+8usPQob4=",
+        "lastModified": 1683213422,
+        "narHash": "sha256-ltHE8UIquGo07BSlFGM1l3wmTNN43i8kx6QY7Fj2CNo=",
         "owner": "hoob3rt",
         "repo": "lualine.nvim",
-        "rev": "84ffb80e452d95e2c46fa29a98ea11a240f7843e",
+        "rev": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9",
         "type": "github"
       },
       "original": {
@@ -679,11 +679,11 @@
     "minimap-vim": {
       "flake": false,
       "locked": {
-        "lastModified": 1681226039,
-        "narHash": "sha256-vOFbYUd+manGcJqgk7QuArsDuAukmIS77YCZFtsY98g=",
+        "lastModified": 1681845630,
+        "narHash": "sha256-f65I2gWztY+JEOSenRqMK8LsYO7+ofNPhz+R8Y66C90=",
         "owner": "wfxr",
         "repo": "minimap.vim",
-        "rev": "868a809302f9f5d4c408ef8aef7eb9bd5893f801",
+        "rev": "726746ed02eab2eef137a7ecceda7214fbeeec41",
         "type": "github"
       },
       "original": {
@@ -695,11 +695,11 @@
     "modes-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1673274565,
-        "narHash": "sha256-EvJh6BLRkf+GJaKsw6pz0DR59Tha0bIkYnvqpgHgHHw=",
+        "lastModified": 1682778003,
+        "narHash": "sha256-qrGgraBdAvIc6AXqMMWESlOV29lM5zC1du1r5L2kpQQ=",
         "owner": "mvllow",
         "repo": "modes.nvim",
-        "rev": "d65260b8b41fdaf6ceba8d569588ecd145e6a772",
+        "rev": "4d97a51ebbdb649b85f6d79da0009fddd7081a6b",
         "type": "github"
       },
       "original": {
@@ -740,11 +740,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1681412802,
-        "narHash": "sha256-IcEala6vFQ7SFNOPCeXBh9Jbl8nL2QOtLmO7RbDsBbo=",
+        "lastModified": 1682962768,
+        "narHash": "sha256-T6iBqa9+KsVbcjNivRWXi2kXP90S+NJLp2qVah7I1w8=",
         "owner": "oxalica",
         "repo": "nil",
-        "rev": "1d5bc81023c21b22cfbea06a8b4b82963c01b941",
+        "rev": "e74b767a43d86a1997cf4df3c5d15ff3e769d6f2",
         "type": "github"
       },
       "original": {
@@ -755,11 +755,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1681753173,
-        "narHash": "sha256-MrGmzZWLUqh2VstoikKLFFIELXm/lsf/G9U9zR96VD4=",
+        "lastModified": 1683082554,
+        "narHash": "sha256-emO6mChgdBi4RwchtCCtAkvFf/OSkMyOQMqk6EZEPJA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0a4206a51b386e5cda731e8ac78d76ad924c7125",
+        "rev": "0d373d5af960504dd60c3d06c65e553b36ef29d8",
         "type": "github"
       },
       "original": {
@@ -772,11 +772,11 @@
     "nixpkgs-lib": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1680213900,
-        "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
+        "lastModified": 1682879489,
+        "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
+        "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
         "type": "github"
       },
       "original": {
@@ -854,11 +854,11 @@
     "noice-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1681713054,
-        "narHash": "sha256-do/L2UpxyuKlTBBicMJHp0du71MzbuVM+P1dOAURAuY=",
+        "lastModified": 1683210180,
+        "narHash": "sha256-Ktrkr2P7BGC9kfeZ0xDnHbbbWrvCIN6M/ynXvil/7hU=",
         "owner": "folke",
         "repo": "noice.nvim",
-        "rev": "5c63a32fde4e87631ddd768f5d7674ec5988c1a2",
+        "rev": "6a7649413ef61123c333f422ee95840c04ece161",
         "type": "github"
       },
       "original": {
@@ -870,11 +870,11 @@
     "nui-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1681244240,
-        "narHash": "sha256-IlbOt9fCBklx3i8OY2DZwa/8OV+yGOLBm8HUeVLseIw=",
+        "lastModified": 1682892447,
+        "narHash": "sha256-wVGshQpYx7lz6gl/MDSGkSQJriUbZ0J0OnTFALrXsxk=",
         "owner": "MunifTanjim",
         "repo": "nui.nvim",
-        "rev": "ecd9def93891b9260b15b5fcef542eaabf4145c9",
+        "rev": "698e75814cd7c56b0dd8af4936bcef2d13807f3c",
         "type": "github"
       },
       "original": {
@@ -886,11 +886,11 @@
     "null-ls": {
       "flake": false,
       "locked": {
-        "lastModified": 1681223720,
-        "narHash": "sha256-L3inC3YpiNdFdArqHdqR0n7g//moTvLYybQafFgkbDE=",
+        "lastModified": 1682519403,
+        "narHash": "sha256-cwpfhYcoD+biMgyAXkf9gE89yRSQnNyAowIeuyUKqmI=",
         "owner": "jose-elias-alvarez",
         "repo": "null-ls.nvim",
-        "rev": "f8ffcd7cb8fb3325c711d459152ef132b5b65aed",
+        "rev": "33b853a3933eed3137cd055aac4e539e69832ad0",
         "type": "github"
       },
       "original": {
@@ -902,11 +902,11 @@
     "nvim-autopairs": {
       "flake": false,
       "locked": {
-        "lastModified": 1681692125,
-        "narHash": "sha256-QBzyI0Jfo4nj6Nqkm8qzICgyDhg7CiT+2gMTsuZ8rIQ=",
+        "lastModified": 1682892776,
+        "narHash": "sha256-EoAVYrBHUY0YAzgBfTyf7Dr8PS5+SULL2Az6dIa/E0g=",
         "owner": "windwp",
         "repo": "nvim-autopairs",
-        "rev": "58985de5eeab159462bc262de5cc1b9c9b375595",
+        "rev": "7747bbae60074acf0b9e3a4c13950be7a2dff444",
         "type": "github"
       },
       "original": {
@@ -1015,11 +1015,11 @@
     "nvim-lspconfig": {
       "flake": false,
       "locked": {
-        "lastModified": 1681647398,
-        "narHash": "sha256-jrVzwC9nO2gLmIKQ9gTRW/fsXc4ad7/rR917Krmv874=",
+        "lastModified": 1683093864,
+        "narHash": "sha256-OkS6DAXkY40xkR+v1FZEL8ujMWM421ZQdB9My0vG3+Y=",
         "owner": "neovim",
         "repo": "nvim-lspconfig",
-        "rev": "eddaef928c1e1dd79a96f5db45f2fd7f2efe7ea0",
+        "rev": "3bd4ca412982afa6f88bb7ef890660cee51c3e58",
         "type": "github"
       },
       "original": {
@@ -1031,11 +1031,11 @@
     "nvim-neoclip": {
       "flake": false,
       "locked": {
-        "lastModified": 1673910599,
-        "narHash": "sha256-Yi/6mODdS2Ote5/zumzcUzkhDbQ3m9jUvxT+jZ/+UqA=",
+        "lastModified": 1682401368,
+        "narHash": "sha256-mbXlqddHHkNFzdAt4pmEMFbQDIxpALaf7fRIW/dhYp8=",
         "owner": "AckslD",
         "repo": "nvim-neoclip.lua",
-        "rev": "5b9286a40ea2020352280caeb713515badb03d99",
+        "rev": "591f1b62343efe3e369e4831cd91e1875f3a08f4",
         "type": "github"
       },
       "original": {
@@ -1047,11 +1047,11 @@
     "nvim-notify": {
       "flake": false,
       "locked": {
-        "lastModified": 1679522899,
-        "narHash": "sha256-xkDr0tASezDmnxyLb7JvzCjE/HPv4ckqiJsBmaSR+Fs=",
+        "lastModified": 1681892404,
+        "narHash": "sha256-TEjd5Ikq0QFkmamlCRUgAMd6f53Cz/+2n6mfNEaxZQs=",
         "owner": "rcarriga",
         "repo": "nvim-notify",
-        "rev": "50d037041ada0895aeba4c0215cde6d11b7729c4",
+        "rev": "159c6cf1be25a933f35e97499314c9faab55c98f",
         "type": "github"
       },
       "original": {
@@ -1063,11 +1063,11 @@
     "nvim-session-manager": {
       "flake": false,
       "locked": {
-        "lastModified": 1680110654,
-        "narHash": "sha256-w0tPefWblZJpLC560saBz9eRuSvbAkoSnq36Zdyjnm8=",
+        "lastModified": 1682579392,
+        "narHash": "sha256-+7kxlLQ2FKAn+mKl8NLBDiifXNaSibiZBq3fj8EPdwQ=",
         "owner": "Shatur",
         "repo": "neovim-session-manager",
-        "rev": "d1883f30921193f3cff4537e27514e454e0331e9",
+        "rev": "83ea944252d08b0950a407708f36ffdd3fe18e80",
         "type": "github"
       },
       "original": {
@@ -1079,11 +1079,11 @@
     "nvim-tree-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1681624690,
-        "narHash": "sha256-kLvRB1w4wHGOOWj4fQ6pyhvKJ4+mqOkhYe04uicfHmA=",
+        "lastModified": 1683112000,
+        "narHash": "sha256-8kJUyYaXZ42uBkwI+pfeikUNfF1sBBjB2AZeUtrpKSY=",
         "owner": "nvim-tree",
         "repo": "nvim-tree.lua",
-        "rev": "8f392fa763b7ee80a48c714b630acaf6d1fe1854",
+        "rev": "53295de04d265fba695ec5a21912bdf36647dbad",
         "type": "github"
       },
       "original": {
@@ -1095,11 +1095,11 @@
     "nvim-treesitter-context": {
       "flake": false,
       "locked": {
-        "lastModified": 1681297663,
-        "narHash": "sha256-INYJBQDHgq+2V469JLIq54LolGb6T7nlgmmVDQcxwkk=",
+        "lastModified": 1683188173,
+        "narHash": "sha256-lT9VdxEz0B33IvI+GAbDPFm3gLp38sDd5fnaW6ZpK8k=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter-context",
-        "rev": "0d730df898f3dc27fd88f03cfa6d26d2405554b4",
+        "rev": "0226dd639712141235d5c9eefde47365d15d0535",
         "type": "github"
       },
       "original": {
@@ -1111,11 +1111,11 @@
     "nvim-ts-autotag": {
       "flake": false,
       "locked": {
-        "lastModified": 1681387572,
-        "narHash": "sha256-qi1PF75HeaAkHAvsinyXtfvggE12agUNnx7mrSsBiDo=",
+        "lastModified": 1682633949,
+        "narHash": "sha256-zv3m7IvDbWOOESZL3+8DcNt9vNT9fSfz2X7EOD6rqHQ=",
         "owner": "windwp",
         "repo": "nvim-ts-autotag",
-        "rev": "cac97f3b47bcb927db6d1d784c0c323056506ef3",
+        "rev": "40615e96075c743ef47aaf9de966dc348bec6459",
         "type": "github"
       },
       "original": {
@@ -1127,11 +1127,11 @@
     "nvim-web-devicons": {
       "flake": false,
       "locked": {
-        "lastModified": 1681235235,
-        "narHash": "sha256-lAjk2Kpyxabe21ut7xCvhE2+we8hsEZWpcJrYLbhWqM=",
+        "lastModified": 1682929721,
+        "narHash": "sha256-dYiG5uBSBU0b5MMZp6xKd8gB79nNdHGuq2UfcWnv2Es=",
         "owner": "kyazdani42",
         "repo": "nvim-web-devicons",
-        "rev": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e",
+        "rev": "b34362b20a4942b3245f958e73ebe1b09b020ad1",
         "type": "github"
       },
       "original": {
@@ -1143,11 +1143,11 @@
     "obsidian-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1681757981,
-        "narHash": "sha256-7L/C/BKDCaYFJspEnOesrsCfOFe4XxxEiTlVh4ntT+Q=",
+        "lastModified": 1682282743,
+        "narHash": "sha256-aqj8zxZp7UylWl9VlJH408fa3Ui2nZnUKhHOwaazizo=",
         "owner": "epwalsh",
         "repo": "obsidian.nvim",
-        "rev": "9dd19303aea80ff10b53de6879d973256125e395",
+        "rev": "0418505ff7d1e06460450a02b9209d03f4c2a50d",
         "type": "github"
       },
       "original": {
@@ -1159,11 +1159,11 @@
     "onedark": {
       "flake": false,
       "locked": {
-        "lastModified": 1679504944,
-        "narHash": "sha256-vwrffcwutr1HKKcNz2hGEO46EIJS1Fug17VCuWRNu/o=",
+        "lastModified": 1682760728,
+        "narHash": "sha256-v7PtrlJzM7NZTiEEQyVBjQ/YMYNk60KrQcHXi5qVECA=",
         "owner": "navarasu",
         "repo": "onedark.nvim",
-        "rev": "dd640f6cfb0e370cfd3db389f04b172508848bd3",
+        "rev": "82cad746101300aa2fdea5f4d121c51c23bab8bd",
         "type": "github"
       },
       "original": {
@@ -1175,11 +1175,11 @@
     "orgmode-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1681591080,
-        "narHash": "sha256-1JzE296ARUhsy55qjA3n5XAQLnySf+FM+mwJWa07+CM=",
+        "lastModified": 1683178502,
+        "narHash": "sha256-W2ucgUBJ8yAAX+ufai5NeJQGGCr54amp2PkWbtzcka8=",
         "owner": "nvim-orgmode",
         "repo": "orgmode",
-        "rev": "d8020e95f531369962d74d037f603d038d70de1e",
+        "rev": "5ac150c6e24a59a6b09718f66dee082a804b5667",
         "type": "github"
       },
       "original": {
@@ -1375,11 +1375,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1680488274,
-        "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=",
+        "lastModified": 1682907601,
+        "narHash": "sha256-FfUAYvRJ+6s9WWjXNPdRzuuvAeu2VHIXIbUkPJr4t14=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8",
+        "rev": "5eaff055dd57128c53ae373dc96af944f5849daa",
         "type": "github"
       },
       "original": {
@@ -1407,11 +1407,11 @@
     "scrollbar-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1679265551,
-        "narHash": "sha256-NdrWWiumuDM2RJKmVIGjnknUmcqIc/jOzfYKgPCxO9k=",
+        "lastModified": 1682601226,
+        "narHash": "sha256-M1tzayFsAPZSgS/fEP5/PhNZLzEbu8DwHRJSrDx6X6w=",
         "owner": "petertriho",
         "repo": "nvim-scrollbar",
-        "rev": "f85b29805cf917f9b1d5ff0c9a52c5b1bdca5943",
+        "rev": "f3a5469e9881360e70d34b25333c910ee4a505f3",
         "type": "github"
       },
       "original": {
@@ -1503,11 +1503,11 @@
     "telescope": {
       "flake": false,
       "locked": {
-        "lastModified": 1681122231,
-        "narHash": "sha256-UMidzUf2nhG577Minzm3QYu0ZNPoK/rXEyUdvZ/5nFw=",
+        "lastModified": 1682482973,
+        "narHash": "sha256-K3jhTlB9Win94oLMXTB4WGl5QY9mE8YrFtLudHlhKj0=",
         "owner": "nvim-telescope",
         "repo": "telescope.nvim",
-        "rev": "6258d50b09f9ae087317e392efe7c05a7323492d",
+        "rev": "713d26b98583b160b50fb827adb751f768238ed3",
         "type": "github"
       },
       "original": {
@@ -1576,11 +1576,11 @@
     "toggleterm-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1681296186,
-        "narHash": "sha256-y8CvzzW4ezqdnSzeon39KVN1JEU+9SSJ78n51A5XHVQ=",
+        "lastModified": 1682361318,
+        "narHash": "sha256-G5W1XN5mXnrx3TR8/0H8nHmO6o38z9i+ZkrTz22HlxI=",
         "owner": "akinsho",
         "repo": "toggleterm.nvim",
-        "rev": "1c5996ee3c30b54751093fe68d40676859e7778f",
+        "rev": "68fdf851c2b7901a7065ff129b77d3483419ddce",
         "type": "github"
       },
       "original": {
@@ -1592,11 +1592,11 @@
     "tokyonight": {
       "flake": false,
       "locked": {
-        "lastModified": 1681713069,
-        "narHash": "sha256-2+lDMcKZZqt8gf4bzi/I5FitO+DSlxrmtTgrO+tXkvU=",
+        "lastModified": 1683093157,
+        "narHash": "sha256-n9c66+KLBsJ/TuujFpdVEP0pPG2JscEoEq7JP7l3JSA=",
         "owner": "folke",
         "repo": "tokyonight.nvim",
-        "rev": "ef8f5917f1a3972e6dd083c1ea74dafcb54f9917",
+        "rev": "f2ed28707a0ad49047d9b733395ea205ea09f517",
         "type": "github"
       },
       "original": {
@@ -1608,11 +1608,11 @@
     "trouble": {
       "flake": false,
       "locked": {
-        "lastModified": 1681764706,
-        "narHash": "sha256-znQA0i8gVzThGBBgkvBISFgSE47C5VZcMZ45dnJmewM=",
+        "lastModified": 1681796330,
+        "narHash": "sha256-kW5vRqKRUG3I5/DgWnMpXeQHbaFBcYDlzEpg2bvKAUA=",
         "owner": "folke",
         "repo": "trouble.nvim",
-        "rev": "c25fab9a76e5559b0da4ee012c734f16e72bdf85",
+        "rev": "d56bfc0c501ced4002a57cb60433362fb2ce9c4d",
         "type": "github"
       },
       "original": {
@@ -1752,11 +1752,11 @@
     "which-key": {
       "flake": false,
       "locked": {
-        "lastModified": 1681746771,
-        "narHash": "sha256-YRkwLCcJJE9QXOPhCdWIWfMBEgse0Me66JLGzm8Jz9c=",
+        "lastModified": 1683210030,
+        "narHash": "sha256-XoEpCdXSOeyPSQt8jtpp7gZk38tnUCHfiVuCJlw+z6Q=",
         "owner": "folke",
         "repo": "which-key.nvim",
-        "rev": "f82ca7fbaf4718303dbaf83dc28303fee16cf4d2",
+        "rev": "af8f26bfbb61b5f722c9fbc72b296dc9db0bcfdc",
         "type": "github"
       },
       "original": {
@@ -1772,11 +1772,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1681690952,
-        "narHash": "sha256-x8KEUCSorKtsWWlJWXi6atcWkcREAV1o081knXZCQfc=",
+        "lastModified": 1683202073,
+        "narHash": "sha256-LRiD6oq/FI+TbJQAKNZlxX1ye7Sb5EuFzIRIDFKP6t8=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "0cd7fee7dae8eaaf77ed0d420f69be0a481acc9d",
+        "rev": "16230eafd62dc8b152e40a0c2776e37fe57c72e0",
         "type": "github"
       },
       "original": {

From bb2e56ad7c78b6d28b0477d5fdea7cd164266d5e Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Tue, 16 May 2023 13:25:28 +0300
Subject: [PATCH 082/162] feat: bump flake inputs

---
 flake.lock | 198 ++++++++++++++++++++++++++---------------------------
 1 file changed, 99 insertions(+), 99 deletions(-)

diff --git a/flake.lock b/flake.lock
index a2166c0..c5a8489 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "alpha-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1682960992,
-        "narHash": "sha256-l/6J/8DhuHdh7IQfPMWsjjzbnH3leUlwTpW2RX4nL2c=",
+        "lastModified": 1683670281,
+        "narHash": "sha256-Jy/p/5XFQY5fvCnalfb58tWvaSmW7sWeA5DUGMKHMr8=",
         "owner": "goolord",
         "repo": "alpha-nvim",
-        "rev": "447b821d22b0c1e80494638f84cb00ff696f4ef6",
+        "rev": "1838ae926e8d49fe5330d1498ee8289ae2c340bc",
         "type": "github"
       },
       "original": {
@@ -35,11 +35,11 @@
     "catppuccin": {
       "flake": false,
       "locked": {
-        "lastModified": 1683097744,
-        "narHash": "sha256-yFpGcovn7ZWFuK4QT3QZppnxleUO9D5wNV+TIsEXnAg=",
+        "lastModified": 1683711270,
+        "narHash": "sha256-mMeN83dsE1AgfcoLn03V1L4JyVF1RKIMURvHOht1ecE=",
         "owner": "catppuccin",
         "repo": "nvim",
-        "rev": "a7e279d6e019f35dd042670f00748b602fff5568",
+        "rev": "57b421ee5f7380f816791fa451e86f213b625ece",
         "type": "github"
       },
       "original": {
@@ -179,11 +179,11 @@
     "codewindow-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1682522119,
-        "narHash": "sha256-B0ZpVjdjXvArl6pUHICM72lBgmmN+BGrDYOgPqlAJUc=",
+        "lastModified": 1684029376,
+        "narHash": "sha256-aPuGv5w1+++fJBODh+TCfHhgn7f3H0/B+VzqZaN+dSE=",
         "owner": "gorbit99",
         "repo": "codewindow.nvim",
-        "rev": "4451bce3a11acbe4295f5f43f8a31cfcb873a1c5",
+        "rev": "1a69ccebbc8b58b900684eddd9df38cfc034e300",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
     "colorizer": {
       "flake": false,
       "locked": {
-        "lastModified": 1682937058,
-        "narHash": "sha256-BuGqd+b01aksGqLEKFkzmLFcdy4NO8pK/zCdaYM8ce4=",
+        "lastModified": 1683867388,
+        "narHash": "sha256-xuNNixmglet1511uxWL+kKWjrCIU5wZOags1WleJ7ZE=",
         "owner": "uga-rosa",
         "repo": "ccc.nvim",
-        "rev": "0b98a08235e898f1a6e29093ac35478281a5078a",
+        "rev": "c1e253943f7619b85f2a5480a63fff8d22ddb54f",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
     "copilot-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1682747814,
-        "narHash": "sha256-CcdYYXSZnsA0KRTTNz1Q820dWSniN1H9iC3XyVpBCBA=",
+        "lastModified": 1683572689,
+        "narHash": "sha256-+dqwwBHDRh1vmbgx8o1RVMEAN7Hlr5I5L71wdagDo/o=",
         "owner": "zbirenbaum",
         "repo": "copilot.lua",
-        "rev": "19c1c945553918d683a001e697faad933c41bb5d",
+        "rev": "653bbdc44cd569a5fd0617e5a9d3df2b1359e230",
         "type": "github"
       },
       "original": {
@@ -243,11 +243,11 @@
     "crates-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1683202603,
-        "narHash": "sha256-ul2fkHEfyLD/BOcvabMs1d6gM/1AyuQ8HlDLzSpx6OM=",
+        "lastModified": 1683908215,
+        "narHash": "sha256-2H0UjKYMK996pDbsZ+H+sVo0zBXnOEKbCLbRV8Eqm/U=",
         "owner": "Saecki",
         "repo": "crates.nvim",
-        "rev": "bb5ce73e9c41865e22329da118d91a565089e4d7",
+        "rev": "dca1949b0405c6ee5173d0627a523a10a63eca3c",
         "type": "github"
       },
       "original": {
@@ -275,11 +275,11 @@
     "diffview-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1682690200,
-        "narHash": "sha256-6RDVUVLFqSws7ouZ1bRWsGfBpyVOHO+9yEiMFVWUbC0=",
+        "lastModified": 1684144116,
+        "narHash": "sha256-U5dyf6THkPsOMcCrKuONg0N1Rz7hrOAaBzr5vqbAoHU=",
         "owner": "sindrets",
         "repo": "diffview.nvim",
-        "rev": "8c1702470fd5186cb401b21f9bf8bdfad6d5cc87",
+        "rev": "1fc42e67dfb2da7946edbc9a30cb98ed371b8dde",
         "type": "github"
       },
       "original": {
@@ -324,11 +324,11 @@
     "dressing-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1683132595,
-        "narHash": "sha256-SE+KhBtGNp0gi6PNp5vCtbCLxK3UxQURUEWXvTyD7hc=",
+        "lastModified": 1683895487,
+        "narHash": "sha256-0mWNJVDg47QohtesJ6tJQcbxuh2QL2SiSb01giIrrmU=",
         "owner": "stevearc",
         "repo": "dressing.nvim",
-        "rev": "540d6e7115fb32b5035ddaf0c1a26cbffb855dac",
+        "rev": "66e4990240f92e31b0d5e4df6deb6bb0160ae832",
         "type": "github"
       },
       "original": {
@@ -340,11 +340,11 @@
     "elixir-ls": {
       "flake": false,
       "locked": {
-        "lastModified": 1682064134,
-        "narHash": "sha256-F0c1vyeie8sf11SHfDKb8v1DZ5No3Rr3PPj3jMg0veg=",
+        "lastModified": 1683367788,
+        "narHash": "sha256-O977DZLWPyLafIaOTPZKI4MOtK9E9TDProf2xyk05aI=",
         "owner": "elixir-lsp",
         "repo": "elixir-ls",
-        "rev": "46dfc9cbb7d147f05eaf224197ef60f0b5b802be",
+        "rev": "15c0052a60d25f90b0200d8ed03c4ee93e2ea3af",
         "type": "github"
       },
       "original": {
@@ -356,11 +356,11 @@
     "elixir-tools": {
       "flake": false,
       "locked": {
-        "lastModified": 1683059497,
-        "narHash": "sha256-Y6N1nKODqwgL3825B0xFAtGtQDt7kShlseCZkxxCU/s=",
+        "lastModified": 1683997144,
+        "narHash": "sha256-Q2JTCcMFW3a2Uxn4gr+55Vg66VOi+LjseayvNVBRkFQ=",
         "owner": "elixir-tools",
         "repo": "elixir-tools.nvim",
-        "rev": "86bda3872792fe3bfe07b936eeb3f26d5a616b50",
+        "rev": "924e79bb7d2b57283e80385c5b773beab98e0b05",
         "type": "github"
       },
       "original": {
@@ -406,11 +406,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1682984683,
-        "narHash": "sha256-fSMthG+tp60AHhNmaHc4StT3ltfHkQsJtN8GhfLWmtI=",
+        "lastModified": 1683560683,
+        "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "86684881e184f41aa322e653880e497b66429f3e",
+        "rev": "006c75898cf814ef9497252b022e91c946ba8e17",
         "type": "github"
       },
       "original": {
@@ -455,11 +455,11 @@
     "flutter-tools": {
       "flake": false,
       "locked": {
-        "lastModified": 1683183591,
-        "narHash": "sha256-91JSnbh3/z4/iSDxfcyR5i5J3wDFsWoYjEyZmoO+w+k=",
+        "lastModified": 1684054309,
+        "narHash": "sha256-K6ny6GGa34H2wVKpQob1V7C7/KfcgJIpwn76sKZiNpI=",
         "owner": "akinsho",
         "repo": "flutter-tools.nvim",
-        "rev": "627fadf8200bacb0b55db29d9bbab305a1b43c65",
+        "rev": "2b72017f369c5d80bb56bcf4379b3eccd69e2371",
         "type": "github"
       },
       "original": {
@@ -487,11 +487,11 @@
     "gitsigns-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1682681315,
-        "narHash": "sha256-4ZDiDF3qTWKViFgiCqhvqKRtubO2P/pcu9Unxf+AfLw=",
+        "lastModified": 1683733000,
+        "narHash": "sha256-OEtr7SbCGoKcZmDcbw6nUoc8QDxgwexh6M4gGg4CRek=",
         "owner": "lewis6991",
         "repo": "gitsigns.nvim",
-        "rev": "e5edefd9976039f5352e0c900f35206770b33a2d",
+        "rev": "814158f6c4b1724c039fcefe79b0be72c9131c2d",
         "type": "github"
       },
       "original": {
@@ -503,11 +503,11 @@
     "glow-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1679769779,
-        "narHash": "sha256-kPM5c7iQ19cxVt5t/nk+svTsk814PBPsnYWAd2yhlas=",
+        "lastModified": 1683307046,
+        "narHash": "sha256-xH/PDx7u+fTX2a4hbbp4EQrmS9y/BHYHMXVbG07rh44=",
         "owner": "ellisonleao",
         "repo": "glow.nvim",
-        "rev": "a3f24fdaa71d2c25a2b88026032b34f5b6a6e215",
+        "rev": "bbd0473d72a45094495ee5600b5577823543eefe",
         "type": "github"
       },
       "original": {
@@ -615,11 +615,11 @@
     "lspkind": {
       "flake": false,
       "locked": {
-        "lastModified": 1683211699,
-        "narHash": "sha256-HkUsaWYaI8rQqXwPMTEgri0Bl4TdAI4A7wj0Gqm3uK4=",
+        "lastModified": 1683275543,
+        "narHash": "sha256-S+qZm51hw/cRujIfHV/1x1fYyCKI4XQ0utSL8uy4l6I=",
         "owner": "onsails",
         "repo": "lspkind-nvim",
-        "rev": "cec39a0651679931ce2e503123c633b0aeae5fc6",
+        "rev": "57610d5ab560c073c465d6faf0c19f200cb67e6e",
         "type": "github"
       },
       "original": {
@@ -740,11 +740,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1682962768,
-        "narHash": "sha256-T6iBqa9+KsVbcjNivRWXi2kXP90S+NJLp2qVah7I1w8=",
+        "lastModified": 1683653883,
+        "narHash": "sha256-Xg3Cux5wQDatXRvQWsVD0YPfmxfijjG8+gxYqgoT6JE=",
         "owner": "oxalica",
         "repo": "nil",
-        "rev": "e74b767a43d86a1997cf4df3c5d15ff3e769d6f2",
+        "rev": "18de045d7788df2343aec58df7b85c10d1f5d5dd",
         "type": "github"
       },
       "original": {
@@ -755,11 +755,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1683082554,
-        "narHash": "sha256-emO6mChgdBi4RwchtCCtAkvFf/OSkMyOQMqk6EZEPJA=",
+        "lastModified": 1684212024,
+        "narHash": "sha256-/3ZvkPuIXdyZqPR53qC7aaV5wiwMOY+ddbESOykZ9Vo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0d373d5af960504dd60c3d06c65e553b36ef29d8",
+        "rev": "d4825e5e4ac1de7d5bb99381534fd0af3875a26d",
         "type": "github"
       },
       "original": {
@@ -854,11 +854,11 @@
     "noice-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1683210180,
-        "narHash": "sha256-Ktrkr2P7BGC9kfeZ0xDnHbbbWrvCIN6M/ynXvil/7hU=",
+        "lastModified": 1683722239,
+        "narHash": "sha256-3A2UyXsvc+1XvhdeSVT01G9fCtcp8cueYjzLxhC0wAc=",
         "owner": "folke",
         "repo": "noice.nvim",
-        "rev": "6a7649413ef61123c333f422ee95840c04ece161",
+        "rev": "c2a745a26ae562f1faecbf6177ac53377d2658d5",
         "type": "github"
       },
       "original": {
@@ -886,11 +886,11 @@
     "null-ls": {
       "flake": false,
       "locked": {
-        "lastModified": 1682519403,
-        "narHash": "sha256-cwpfhYcoD+biMgyAXkf9gE89yRSQnNyAowIeuyUKqmI=",
+        "lastModified": 1683736086,
+        "narHash": "sha256-LThRysXgyM/MzLBQakpzPBVyS1r9AL/w1dOyy4qo/3k=",
         "owner": "jose-elias-alvarez",
         "repo": "null-ls.nvim",
-        "rev": "33b853a3933eed3137cd055aac4e539e69832ad0",
+        "rev": "08bb00c7c2cd58c72e02cf54e4b9cbfe14b03e09",
         "type": "github"
       },
       "original": {
@@ -1015,11 +1015,11 @@
     "nvim-lspconfig": {
       "flake": false,
       "locked": {
-        "lastModified": 1683093864,
-        "narHash": "sha256-OkS6DAXkY40xkR+v1FZEL8ujMWM421ZQdB9My0vG3+Y=",
+        "lastModified": 1684225521,
+        "narHash": "sha256-c/9TFkYpJ4z76ZWGLUpWhGbKIYIrtbgV2TDM5D1FyIU=",
         "owner": "neovim",
         "repo": "nvim-lspconfig",
-        "rev": "3bd4ca412982afa6f88bb7ef890660cee51c3e58",
+        "rev": "30a232052b3e1c0c51d190d5f5a12ad9b42c5ebc",
         "type": "github"
       },
       "original": {
@@ -1031,11 +1031,11 @@
     "nvim-neoclip": {
       "flake": false,
       "locked": {
-        "lastModified": 1682401368,
-        "narHash": "sha256-mbXlqddHHkNFzdAt4pmEMFbQDIxpALaf7fRIW/dhYp8=",
+        "lastModified": 1684196333,
+        "narHash": "sha256-96AwMgyC7PTDEPS5tXwDT3WfK8jJJuIYGE+q+j6U5Uc=",
         "owner": "AckslD",
         "repo": "nvim-neoclip.lua",
-        "rev": "591f1b62343efe3e369e4831cd91e1875f3a08f4",
+        "rev": "4e406ae0f759262518731538f2585abb9d269bac",
         "type": "github"
       },
       "original": {
@@ -1047,11 +1047,11 @@
     "nvim-notify": {
       "flake": false,
       "locked": {
-        "lastModified": 1681892404,
-        "narHash": "sha256-TEjd5Ikq0QFkmamlCRUgAMd6f53Cz/+2n6mfNEaxZQs=",
+        "lastModified": 1683967791,
+        "narHash": "sha256-WMty/xWLWt1/+1i+dBaOSQExem8zl5zgfpYuub3BHBY=",
         "owner": "rcarriga",
         "repo": "nvim-notify",
-        "rev": "159c6cf1be25a933f35e97499314c9faab55c98f",
+        "rev": "f3024b912073774111202f5fa6518b0cd2a74432",
         "type": "github"
       },
       "original": {
@@ -1063,11 +1063,11 @@
     "nvim-session-manager": {
       "flake": false,
       "locked": {
-        "lastModified": 1682579392,
-        "narHash": "sha256-+7kxlLQ2FKAn+mKl8NLBDiifXNaSibiZBq3fj8EPdwQ=",
+        "lastModified": 1683479997,
+        "narHash": "sha256-jGtBk2u2I/WhPHWUdqO4InrZmjW/LB5UCoKQS+ole9Y=",
         "owner": "Shatur",
         "repo": "neovim-session-manager",
-        "rev": "83ea944252d08b0950a407708f36ffdd3fe18e80",
+        "rev": "be04daecc27de3f7a2d2f61f94bee8a66758bd6f",
         "type": "github"
       },
       "original": {
@@ -1079,11 +1079,11 @@
     "nvim-tree-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1683112000,
-        "narHash": "sha256-8kJUyYaXZ42uBkwI+pfeikUNfF1sBBjB2AZeUtrpKSY=",
+        "lastModified": 1684112076,
+        "narHash": "sha256-g0Pq4pCJLZYRMJaYVel92wBEh3FiiTsdyAY4i6mhPz0=",
         "owner": "nvim-tree",
         "repo": "nvim-tree.lua",
-        "rev": "53295de04d265fba695ec5a21912bdf36647dbad",
+        "rev": "736c7ff59065275f0483af4b7f07a9bc41449ad0",
         "type": "github"
       },
       "original": {
@@ -1095,11 +1095,11 @@
     "nvim-treesitter-context": {
       "flake": false,
       "locked": {
-        "lastModified": 1683188173,
-        "narHash": "sha256-lT9VdxEz0B33IvI+GAbDPFm3gLp38sDd5fnaW6ZpK8k=",
+        "lastModified": 1684221236,
+        "narHash": "sha256-lRERM2bu9jO2nlR5vAuvAEH23bXroEIYtYcFHK84EC0=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter-context",
-        "rev": "0226dd639712141235d5c9eefde47365d15d0535",
+        "rev": "e3535ff78a3eff328ad1b32f327fb85e58241d4b",
         "type": "github"
       },
       "original": {
@@ -1127,11 +1127,11 @@
     "nvim-web-devicons": {
       "flake": false,
       "locked": {
-        "lastModified": 1682929721,
-        "narHash": "sha256-dYiG5uBSBU0b5MMZp6xKd8gB79nNdHGuq2UfcWnv2Es=",
+        "lastModified": 1683422244,
+        "narHash": "sha256-+UH04+Bu167fthQntUATik9wl/vRfkMJ/A9JheaHx9w=",
         "owner": "kyazdani42",
         "repo": "nvim-web-devicons",
-        "rev": "b34362b20a4942b3245f958e73ebe1b09b020ad1",
+        "rev": "986875b7364095d6535e28bd4aac3a9357e91bbe",
         "type": "github"
       },
       "original": {
@@ -1143,11 +1143,11 @@
     "obsidian-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1682282743,
-        "narHash": "sha256-aqj8zxZp7UylWl9VlJH408fa3Ui2nZnUKhHOwaazizo=",
+        "lastModified": 1683934521,
+        "narHash": "sha256-ahxj1i/QNY4ywMEWrYHLtmG88cbVb/bXR/iqIMikAoM=",
         "owner": "epwalsh",
         "repo": "obsidian.nvim",
-        "rev": "0418505ff7d1e06460450a02b9209d03f4c2a50d",
+        "rev": "be57d5f9c4412a25b5fe79a9fce30e80c2f1a1ba",
         "type": "github"
       },
       "original": {
@@ -1159,11 +1159,11 @@
     "onedark": {
       "flake": false,
       "locked": {
-        "lastModified": 1682760728,
-        "narHash": "sha256-v7PtrlJzM7NZTiEEQyVBjQ/YMYNk60KrQcHXi5qVECA=",
+        "lastModified": 1683327179,
+        "narHash": "sha256-Cyzix6wdnLly7DTgVUBwervTGguc65vL5LTyyy+HDxg=",
         "owner": "navarasu",
         "repo": "onedark.nvim",
-        "rev": "82cad746101300aa2fdea5f4d121c51c23bab8bd",
+        "rev": "f6e82074761473d30a722f5d90c60282de1ac41d",
         "type": "github"
       },
       "original": {
@@ -1175,11 +1175,11 @@
     "orgmode-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1683178502,
-        "narHash": "sha256-W2ucgUBJ8yAAX+ufai5NeJQGGCr54amp2PkWbtzcka8=",
+        "lastModified": 1683819271,
+        "narHash": "sha256-ePR7GrSexvAZGt0ikjBEh9negh4JSjpgGfTDck2ITeE=",
         "owner": "nvim-orgmode",
         "repo": "orgmode",
-        "rev": "5ac150c6e24a59a6b09718f66dee082a804b5667",
+        "rev": "f6926dfde7b09928533cdb247406f7f0cb341f93",
         "type": "github"
       },
       "original": {
@@ -1503,11 +1503,11 @@
     "telescope": {
       "flake": false,
       "locked": {
-        "lastModified": 1682482973,
-        "narHash": "sha256-K3jhTlB9Win94oLMXTB4WGl5QY9mE8YrFtLudHlhKj0=",
+        "lastModified": 1684216929,
+        "narHash": "sha256-he+kggJjzupbmNeje27QV8h6p74IpgJreokKb9sMNAw=",
         "owner": "nvim-telescope",
         "repo": "telescope.nvim",
-        "rev": "713d26b98583b160b50fb827adb751f768238ed3",
+        "rev": "40c31fdde93bcd85aeb3447bb3e2a3208395a868",
         "type": "github"
       },
       "original": {
@@ -1592,11 +1592,11 @@
     "tokyonight": {
       "flake": false,
       "locked": {
-        "lastModified": 1683093157,
-        "narHash": "sha256-n9c66+KLBsJ/TuujFpdVEP0pPG2JscEoEq7JP7l3JSA=",
+        "lastModified": 1683480785,
+        "narHash": "sha256-iSPPwXkTUCtDG5GsQzaFmo+9o/E4XLiGDGLhOeRrN9E=",
         "owner": "folke",
         "repo": "tokyonight.nvim",
-        "rev": "f2ed28707a0ad49047d9b733395ea205ea09f517",
+        "rev": "df13e3268a44f142999fa166572fe95a650a0b37",
         "type": "github"
       },
       "original": {
@@ -1752,11 +1752,11 @@
     "which-key": {
       "flake": false,
       "locked": {
-        "lastModified": 1683210030,
-        "narHash": "sha256-XoEpCdXSOeyPSQt8jtpp7gZk38tnUCHfiVuCJlw+z6Q=",
+        "lastModified": 1683810297,
+        "narHash": "sha256-XMqfkXCJV/rKn0ZqVzUV4ajEvnY992efQsJ14qJj6Gc=",
         "owner": "folke",
         "repo": "which-key.nvim",
-        "rev": "af8f26bfbb61b5f722c9fbc72b296dc9db0bcfdc",
+        "rev": "5a6c954a5a46023c19acc03a8b6d7c3e57964fc5",
         "type": "github"
       },
       "original": {
@@ -1772,11 +1772,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1683202073,
-        "narHash": "sha256-LRiD6oq/FI+TbJQAKNZlxX1ye7Sb5EuFzIRIDFKP6t8=",
+        "lastModified": 1684066016,
+        "narHash": "sha256-yruKXIwISE+cuu1rz6vK49BYK3B9fiOJ888tnf1FywI=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "16230eafd62dc8b152e40a0c2776e37fe57c72e0",
+        "rev": "0ffd6ed7472e5fa79589c6bd7b8e1b8e290289ef",
         "type": "github"
       },
       "original": {

From bae1ef363a352ea6c543f615c03a3c9288614cd7 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Tue, 16 May 2023 17:00:51 +0300
Subject: [PATCH 083/162] fix: set `cursorlineopt=number` if theme is
 transparent

---
 modules/basic/config.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/basic/config.nix b/modules/basic/config.nix
index 435b715..ae3c92f 100644
--- a/modules/basic/config.nix
+++ b/modules/basic/config.nix
@@ -75,6 +75,10 @@ in {
       set shortmess+=c
       set tm=${toString cfg.mapTimeout}
       set hidden
+      ${optionalString cfg.theme.transparent ''
+        " this needs to be set if the theme is transparent
+        set cursorlineopt=number
+      ''}
       ${optionalString cfg.splitBelow ''
         set splitbelow
       ''}

From d2fab111de125be741130a08adb8d429eef1628c Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Tue, 16 May 2023 17:25:20 +0300
Subject: [PATCH 084/162] fix: override `cursorlineopt=number` via autocmds

---
 modules/basic/config.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/basic/config.nix b/modules/basic/config.nix
index ae3c92f..5e91a4a 100644
--- a/modules/basic/config.nix
+++ b/modules/basic/config.nix
@@ -75,9 +75,13 @@ in {
       set shortmess+=c
       set tm=${toString cfg.mapTimeout}
       set hidden
+
       ${optionalString cfg.theme.transparent ''
         " this needs to be set if the theme is transparent
         set cursorlineopt=number
+        " override when vim is opened or a new buffer is entered
+        autocmd VimEnter * setlocal cursorlineopt=number
+        autocmd BufWinEnter * setlocal cursorlineopt=number
       ''}
       ${optionalString cfg.splitBelow ''
         set splitbelow

From 0a7f9865f1532241e58231518a525d0514a039ba Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Fri, 19 May 2023 14:58:00 +0300
Subject: [PATCH 085/162] fix(nvimtree-lua): disable cursor-line to false

---
 modules/filetree/nvimtree-lua/config.nix       | 2 ++
 modules/filetree/nvimtree-lua/nvimtree-lua.nix | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/modules/filetree/nvimtree-lua/config.nix b/modules/filetree/nvimtree-lua/config.nix
index 2929394..6450ef8 100644
--- a/modules/filetree/nvimtree-lua/config.nix
+++ b/modules/filetree/nvimtree-lua/config.nix
@@ -79,7 +79,9 @@ in {
           width = ${toString cfg.view.width},
           side = ${"'" + cfg.view.side + "'"},
           adaptive_size = ${boolToString cfg.view.adaptiveSize},
+          cursorline = ${boolToString cfg.view.cursorLine}
         },
+
         git = {
           enable = ${boolToString cfg.git.enable},
           ignore = ${boolToString cfg.git.ignore},
diff --git a/modules/filetree/nvimtree-lua/nvimtree-lua.nix b/modules/filetree/nvimtree-lua/nvimtree-lua.nix
index e2d63a7..c782245 100644
--- a/modules/filetree/nvimtree-lua/nvimtree-lua.nix
+++ b/modules/filetree/nvimtree-lua/nvimtree-lua.nix
@@ -182,6 +182,11 @@ with builtins; {
         description = "Width of the tree in charecters";
         type = types.int;
       };
+      cursorLine = mkOption {
+        default = false;
+        description = "Whether to display the cursor line in NvimTree";
+        type = types.bool;
+      };
     };
 
     git = {

From 4f8a035d820805dfc257acc30c6da2cea5583070 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Fri, 19 May 2023 15:14:25 +0300
Subject: [PATCH 086/162] feat: cursorlineopt config option

---
 modules/basic/config.nix | 8 +-------
 modules/basic/module.nix | 6 ++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/basic/config.nix b/modules/basic/config.nix
index 5e91a4a..a3e62c2 100644
--- a/modules/basic/config.nix
+++ b/modules/basic/config.nix
@@ -75,14 +75,8 @@ in {
       set shortmess+=c
       set tm=${toString cfg.mapTimeout}
       set hidden
+      set cursorlineopt=${toString cfg.cursorlineOpt}
 
-      ${optionalString cfg.theme.transparent ''
-        " this needs to be set if the theme is transparent
-        set cursorlineopt=number
-        " override when vim is opened or a new buffer is entered
-        autocmd VimEnter * setlocal cursorlineopt=number
-        autocmd BufWinEnter * setlocal cursorlineopt=number
-      ''}
       ${optionalString cfg.splitBelow ''
         set splitbelow
       ''}
diff --git a/modules/basic/module.nix b/modules/basic/module.nix
index d06838e..e93c4d4 100644
--- a/modules/basic/module.nix
+++ b/modules/basic/module.nix
@@ -145,6 +145,12 @@ with builtins; {
       description = "Follow editorconfig rules in current directory";
     };
 
+    cursorlineOpt = mkOption {
+      type = types.enum ["line" "screenline" "number" "both"];
+      default = "line";
+      description = "Highlight the text line of the cursor with CursorLine hl-CursorLine";
+    };
+
     enableLuaLoader = mkEnableOption "Enable the experimental Lua module loader to speed up the start up process";
   };
 }

From 24265c591d7ed1779104a8fba3736f0377fbbcb0 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Fri, 19 May 2023 15:14:49 +0300
Subject: [PATCH 087/162] feat: fidget support for catppuccin theme

---
 modules/theme/supported_themes.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/theme/supported_themes.nix b/modules/theme/supported_themes.nix
index 10e0f6c..f229217 100644
--- a/modules/theme/supported_themes.nix
+++ b/modules/theme/supported_themes.nix
@@ -51,6 +51,7 @@
       	  telescope = true,
       	  treesitter = true,
       	  ts_rainbow = true,
+          fidget = true,
         },
       }
       -- setup must be called before loading

From 266fbac7917e2afdd73dcc35a351b7818bff8891 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Fri, 19 May 2023 15:19:16 +0300
Subject: [PATCH 088/162] dev(nvimtree-lua): rename cursorLine -> cursorline

---
 modules/filetree/nvimtree-lua/config.nix       | 2 +-
 modules/filetree/nvimtree-lua/nvimtree-lua.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/filetree/nvimtree-lua/config.nix b/modules/filetree/nvimtree-lua/config.nix
index 6450ef8..3267d47 100644
--- a/modules/filetree/nvimtree-lua/config.nix
+++ b/modules/filetree/nvimtree-lua/config.nix
@@ -79,7 +79,7 @@ in {
           width = ${toString cfg.view.width},
           side = ${"'" + cfg.view.side + "'"},
           adaptive_size = ${boolToString cfg.view.adaptiveSize},
-          cursorline = ${boolToString cfg.view.cursorLine}
+          cursorline = ${boolToString cfg.view.cursorline}
         },
 
         git = {
diff --git a/modules/filetree/nvimtree-lua/nvimtree-lua.nix b/modules/filetree/nvimtree-lua/nvimtree-lua.nix
index c782245..d4d167e 100644
--- a/modules/filetree/nvimtree-lua/nvimtree-lua.nix
+++ b/modules/filetree/nvimtree-lua/nvimtree-lua.nix
@@ -182,7 +182,7 @@ with builtins; {
         description = "Width of the tree in charecters";
         type = types.int;
       };
-      cursorLine = mkOption {
+      cursorline = mkOption {
         default = false;
         description = "Whether to display the cursor line in NvimTree";
         type = types.bool;

From 03a4a1ebbbbac4f07006bdaf5e3c3f14eb87df6b Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Fri, 19 May 2023 15:19:23 +0300
Subject: [PATCH 089/162] docs: update release notes

---
 docs/release-notes/rl-0.4.adoc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index 75be6b8..77eb168 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -27,3 +27,9 @@ https://github.com/horriblename[horriblename]:
 https://github.com/notashelf[notashelf]:
 
 * Made Copilot's Node package configurable. It is recommended to keep as default, but providing a different NodeJS version is now possible.
+
+* Added <<opt-vim.cursorlineOpt>> for configuring Neovim's cursorlineOpt.
+
+* Added <<opt-vim.fileTree.nvimtreeLua.cursorline>>, default false, to enable cursorline in nvimtre.
+
+* Added Fidget.nvim support for the Catppuccin theme.

From eba785e91f8334519f1135a3e32dc9e2b38d2c31 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Fri, 19 May 2023 15:23:08 +0300
Subject: [PATCH 090/162] docs: fix reference to invalid nvimtreeLua option

---
 docs/release-notes/rl-0.4.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index 77eb168..8fa711f 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -30,6 +30,6 @@ https://github.com/notashelf[notashelf]:
 
 * Added <<opt-vim.cursorlineOpt>> for configuring Neovim's cursorlineOpt.
 
-* Added <<opt-vim.fileTree.nvimtreeLua.cursorline>>, default false, to enable cursorline in nvimtre.
+* Added <<opt-vim.fileTree.nvimTreeLua.cursorline>>, default false, to enable cursorline in nvimtre.
 
 * Added Fidget.nvim support for the Catppuccin theme.

From d1b65d285888e5ce68a98b5327631ff17a43fa8c Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Fri, 19 May 2023 15:51:25 +0300
Subject: [PATCH 091/162] docs: fix reference to invalid nvimtreeLua option

---
 docs/release-notes/rl-0.4.adoc | 2 +-
 extra.nix                      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index 8fa711f..81425ff 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -30,6 +30,6 @@ https://github.com/notashelf[notashelf]:
 
 * Added <<opt-vim.cursorlineOpt>> for configuring Neovim's cursorlineOpt.
 
-* Added <<opt-vim.fileTree.nvimTreeLua.cursorline>>, default false, to enable cursorline in nvimtre.
+* Added <<opt-vim.filetree.nvimTreeLua.view.cursorline>>, default false, to enable cursorline in nvimtre.
 
 * Added Fidget.nvim support for the Catppuccin theme.
diff --git a/extra.nix b/extra.nix
index 6794c48..550ae28 100644
--- a/extra.nix
+++ b/extra.nix
@@ -108,6 +108,7 @@ inputs: let
           };
           view = {
             width = 25;
+            cursorline = false;
           };
         };
       };

From 6201d04724cf224c492200645cf2d2bc2e18d7bc Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Sat, 20 May 2023 17:48:40 +0300
Subject: [PATCH 092/162] feat: update default NodeJS package for Copilot.lua

---
 modules/assistant/copilot/copilot.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/assistant/copilot/copilot.nix b/modules/assistant/copilot/copilot.nix
index 23f2619..9cd8dab 100644
--- a/modules/assistant/copilot/copilot.nix
+++ b/modules/assistant/copilot/copilot.nix
@@ -98,9 +98,9 @@ in {
     };
 
     copilotNodePackage = mkOption {
-      type = with types; nullOr package;
-      default = pkgs.nodejs-slim-16_x;
-      description = "The package that will be used for Copilot. NodeJS v16 is recommended.";
+      type = with types; nullOr package; # TODO - maybe accept a path as well? imperative users might want to use something like nvm
+      default = pkgs.nodejs-slim; # this will likely need to be downgraded because Copilot does not stay up to date with NodeJS
+      description = "The package that will be used for Copilot. NodeJS v18 is recommended.";
     };
   };
 }

From 134c60f40eb34e731a8abbee6d12c20e458b2681 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Sat, 20 May 2023 17:49:38 +0300
Subject: [PATCH 093/162] docs: update release notes

---
 docs/release-notes/rl-0.4.adoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index 81425ff..f13350f 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -33,3 +33,5 @@ https://github.com/notashelf[notashelf]:
 * Added <<opt-vim.filetree.nvimTreeLua.view.cursorline>>, default false, to enable cursorline in nvimtre.
 
 * Added Fidget.nvim support for the Catppuccin theme.
+
+* Updated bundled NodeJS version used by `Copilot.lua`. v16 is now marked as insecure on Nixpkgs, and we updated to v18

From 5c6cd508c3cf65e6551e97bdcfe0977bf686580c Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 22 May 2023 15:59:12 +0200
Subject: [PATCH 094/162] feat: make it possible to use strings for the RC

when providing a string, it will get mapped as if it was given with nivm.dag.entryAnywhere, which will most likely be what people want
---
 docs/release-notes/rl-0.4.adoc |  2 ++
 modules/core/default.nix       | 11 ++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index f13350f..c3e7b80 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -16,6 +16,8 @@ https://github.com/n3oney[n3oney]:
 
 * Moved default keybinds into keybinds section of each module
 
+* Simplified luaConfigRC and configRC setting - they can now just take strings
+
 https://github.com/horriblename[horriblename]:
 
 * Added `clangd` as alternative lsp for C/++.
diff --git a/modules/core/default.nix b/modules/core/default.nix
index 91cccf5..244965b 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -132,13 +132,13 @@ in {
 
     configRC = mkOption {
       description = "vimrc contents";
-      type = nvim.types.dagOf types.lines;
+      type = types.oneOf [(nvim.types.dagOf types.lines) types.str];
       default = {};
     };
 
     luaConfigRC = mkOption {
       description = "vim lua config";
-      type = nvim.types.dagOf types.lines;
+      type = types.oneOf [(nvim.types.dagOf types.lines) types.str];
       default = {};
     };
 
@@ -282,7 +282,12 @@ in {
       dag,
       mapResult,
     }: let
-      sortedDag = nvim.dag.topoSort dag;
+      finalDag = lib.mapAttrs (name: value:
+        if builtins.isString value
+        then nvim.dag.entryAnywhere value
+        else value)
+      dag;
+      sortedDag = nvim.dag.topoSort finalDag;
       result =
         if sortedDag ? result
         then mapResult sortedDag.result

From ce16eebd77e1d9a315fcfbe0e643c8b49c70b857 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 22 May 2023 16:21:47 +0200
Subject: [PATCH 095/162] chore: add custom plugins documentation

---
 docs/custom-plugins.adoc | 34 ++++++++++++++++++++++++++++++++++
 docs/manual.xml          |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 docs/custom-plugins.adoc

diff --git a/docs/custom-plugins.adoc b/docs/custom-plugins.adoc
new file mode 100644
index 0000000..642b60e
--- /dev/null
+++ b/docs/custom-plugins.adoc
@@ -0,0 +1,34 @@
+[[ch-custom-plugins]]
+== Custom Plugins
+
+You can use custom plugins, before they are implemented in the flake.
+To add a plugin, you need to add it to your config's `config.vim.startPlugins` array.
+This is an example of adding the FrenzyExists/aquarium-vim plugin:
+
+[source,nix]
+----
+{
+  config.vim.startPlugins = [
+    (pkgs.fetchFromGitHub {
+      owner = "FrenzyExists";
+      repo = "aquarium-vim";
+      rev = "d09b1feda1148797aa5ff0dbca8d8e3256d028d5";
+      sha256 = "CtyEhCcGxxok6xFQ09feWpdEBIYHH+GIFVOaNZx10Bs=";
+    })
+  ];
+}
+----
+
+However, just making the plugin available might not be enough. In that case, you can write custom vimscript or lua config, using `config.vim.configRC` or `config.vim.luaConfigRC` respectively.
+These options are attribute sets, and you need to give the configuration you're adding some name, like this:
+
+[source,nix]
+----
+{
+  config.vim.configRC.aquarium = "colorscheme aquiarum";
+}
+----
+
+Note: If your configuration needs to be put in a specific place in the config, you can use functions from `inputs.neovim-flake.lib.nvim.dag` to order it. Refer to https://github.com/nix-community/home-manager/blob/master/modules/lib/dag.nix.
+
+Also, if you successfully made your plugin work, please make a PR to add it to the flake, or open an issue with your findings so that we can make it available for everyone easily.
diff --git a/docs/manual.xml b/docs/manual.xml
index 3f01228..5597b36 100644
--- a/docs/manual.xml
+++ b/docs/manual.xml
@@ -19,6 +19,7 @@
  <xi:include href="try-it-out.xml"/>
  <xi:include href="default-configs.xml"/>
  <xi:include href="custom-configs.xml"/>
+ <xi:include href="custom-plugins.xml"/>
  <xi:include href="home-manager.xml"/>
  <xi:include href="languages.xml"/>
  <appendix xml:id="ch-options">

From dced02feed71cc0e74cab06db6fa09061d49ff6a Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 22 May 2023 19:00:33 +0200
Subject: [PATCH 096/162] chore: add comments

---
 docs/release-notes/rl-0.4.adoc | 2 ++
 modules/core/default.nix       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index c3e7b80..318732e 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -18,6 +18,8 @@ https://github.com/n3oney[n3oney]:
 
 * Simplified luaConfigRC and configRC setting - they can now just take strings
 
+* Refactored the resolveDag function - you can just provide a string now, which will default to dag.entryAnywhere
+
 https://github.com/horriblename[horriblename]:
 
 * Added `clangd` as alternative lsp for C/++.
diff --git a/modules/core/default.nix b/modules/core/default.nix
index 244965b..9261caf 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -282,6 +282,7 @@ in {
       dag,
       mapResult,
     }: let
+      # When the value is a string, default it to dag.entryAnywhere
       finalDag = lib.mapAttrs (name: value:
         if builtins.isString value
         then nvim.dag.entryAnywhere value

From 6b61beb0ef6ccb193640e0a28ad466216a583b78 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Tue, 23 May 2023 22:53:18 +0200
Subject: [PATCH 097/162] feat: give null-ls priority over other formatters

---
 docs/release-notes/rl-0.4.adoc |  2 ++
 modules/lsp/config.nix         | 34 +++++++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index 318732e..1d9076a 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -20,6 +20,8 @@ https://github.com/n3oney[n3oney]:
 
 * Refactored the resolveDag function - you can just provide a string now, which will default to dag.entryAnywhere
 
+* Fixed formatting issues and gave null-ls priority over other formatters
+
 https://github.com/horriblename[horriblename]:
 
 * Added `clangd` as alternative lsp for C/++.
diff --git a/modules/lsp/config.nix b/modules/lsp/config.nix
index bcd69d4..1085118 100644
--- a/modules/lsp/config.nix
+++ b/modules/lsp/config.nix
@@ -39,15 +39,43 @@ in {
       local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
 
       format_callback = function(client, bufnr)
-        if vim.g.formatsave and client.supports_method("textDocument/formatting") then
+        if vim.g.formatsave then
           vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
           vim.api.nvim_create_autocmd("BufWritePre", {
             group = augroup,
             buffer = bufnr,
             callback = function()
-              vim.lsp.buf.format({
-                bufnr = bufnr
+              ${
+        if config.vim.lsp.null-ls.enable
+        then ''
+          local function is_null_ls_formatting_enabled(bufnr)
+              local file_type = vim.api.nvim_buf_get_option(bufnr, "filetype")
+              local generators = require("null-ls.generators").get_available(
+                  file_type,
+                  require("null-ls.methods").internal.FORMATTING
+              )
+              return #generators > 0
+          end
+
+          if is_null_ls_formatting_enabled(bufnr) then
+             vim.lsp.buf.format({
+                bufnr = bufnr,
+                filter = function(client)
+                  return client.name == "null-ls"
+                end
               })
+          else
+              vim.lsp.buf.format({
+                bufnr = bufnr,
+              })
+          end
+        ''
+        else "
+              vim.lsp.buf.format({
+                bufnr = bufnr,
+              })
+        "
+      }
             end,
           })
         end

From d65223e34ef88e0b592239ee468cc43d7d3fe4cb Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Wed, 24 May 2023 04:13:56 +0300
Subject: [PATCH 098/162] feat(fidget): catppuccin integration

---
 modules/visuals/config.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/visuals/config.nix b/modules/visuals/config.nix
index 307c7d5..452c0bd 100644
--- a/modules/visuals/config.nix
+++ b/modules/visuals/config.nix
@@ -103,7 +103,10 @@ in {
           align = {
             bottom = ${boolToString cfg.fidget-nvim.align.bottom},
             right = ${boolToString cfg.fidget-nvim.align.right},
-          }
+          },
+          window = {
+            blend = 0,
+          },
         }
       '';
     })

From ee3a5dc4a070003243e0f351ef15e7dd3babe83c Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Wed, 24 May 2023 04:17:10 +0300
Subject: [PATCH 099/162] feat(catppuccin: more plugin integrations)

---
 modules/theme/supported_themes.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/theme/supported_themes.nix b/modules/theme/supported_themes.nix
index f229217..7338edb 100644
--- a/modules/theme/supported_themes.nix
+++ b/modules/theme/supported_themes.nix
@@ -42,7 +42,7 @@
         integrations = {
       	  nvimtree = {
       		  enabled = true,
-      		  transparent_panel = false,
+      		  transparent_panel = ${lib.boolToString transparent},
       		  show_root = true,
       	  },
 
@@ -52,6 +52,12 @@
       	  treesitter = true,
       	  ts_rainbow = true,
           fidget = true,
+          alpha = true,
+          leap = true,
+          markdown = true,
+          noice = true,
+          notify = true, -- nvim-notify
+          which_key = true
         },
       }
       -- setup must be called before loading

From dd9191e016e87028f53265b4293970fb5dec31d3 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Wed, 24 May 2023 04:18:13 +0300
Subject: [PATCH 100/162] docs: update release notes

---
 docs/release-notes/rl-0.4.adoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index 318732e..6674cc1 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -39,3 +39,5 @@ https://github.com/notashelf[notashelf]:
 * Added Fidget.nvim support for the Catppuccin theme.
 
 * Updated bundled NodeJS version used by `Copilot.lua`. v16 is now marked as insecure on Nixpkgs, and we updated to v18
+
+* Enabled Catppuccin modules for plugins available by default.

From 9d3f74b70cb50d09ca481df35224e8284679d4f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82?= <30625554+n3oney@users.noreply.github.com>
Date: Fri, 26 May 2023 08:59:24 +0200
Subject: [PATCH 101/162] chore: update release notes

---
 docs/release-notes/rl-0.4.adoc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index 1d9076a..7093deb 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -20,7 +20,11 @@ https://github.com/n3oney[n3oney]:
 
 * Refactored the resolveDag function - you can just provide a string now, which will default to dag.entryAnywhere
 
-* Fixed formatting issues and gave null-ls priority over other formatters
+* Fixed formatting sometimes removing parts of files
+
+* Made formatting synchronous
+
+* Gave null-ls priority over other formatters
 
 https://github.com/horriblename[horriblename]:
 

From d3c14a8cdf7fd5a9cb8049cd49cc7534115641b9 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Fri, 26 May 2023 16:08:23 +0300
Subject: [PATCH 102/162] feat: change nvim-web-devicons source

---
 flake.lock | 10 +++++-----
 flake.nix  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index c5a8489..08970a5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1127,15 +1127,15 @@
     "nvim-web-devicons": {
       "flake": false,
       "locked": {
-        "lastModified": 1683422244,
-        "narHash": "sha256-+UH04+Bu167fthQntUATik9wl/vRfkMJ/A9JheaHx9w=",
-        "owner": "kyazdani42",
+        "lastModified": 1684714932,
+        "narHash": "sha256-JGGrIm8wTekB7FnD4jNnEQbmcktbVyTxLyER4VOGWto=",
+        "owner": "nvim-tree",
         "repo": "nvim-web-devicons",
-        "rev": "986875b7364095d6535e28bd4aac3a9357e91bbe",
+        "rev": "e283ab937e0197b37ec5d8013e49495193407324",
         "type": "github"
       },
       "original": {
-        "owner": "kyazdani42",
+        "owner": "nvim-tree",
         "repo": "nvim-web-devicons",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index e488e89..a47d1a9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -330,7 +330,7 @@
       flake = false;
     };
     nvim-web-devicons = {
-      url = "github:kyazdani42/nvim-web-devicons";
+      url = "github:nvim-tree/nvim-web-devicons";
       flake = false;
     };
     gitsigns-nvim = {

From a28219d3fe1bbb0fb21f8e8ba993c2576bb53eb6 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Sat, 3 Jun 2023 16:21:37 +0300
Subject: [PATCH 103/162] feat: bump flake inputs

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 08970a5..a985a0c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1702,11 +1702,11 @@
     "vim-tidal-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1664758630,
-        "narHash": "sha256-fLaBMm6jSLHytIH5IUQtUfi3kaPLdruO3cxv4UcjEO4=",
+        "lastModified": 1685703852,
+        "narHash": "sha256-8gyk17YLeKpLpz3LRtxiwbpsIbZka9bb63nK5/9IUoA=",
         "owner": "tidalcycles",
         "repo": "vim-tidal",
-        "rev": "f15f14b12176d8f1028d0596b031c3d6e1201c3b",
+        "rev": "e440fe5bdfe07f805e21e6872099685d38e8b761",
         "type": "github"
       },
       "original": {

From 1f19e9c548dcf2ea43800103a2a1f6d52b829505 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Sat, 3 Jun 2023 16:25:22 +0300
Subject: [PATCH 104/162] feat: bump flake inputs

---
 flake.lock | 256 ++++++++++++++++++++++++++---------------------------
 1 file changed, 128 insertions(+), 128 deletions(-)

diff --git a/flake.lock b/flake.lock
index a985a0c..ae9e2f1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -19,11 +19,11 @@
     "bufdelete-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1676574502,
-        "narHash": "sha256-bh5PE0/QNK5et+E7cTz69wnZ9K09681nlQ+OI87ZU7g=",
+        "lastModified": 1685260243,
+        "narHash": "sha256-oqknglSi9leINjLCVgkEMAOiodwYjtiP43hZjCLxDbQ=",
         "owner": "famiu",
         "repo": "bufdelete.nvim",
-        "rev": "8933abc09df6c381d47dc271b1ee5d266541448e",
+        "rev": "ccfa2589fa68512770639839ab3850097fbbf4dc",
         "type": "github"
       },
       "original": {
@@ -35,11 +35,11 @@
     "catppuccin": {
       "flake": false,
       "locked": {
-        "lastModified": 1683711270,
-        "narHash": "sha256-mMeN83dsE1AgfcoLn03V1L4JyVF1RKIMURvHOht1ecE=",
+        "lastModified": 1685792299,
+        "narHash": "sha256-SmYHM9NJ6mPKfS3cA840dSSeJU8CpToJDJk/r/4huZs=",
         "owner": "catppuccin",
         "repo": "nvim",
-        "rev": "57b421ee5f7380f816791fa451e86f213b625ece",
+        "rev": "6c351a82966aad5c96f6bb9a785a1ca4ac68c678",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
     "colorizer": {
       "flake": false,
       "locked": {
-        "lastModified": 1683867388,
-        "narHash": "sha256-xuNNixmglet1511uxWL+kKWjrCIU5wZOags1WleJ7ZE=",
+        "lastModified": 1684248331,
+        "narHash": "sha256-gZ1ZQsf+EkabFnDS48OFd1EfJmUeN504qeUH0jsCHdM=",
         "owner": "uga-rosa",
         "repo": "ccc.nvim",
-        "rev": "c1e253943f7619b85f2a5480a63fff8d22ddb54f",
+        "rev": "78aed26e18a087501be0475443b5a623adbf6290",
         "type": "github"
       },
       "original": {
@@ -211,11 +211,11 @@
     "comment-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1683091103,
-        "narHash": "sha256-CMHkf+0T5FRMcqD6zGFo5IHrgT0xbZXe1UgOs+b1148=",
+        "lastModified": 1685617167,
+        "narHash": "sha256-au/jG2jhRKQwLxCTODNmLcy5aJBFfg5j9wtQvWhby4g=",
         "owner": "numToStr",
         "repo": "Comment.nvim",
-        "rev": "e1fe53117aab24c378d5e6deaad786789c360123",
+        "rev": "c8043290f2d77f61025494d839d88e414608c460",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
     "copilot-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1683572689,
-        "narHash": "sha256-+dqwwBHDRh1vmbgx8o1RVMEAN7Hlr5I5L71wdagDo/o=",
+        "lastModified": 1685261869,
+        "narHash": "sha256-jBTS8MeN7Ydf0ZY7JWbrxaGo/GeDoEClfULiJVfN8Wo=",
         "owner": "zbirenbaum",
         "repo": "copilot.lua",
-        "rev": "653bbdc44cd569a5fd0617e5a9d3df2b1359e230",
+        "rev": "77e3a4907928f0813024e573b882dc879dfc0c6b",
         "type": "github"
       },
       "original": {
@@ -243,11 +243,11 @@
     "crates-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1683908215,
-        "narHash": "sha256-2H0UjKYMK996pDbsZ+H+sVo0zBXnOEKbCLbRV8Eqm/U=",
+        "lastModified": 1684475320,
+        "narHash": "sha256-qsVU22P9TC6wXghH/6VhQHmWcpQmRPUWVViPUSp3m6k=",
         "owner": "Saecki",
         "repo": "crates.nvim",
-        "rev": "dca1949b0405c6ee5173d0627a523a10a63eca3c",
+        "rev": "3648f8787656d7572740560331553abdaa8cb982",
         "type": "github"
       },
       "original": {
@@ -275,11 +275,11 @@
     "diffview-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1684144116,
-        "narHash": "sha256-U5dyf6THkPsOMcCrKuONg0N1Rz7hrOAaBzr5vqbAoHU=",
+        "lastModified": 1685633996,
+        "narHash": "sha256-pD/C/jYo91XI0ypruz7xvJY2/PPMoMGc4B+5pUe7db0=",
         "owner": "sindrets",
         "repo": "diffview.nvim",
-        "rev": "1fc42e67dfb2da7946edbc9a30cb98ed371b8dde",
+        "rev": "86bf6182e2ea767c21711de8a3c396d9b635d970",
         "type": "github"
       },
       "original": {
@@ -308,11 +308,11 @@
     "dracula": {
       "flake": false,
       "locked": {
-        "lastModified": 1681992807,
+        "lastModified": 1685711944,
         "narHash": "sha256-NJ8BwhxL9v99MzM97P9/8UzhhMZS0kBvCMDq5NXP5ps=",
         "owner": "Mofiqul",
         "repo": "dracula.nvim",
-        "rev": "26d04c8ced02f02207e7aec1d5730c3a9ebadeeb",
+        "rev": "52f6d1c48589479d519c1aaea93dba1dd550a7a4",
         "type": "github"
       },
       "original": {
@@ -324,11 +324,11 @@
     "dressing-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1683895487,
-        "narHash": "sha256-0mWNJVDg47QohtesJ6tJQcbxuh2QL2SiSb01giIrrmU=",
+        "lastModified": 1685732991,
+        "narHash": "sha256-Tz/yG7HjwRDF4LXTng2laP9k3K+O/a0ttjEaSNcRnZs=",
         "owner": "stevearc",
         "repo": "dressing.nvim",
-        "rev": "66e4990240f92e31b0d5e4df6deb6bb0160ae832",
+        "rev": "f16d7586fcdd8b2e3850d0abb7e46f944125cc25",
         "type": "github"
       },
       "original": {
@@ -340,11 +340,11 @@
     "elixir-ls": {
       "flake": false,
       "locked": {
-        "lastModified": 1683367788,
-        "narHash": "sha256-O977DZLWPyLafIaOTPZKI4MOtK9E9TDProf2xyk05aI=",
+        "lastModified": 1685248350,
+        "narHash": "sha256-R0OWDAql7l0ghtzK9zygjtQoZsAxmk/+TGOmokfzlDw=",
         "owner": "elixir-lsp",
         "repo": "elixir-ls",
-        "rev": "15c0052a60d25f90b0200d8ed03c4ee93e2ea3af",
+        "rev": "10ffd298fa9e10232314908eb6b2a8fc40eac3e4",
         "type": "github"
       },
       "original": {
@@ -356,11 +356,11 @@
     "elixir-tools": {
       "flake": false,
       "locked": {
-        "lastModified": 1683997144,
-        "narHash": "sha256-Q2JTCcMFW3a2Uxn4gr+55Vg66VOi+LjseayvNVBRkFQ=",
+        "lastModified": 1685794698,
+        "narHash": "sha256-OjTlhwime+bQ2kOruOk50g7Y7Gd7gTZlHTpm+JLWFzU=",
         "owner": "elixir-tools",
         "repo": "elixir-tools.nvim",
-        "rev": "924e79bb7d2b57283e80385c5b773beab98e0b05",
+        "rev": "807eed64cde71ee7e439a0f606d2b85b9cbd7c9f",
         "type": "github"
       },
       "original": {
@@ -406,11 +406,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1683560683,
-        "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
+        "lastModified": 1685662779,
+        "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "006c75898cf814ef9497252b022e91c946ba8e17",
+        "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
         "type": "github"
       },
       "original": {
@@ -424,11 +424,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
         "type": "github"
       },
       "original": {
@@ -487,11 +487,11 @@
     "gitsigns-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1683733000,
-        "narHash": "sha256-OEtr7SbCGoKcZmDcbw6nUoc8QDxgwexh6M4gGg4CRek=",
+        "lastModified": 1685027359,
+        "narHash": "sha256-R7ayrNWGJLKYAOg+P/On9i8nk7GQpY28N2mFb/yped0=",
         "owner": "lewis6991",
         "repo": "gitsigns.nvim",
-        "rev": "814158f6c4b1724c039fcefe79b0be72c9131c2d",
+        "rev": "f868d82a36f7f7f5e110eb0a9659993984f59875",
         "type": "github"
       },
       "original": {
@@ -519,11 +519,11 @@
     "hop-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1667151642,
-        "narHash": "sha256-UZZlo5n1x8UfM9OP7RHfT3sFRfMpLkBLbEdcSO+SU6E=",
+        "lastModified": 1684332066,
+        "narHash": "sha256-xdjFbdp0+S3pVdwcOFmad8PMUU033WeDzswOSdxSQjg=",
         "owner": "phaazon",
         "repo": "hop.nvim",
-        "rev": "90db1b2c61b820e230599a04fedcd2679e64bd07",
+        "rev": "03f0434869f1f38868618198b5f4f2ab6d39aef2",
         "type": "github"
       },
       "original": {
@@ -551,11 +551,11 @@
     "indent-blankline": {
       "flake": false,
       "locked": {
-        "lastModified": 1676854912,
-        "narHash": "sha256-dBm0vnza+fBYxlgUDR1/57GZ+kd7CUVgkQIcZEFWl9k=",
+        "lastModified": 1685412336,
+        "narHash": "sha256-2AgkwADQetmFAc+cYU2USmTXMngXHo7021KrTVTIkkE=",
         "owner": "lukas-reineke",
         "repo": "indent-blankline.nvim",
-        "rev": "018bd04d80c9a73d399c1061fa0c3b14a7614399",
+        "rev": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01",
         "type": "github"
       },
       "original": {
@@ -583,11 +583,11 @@
     "leap-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1682691590,
-        "narHash": "sha256-8/fxeAE53whU7k0Ak05nJ+7l2UUgi4rXEFS8rkffU/U=",
+        "lastModified": 1685704459,
+        "narHash": "sha256-V9malmIjB4U00o0VWCFo3IXr3BVO+RdweFNoor/4a9w=",
         "owner": "ggandor",
         "repo": "leap.nvim",
-        "rev": "6f2912755c9c4ae790abd829f0cf1b07c037b2a4",
+        "rev": "14b5a65190fe69388a8f59c695ed3394a10d6af8",
         "type": "github"
       },
       "original": {
@@ -599,11 +599,11 @@
     "lsp-signature": {
       "flake": false,
       "locked": {
-        "lastModified": 1683088144,
-        "narHash": "sha256-5CMJsG7jyPc7cJ+SRrSxOBFjA1zgjkQNSZnBQ9KS7jg=",
+        "lastModified": 1685597172,
+        "narHash": "sha256-Fxgsdgi4ubeOhE07UHt3y7ELuOypIBzQcHwsoJIc9OE=",
         "owner": "ray-x",
         "repo": "lsp_signature.nvim",
-        "rev": "7a26ebaa7e36aa2aefa6c1994b2b866c96de32e6",
+        "rev": "17ff7a405fea8376b015b8ea7910d2e59958bf68",
         "type": "github"
       },
       "original": {
@@ -740,11 +740,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1683653883,
-        "narHash": "sha256-Xg3Cux5wQDatXRvQWsVD0YPfmxfijjG8+gxYqgoT6JE=",
+        "lastModified": 1685532165,
+        "narHash": "sha256-xHH9WbE9uya2B+j5w82HzpZVeErBt03/jtmWVRox0EU=",
         "owner": "oxalica",
         "repo": "nil",
-        "rev": "18de045d7788df2343aec58df7b85c10d1f5d5dd",
+        "rev": "dcd38b96c91a2d07552f824a6480e00dc7b4948a",
         "type": "github"
       },
       "original": {
@@ -755,11 +755,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1684212024,
-        "narHash": "sha256-/3ZvkPuIXdyZqPR53qC7aaV5wiwMOY+ddbESOykZ9Vo=",
+        "lastModified": 1685714850,
+        "narHash": "sha256-OcvbIJq4CGwwFr9m7M/SQcDPZ64hhR4t77oZgEeh7ZY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d4825e5e4ac1de7d5bb99381534fd0af3875a26d",
+        "rev": "c6ffce3d5df7b4c588ce80a0c6e2d2348a611707",
         "type": "github"
       },
       "original": {
@@ -772,11 +772,11 @@
     "nixpkgs-lib": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1682879489,
-        "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
+        "lastModified": 1685564631,
+        "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
+        "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a",
         "type": "github"
       },
       "original": {
@@ -854,11 +854,11 @@
     "noice-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1683722239,
-        "narHash": "sha256-3A2UyXsvc+1XvhdeSVT01G9fCtcp8cueYjzLxhC0wAc=",
+        "lastModified": 1685295910,
+        "narHash": "sha256-FGxpAZ8srLxdXitR1lYyWtWgLi9+WInyJXF6d1GJynU=",
         "owner": "folke",
         "repo": "noice.nvim",
-        "rev": "c2a745a26ae562f1faecbf6177ac53377d2658d5",
+        "rev": "7e358170cea2314d9768b3f63616e8fad186195e",
         "type": "github"
       },
       "original": {
@@ -870,11 +870,11 @@
     "nui-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1682892447,
-        "narHash": "sha256-wVGshQpYx7lz6gl/MDSGkSQJriUbZ0J0OnTFALrXsxk=",
+        "lastModified": 1685184324,
+        "narHash": "sha256-3wbIWsDjR1T8PrAQmiq2++BeGwMgCMx7Rb3qLb/zTy8=",
         "owner": "MunifTanjim",
         "repo": "nui.nvim",
-        "rev": "698e75814cd7c56b0dd8af4936bcef2d13807f3c",
+        "rev": "2b2732528e4a79eb8542568bd51d25f710395bd6",
         "type": "github"
       },
       "original": {
@@ -886,11 +886,11 @@
     "null-ls": {
       "flake": false,
       "locked": {
-        "lastModified": 1683736086,
-        "narHash": "sha256-LThRysXgyM/MzLBQakpzPBVyS1r9AL/w1dOyy4qo/3k=",
+        "lastModified": 1685458805,
+        "narHash": "sha256-ELMTBAo0d1zcDfOn+uxaOL6R2PyKpcr2+oqBW3yA/s4=",
         "owner": "jose-elias-alvarez",
         "repo": "null-ls.nvim",
-        "rev": "08bb00c7c2cd58c72e02cf54e4b9cbfe14b03e09",
+        "rev": "c89333e034a8daba654ebfcf9a4ec9f87765f01e",
         "type": "github"
       },
       "original": {
@@ -902,11 +902,11 @@
     "nvim-autopairs": {
       "flake": false,
       "locked": {
-        "lastModified": 1682892776,
-        "narHash": "sha256-EoAVYrBHUY0YAzgBfTyf7Dr8PS5+SULL2Az6dIa/E0g=",
+        "lastModified": 1685050619,
+        "narHash": "sha256-maSCppPEOFbkEfTYFKLq3M6Dg+fRjnqbCtsyWO9SILA=",
         "owner": "windwp",
         "repo": "nvim-autopairs",
-        "rev": "7747bbae60074acf0b9e3a4c13950be7a2dff444",
+        "rev": "59df87a84c80a357ca8d8fe86e451b93ac476ccc",
         "type": "github"
       },
       "original": {
@@ -1015,11 +1015,11 @@
     "nvim-lspconfig": {
       "flake": false,
       "locked": {
-        "lastModified": 1684225521,
-        "narHash": "sha256-c/9TFkYpJ4z76ZWGLUpWhGbKIYIrtbgV2TDM5D1FyIU=",
+        "lastModified": 1685776137,
+        "narHash": "sha256-vLFbNs2iKD60oO1apfhyz7WK/mjydtHHZSewrothnNg=",
         "owner": "neovim",
         "repo": "nvim-lspconfig",
-        "rev": "30a232052b3e1c0c51d190d5f5a12ad9b42c5ebc",
+        "rev": "90f5b0c2d7c5d3deb76b5deb0ecc379023c4f299",
         "type": "github"
       },
       "original": {
@@ -1063,11 +1063,11 @@
     "nvim-session-manager": {
       "flake": false,
       "locked": {
-        "lastModified": 1683479997,
-        "narHash": "sha256-jGtBk2u2I/WhPHWUdqO4InrZmjW/LB5UCoKQS+ole9Y=",
+        "lastModified": 1684506477,
+        "narHash": "sha256-WuxBjhwdQsgPq7rx2vKhNdpqkx2NU/PEw90F+YC8Q68=",
         "owner": "Shatur",
         "repo": "neovim-session-manager",
-        "rev": "be04daecc27de3f7a2d2f61f94bee8a66758bd6f",
+        "rev": "fd92e73506601a48adb843cdc0a15f2e63513754",
         "type": "github"
       },
       "original": {
@@ -1079,11 +1079,11 @@
     "nvim-tree-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1684112076,
-        "narHash": "sha256-g0Pq4pCJLZYRMJaYVel92wBEh3FiiTsdyAY4i6mhPz0=",
+        "lastModified": 1685168613,
+        "narHash": "sha256-TZNibkRvpKBTxWwrziJMfVqbEOt4VGiuXjD/+bZhloE=",
         "owner": "nvim-tree",
         "repo": "nvim-tree.lua",
-        "rev": "736c7ff59065275f0483af4b7f07a9bc41449ad0",
+        "rev": "e2a4c9d09d205ebe5f071264f43f73a0077c43a3",
         "type": "github"
       },
       "original": {
@@ -1095,11 +1095,11 @@
     "nvim-treesitter-context": {
       "flake": false,
       "locked": {
-        "lastModified": 1684221236,
-        "narHash": "sha256-lRERM2bu9jO2nlR5vAuvAEH23bXroEIYtYcFHK84EC0=",
+        "lastModified": 1685690380,
+        "narHash": "sha256-jJ0jMPQuIfNm+Qr2K2mQMlqffCqcQuC/kZm4/Q2CyQc=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter-context",
-        "rev": "e3535ff78a3eff328ad1b32f327fb85e58241d4b",
+        "rev": "e2ea37627c0681421ccf4a3cf19d68bb958e1817",
         "type": "github"
       },
       "original": {
@@ -1127,11 +1127,11 @@
     "nvim-web-devicons": {
       "flake": false,
       "locked": {
-        "lastModified": 1684714932,
-        "narHash": "sha256-JGGrIm8wTekB7FnD4jNnEQbmcktbVyTxLyER4VOGWto=",
+        "lastModified": 1685150210,
+        "narHash": "sha256-bryHxQZQ75wQXHLqYVh5zSkgLijdPvVAZPDYnv+JTkI=",
         "owner": "nvim-tree",
         "repo": "nvim-web-devicons",
-        "rev": "e283ab937e0197b37ec5d8013e49495193407324",
+        "rev": "2a125024a137677930efcfdf720f205504c97268",
         "type": "github"
       },
       "original": {
@@ -1143,11 +1143,11 @@
     "obsidian-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1683934521,
-        "narHash": "sha256-ahxj1i/QNY4ywMEWrYHLtmG88cbVb/bXR/iqIMikAoM=",
+        "lastModified": 1685470514,
+        "narHash": "sha256-/WV0tibm5jA/O/sWcq/s6DLmI4L0RgiMC2wFF7/1ixU=",
         "owner": "epwalsh",
         "repo": "obsidian.nvim",
-        "rev": "be57d5f9c4412a25b5fe79a9fce30e80c2f1a1ba",
+        "rev": "f509468fa7e8936919e32c0626b477a7ea2b70b7",
         "type": "github"
       },
       "original": {
@@ -1175,11 +1175,11 @@
     "orgmode-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1683819271,
-        "narHash": "sha256-ePR7GrSexvAZGt0ikjBEh9negh4JSjpgGfTDck2ITeE=",
+        "lastModified": 1685702583,
+        "narHash": "sha256-iEErJZiFUzBbD4tdbt51eihNbvyOd8Lj3ArxSmS9e4g=",
         "owner": "nvim-orgmode",
         "repo": "orgmode",
-        "rev": "f6926dfde7b09928533cdb247406f7f0cb341f93",
+        "rev": "7d4a3ffe9f766db7eab4c98610078f62f83965df",
         "type": "github"
       },
       "original": {
@@ -1191,11 +1191,11 @@
     "plenary-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1681122243,
-        "narHash": "sha256-tG+BrCgE1L7QMbchSzjLfQfpI09uTQXbx7OeFuVEcDQ=",
+        "lastModified": 1685508880,
+        "narHash": "sha256-5qtGxspjtCnkuoaE2gDnti58U4r34O1bBvjvUdTgKmU=",
         "owner": "nvim-lua",
         "repo": "plenary.nvim",
-        "rev": "9ac3e9541bbabd9d73663d757e4fe48a675bb054",
+        "rev": "499e0743cf5e8075cd32af68baa3946a1c76adf1",
         "type": "github"
       },
       "original": {
@@ -1375,11 +1375,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1682907601,
-        "narHash": "sha256-FfUAYvRJ+6s9WWjXNPdRzuuvAeu2VHIXIbUkPJr4t14=",
+        "lastModified": 1685413459,
+        "narHash": "sha256-+ELexqS2yN0wj1WnmWdF24OfjRBIgTN6Ltcpjvp2dEo=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "5eaff055dd57128c53ae373dc96af944f5849daa",
+        "rev": "9b3284e2412f76bd68ff46f8cf1c7af44d7ffac0",
         "type": "github"
       },
       "original": {
@@ -1407,11 +1407,11 @@
     "scrollbar-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1682601226,
-        "narHash": "sha256-M1tzayFsAPZSgS/fEP5/PhNZLzEbu8DwHRJSrDx6X6w=",
+        "lastModified": 1684886154,
+        "narHash": "sha256-zLBexSxQCn9HPY04a9w/UCJP1F5ShI2X12I9xE9H0cM=",
         "owner": "petertriho",
         "repo": "nvim-scrollbar",
-        "rev": "f3a5469e9881360e70d34b25333c910ee4a505f3",
+        "rev": "35f99d559041c7c0eff3a41f9093581ceea534e8",
         "type": "github"
       },
       "original": {
@@ -1439,11 +1439,11 @@
     "sqls-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1678906855,
-        "narHash": "sha256-YOCnl7pYF9gZpx6/+eeSpsv4c/TtCgUmKwPuV4k33U0=",
+        "lastModified": 1684697500,
+        "narHash": "sha256-jKFut6NZAf/eIeIkY7/2EsjsIhvZQKCKAJzeQ6XSr0s=",
         "owner": "nanotee",
         "repo": "sqls.nvim",
-        "rev": "bb70de250433ca5f6f7b617a9b3f5ab02eccf861",
+        "rev": "4b1274b5b44c48ce784aac23747192f5d9d26207",
         "type": "github"
       },
       "original": {
@@ -1503,11 +1503,11 @@
     "telescope": {
       "flake": false,
       "locked": {
-        "lastModified": 1684216929,
-        "narHash": "sha256-he+kggJjzupbmNeje27QV8h6p74IpgJreokKb9sMNAw=",
+        "lastModified": 1684993479,
+        "narHash": "sha256-FIAN3NQrD7PhrtCKnlrr//bZ259qcvGogL45nC8tLpw=",
         "owner": "nvim-telescope",
         "repo": "telescope.nvim",
-        "rev": "40c31fdde93bcd85aeb3447bb3e2a3208395a868",
+        "rev": "6d3fbffe426794296a77bb0b37b6ae0f4f14f807",
         "type": "github"
       },
       "original": {
@@ -1560,11 +1560,11 @@
     "todo-comments": {
       "flake": false,
       "locked": {
-        "lastModified": 1680261407,
-        "narHash": "sha256-Z4jaklYoU4TU/3UuK1krImqMzU6sNxJM/XWPCnNBuwo=",
+        "lastModified": 1684766073,
+        "narHash": "sha256-lHtgGzRk5OpUtlpEEEzIjyvh2DkehlB5x7S79Wzs4Ec=",
         "owner": "folke",
         "repo": "todo-comments.nvim",
-        "rev": "8febc60a76feefd8203077ef78b6a262ea1a41f9",
+        "rev": "09b0b17d824d2d56f02ff15967e8a2499a89c731",
         "type": "github"
       },
       "original": {
@@ -1576,11 +1576,11 @@
     "toggleterm-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1682361318,
-        "narHash": "sha256-G5W1XN5mXnrx3TR8/0H8nHmO6o38z9i+ZkrTz22HlxI=",
+        "lastModified": 1685434137,
+        "narHash": "sha256-Qjhod1cmzAYuMl6Z0JlYtOq8CLdmQJ9esCwmynuzkYs=",
         "owner": "akinsho",
         "repo": "toggleterm.nvim",
-        "rev": "68fdf851c2b7901a7065ff129b77d3483419ddce",
+        "rev": "cf146a267a6a7db62b1e2aff40414b20081048a1",
         "type": "github"
       },
       "original": {
@@ -1592,11 +1592,11 @@
     "tokyonight": {
       "flake": false,
       "locked": {
-        "lastModified": 1683480785,
-        "narHash": "sha256-iSPPwXkTUCtDG5GsQzaFmo+9o/E4XLiGDGLhOeRrN9E=",
+        "lastModified": 1685457678,
+        "narHash": "sha256-IMrqcx/f5cauDBxSLP1bjsaFXLBv24XXCPxpyj+Jb/E=",
         "owner": "folke",
         "repo": "tokyonight.nvim",
-        "rev": "df13e3268a44f142999fa166572fe95a650a0b37",
+        "rev": "161114bd39b990995e08dbf941f6821afbdcd666",
         "type": "github"
       },
       "original": {
@@ -1608,11 +1608,11 @@
     "trouble": {
       "flake": false,
       "locked": {
-        "lastModified": 1681796330,
-        "narHash": "sha256-kW5vRqKRUG3I5/DgWnMpXeQHbaFBcYDlzEpg2bvKAUA=",
+        "lastModified": 1685083769,
+        "narHash": "sha256-SybmV5wqIcTYSTCvgE3fHII0dsxyFU8qzXE3adCRYsI=",
         "owner": "folke",
         "repo": "trouble.nvim",
-        "rev": "d56bfc0c501ced4002a57cb60433362fb2ce9c4d",
+        "rev": "324c977cfeacb8498ca9ba1c74cc35bd18858a8d",
         "type": "github"
       },
       "original": {
@@ -1752,11 +1752,11 @@
     "which-key": {
       "flake": false,
       "locked": {
-        "lastModified": 1683810297,
-        "narHash": "sha256-XMqfkXCJV/rKn0ZqVzUV4ajEvnY992efQsJ14qJj6Gc=",
+        "lastModified": 1684766425,
+        "narHash": "sha256-wJo9XAUiru2WCeojL7aZuj0RDhkB5oClIpF/fGnXX6o=",
         "owner": "folke",
         "repo": "which-key.nvim",
-        "rev": "5a6c954a5a46023c19acc03a8b6d7c3e57964fc5",
+        "rev": "e271c28118998c93a14d189af3395812a1aa646c",
         "type": "github"
       },
       "original": {
@@ -1772,11 +1772,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1684066016,
-        "narHash": "sha256-yruKXIwISE+cuu1rz6vK49BYK3B9fiOJ888tnf1FywI=",
+        "lastModified": 1685794073,
+        "narHash": "sha256-RrZ6pH2yHhtPqhdR3aMmklOSlLIUyKx5eehDfDWdZFA=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "0ffd6ed7472e5fa79589c6bd7b8e1b8e290289ef",
+        "rev": "8746cd47d75c8533e5859bab1181b33df33c94b4",
         "type": "github"
       },
       "original": {

From f7bbfe3e3a17438916867c2a77de5226cc1f39e9 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Sat, 3 Jun 2023 17:18:26 +0300
Subject: [PATCH 105/162] feature: svelte lsp and diagnostics

---
 extra.nix                     |   1 +
 lib/types/plugins.nix         |   3 +
 modules/languages/default.nix |   1 +
 modules/languages/svelte.nix  | 144 ++++++++++++++++++++++++++++++++++
 4 files changed, 149 insertions(+)
 create mode 100644 modules/languages/svelte.nix

diff --git a/extra.nix b/extra.nix
index 550ae28..64ac3f1 100644
--- a/extra.nix
+++ b/extra.nix
@@ -54,6 +54,7 @@ inputs: let
           crates.enable = true;
         };
         ts.enable = isMaximal;
+        svelte.enable = isMaximal;
         go.enable = isMaximal;
         zig.enable = isMaximal;
         python.enable = isMaximal;
diff --git a/lib/types/plugins.nix b/lib/types/plugins.nix
index f99394f..0d31aab 100644
--- a/lib/types/plugins.nix
+++ b/lib/types/plugins.nix
@@ -81,6 +81,9 @@ with lib; let
     "project-nvim"
     "elixir-ls"
     "elixir-tools"
+    "vim-svelte"
+    "vim-javascript"
+    "vim-html"
   ];
   # You can either use the name of the plugin or a package.
   pluginsType = with types;
diff --git a/modules/languages/default.nix b/modules/languages/default.nix
index 75d08ab..0b1ac28 100644
--- a/modules/languages/default.nix
+++ b/modules/languages/default.nix
@@ -22,6 +22,7 @@ in {
     ./ts.nix
     ./zig.nix
     ./html.nix
+    ./svelte.nix
   ];
 
   options.vim.languages = {
diff --git a/modules/languages/svelte.nix b/modules/languages/svelte.nix
new file mode 100644
index 0000000..31aaf6d
--- /dev/null
+++ b/modules/languages/svelte.nix
@@ -0,0 +1,144 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.languages.svelte;
+
+  defaultServer = "svelte";
+  servers = {
+    svelte = {
+      package = pkgs.nodePackages.svelte-language-server;
+      lspConfig = ''
+        lspconfig.svelte.setup {
+          capabilities = capabilities;
+          on_attach = attach_keymaps,
+          cmd = { "${cfg.lsp.package}/bin/svelteserver", "--stdio" }
+        }
+      '';
+    };
+  };
+
+  # TODO: specify packages
+  defaultFormat = "prettier";
+  formats = {
+    prettier = {
+      package = pkgs.nodePackages.prettier;
+      nullConfig = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.prettier.with({
+            command = "${cfg.format.package}/bin/prettier",
+          })
+        )
+      '';
+    };
+  };
+
+  # TODO: specify packages
+  defaultDiagnostics = ["eslint_d"];
+  diagnostics = {
+    eslint_d = {
+      package = pkgs.nodePackages.eslint_d;
+      nullConfig = pkg: ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.diagnostics.eslint_d.with({
+            command = "${lib.getExe pkg}",
+          })
+        )
+      '';
+    };
+  };
+in {
+  options.vim.languages.svelte = {
+    enable = mkEnableOption "Svelte language support";
+
+    treesitter = {
+      enable = mkOption {
+        description = "Enable Svelte treesitter";
+        type = types.bool;
+        default = config.vim.languages.enableTreesitter;
+      };
+      sveltePackage = nvim.types.mkGrammarOption pkgs "svelte";
+    };
+
+    lsp = {
+      enable = mkOption {
+        description = "Enable Svelte LSP support";
+        type = types.bool;
+        default = config.vim.languages.enableLSP;
+      };
+      server = mkOption {
+        description = "Svelte LSP server to use";
+        type = with types; enum (attrNames servers);
+        default = defaultServer;
+      };
+      package = mkOption {
+        description = "Svelte LSP server package";
+        type = types.package;
+        default = servers.${cfg.lsp.server}.package;
+      };
+    };
+
+    format = {
+      enable = mkOption {
+        description = "Enable Svelte formatting";
+        type = types.bool;
+        default = config.vim.languages.enableFormat;
+      };
+      type = mkOption {
+        description = "Svelte formatter to use";
+        type = with types; enum (attrNames formats);
+        default = defaultFormat;
+      };
+      package = mkOption {
+        description = "Svelte formatter package";
+        type = types.package;
+        default = formats.${cfg.format.type}.package;
+      };
+    };
+
+    extraDiagnostics = {
+      enable = mkOption {
+        description = "Enable extra Svelte diagnostics";
+        type = types.bool;
+        default = config.vim.languages.enableExtraDiagnostics;
+      };
+      types = lib.nvim.types.diagnostics {
+        langDesc = "Svelte";
+        inherit diagnostics;
+        inherit defaultDiagnostics;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.sveltePackage];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.svelte-lsp = servers.${cfg.lsp.server}.lspConfig;
+    })
+
+    (mkIf cfg.format.enable {
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources.svelte-format = formats.${cfg.format.type}.nullConfig;
+    })
+
+    (mkIf cfg.extraDiagnostics.enable {
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources = lib.nvim.languages.diagnosticsToLua {
+        lang = "svelte";
+        config = cfg.extraDiagnostics.types;
+        inherit diagnostics;
+      };
+    })
+  ]);
+}

From ed251d05fa3d49d820f7aa9aab39d0ac7e8230ad Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Sat, 3 Jun 2023 17:34:07 +0300
Subject: [PATCH 106/162] docs: update release notes

---
 docs/release-notes/rl-0.4.adoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index 2598a9e..af83443 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -47,3 +47,5 @@ https://github.com/notashelf[notashelf]:
 * Updated bundled NodeJS version used by `Copilot.lua`. v16 is now marked as insecure on Nixpkgs, and we updated to v18
 
 * Enabled Catppuccin modules for plugins available by default.
+
+* Added <<opt-vim.languages.svelte>> for experimental Svelte support.

From 3362e6cf36364e950d51bd5ff134fbbe53b3b8fb Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Sun, 4 Jun 2023 08:47:41 +0300
Subject: [PATCH 107/162] feat: disable scrollbar on code action menus and
 notifications

---
 modules/visuals/config.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/visuals/config.nix b/modules/visuals/config.nix
index 452c0bd..aaad23b 100644
--- a/modules/visuals/config.nix
+++ b/modules/visuals/config.nix
@@ -52,7 +52,9 @@ in {
               'noice',
               'NvimTree',
               'alpha',
-              'code-action-menu-menu'
+              'code-action-menu-menu',
+              'code-action-menu-warning-message',
+              'notify'
             },
           }
       '';

From f1f4b80c59e1b839880a92f0b72ecda2066bc2f3 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Sun, 4 Jun 2023 09:38:46 +0300
Subject: [PATCH 108/162] docs: fix documentation

---
 docs/release-notes/rl-0.4.adoc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index af83443..21d0e8e 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -48,4 +48,6 @@ https://github.com/notashelf[notashelf]:
 
 * Enabled Catppuccin modules for plugins available by default.
 
-* Added <<opt-vim.languages.svelte>> for experimental Svelte support.
+* Added experimental Svelte support under `vim.languages`.
+
+* Removed unnecessary scrollbar element from notifications and codeaction warning UI.

From bd61b1375a7b7e4702f7ae6ff78210f34bf86ef4 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Sun, 4 Jun 2023 09:39:17 +0300
Subject: [PATCH 109/162] feat: assert failing conditions

---
 modules/assertions.nix | 30 ++++++++++++++++++------------
 modules/default.nix    |  1 +
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/modules/assertions.nix b/modules/assertions.nix
index fe55eba..3236efa 100644
--- a/modules/assertions.nix
+++ b/modules/assertions.nix
@@ -6,16 +6,22 @@
 with lib; let
   cfg = config.vim;
 in {
-  assertions = mkMerge [
-    {
-      assertion = cfg.kommentary.enable;
-      message = "Kommentary has been deprecated in favor of comments-nvim";
-    }
-    mkIf
-    (config.programs.neovim-flake.enable)
-    {
-      assertion = !config.programs.neovim.enable;
-      message = "You cannot use `programs.neovim-flake.enable` with `programs.neovim.enable`";
-    }
-  ];
+  config = {
+    assertions = mkMerge [
+      {
+        assertion = cfg.kommentary.enable;
+        message = "Kommentary has been deprecated in favor of comments-nvim";
+      }
+      {
+        assertion = cfg.utility.colorizer.enable;
+        message = "config.utility.colorizer has been renamed to config.utility.ccc";
+      }
+      mkIf
+      (config.programs.neovim-flake.enable)
+      {
+        assertion = !config.programs.neovim.enable;
+        message = "You cannot use `programs.neovim-flake.enable` with `programs.neovim.enable`";
+      }
+    ];
+  };
 }
diff --git a/modules/default.nix b/modules/default.nix
index 34d6212..f7abc9e 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -66,6 +66,7 @@ inputs: {
     };
   };
 in {
+  imports = [./assertions.nix];
   inherit (module) options config;
   inherit (module._module.args) pkgs;
   inherit neovim;

From 1cc6bb8b8ae3821faff71bfe1e9b9ba6ab60e12b Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Sun, 4 Jun 2023 09:41:10 +0300
Subject: [PATCH 110/162] feat: rename colorizer to ccc

---
 extra.nix                                     |  2 +-
 flake.lock                                    | 34 +++++------
 flake.nix                                     |  2 +-
 lib/types/plugins.nix                         |  2 +-
 modules/utility/ccc/ccc.nix                   | 13 +++++
 modules/utility/ccc/config.nix                | 58 +++++++++++++++++++
 .../utility/{colorizer => ccc}/default.nix    |  2 +-
 modules/utility/colorizer/colorizer.nix       | 11 ----
 modules/utility/colorizer/config.nix          | 15 -----
 modules/utility/default.nix                   |  2 +-
 10 files changed, 93 insertions(+), 48 deletions(-)
 create mode 100644 modules/utility/ccc/ccc.nix
 create mode 100644 modules/utility/ccc/config.nix
 rename modules/utility/{colorizer => ccc}/default.nix (68%)
 delete mode 100644 modules/utility/colorizer/colorizer.nix
 delete mode 100644 modules/utility/colorizer/config.nix

diff --git a/extra.nix b/extra.nix
index 64ac3f1..ed9bd80 100644
--- a/extra.nix
+++ b/extra.nix
@@ -152,7 +152,7 @@ inputs: let
       };
 
       vim.utility = {
-        colorizer.enable = true;
+        ccc.enable = true;
         vim-wakatime.enable = true;
         icon-picker.enable = true;
         diffview-nvim.enable = true;
diff --git a/flake.lock b/flake.lock
index ae9e2f1..6ab3a98 100644
--- a/flake.lock
+++ b/flake.lock
@@ -48,6 +48,22 @@
         "type": "github"
       }
     },
+    "ccc": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1685810171,
+        "narHash": "sha256-0/xRK6LTa7BZx2szwmBfu3fmh+CKhFbr/MQKCl3KTYc=",
+        "owner": "uga-rosa",
+        "repo": "ccc.nvim",
+        "rev": "72461f8f7496863a54b7ae1681550c22c35080a8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "uga-rosa",
+        "repo": "ccc.nvim",
+        "type": "github"
+      }
+    },
     "cellular-automaton": {
       "flake": false,
       "locked": {
@@ -192,22 +208,6 @@
         "type": "github"
       }
     },
-    "colorizer": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1684248331,
-        "narHash": "sha256-gZ1ZQsf+EkabFnDS48OFd1EfJmUeN504qeUH0jsCHdM=",
-        "owner": "uga-rosa",
-        "repo": "ccc.nvim",
-        "rev": "78aed26e18a087501be0475443b5a623adbf6290",
-        "type": "github"
-      },
-      "original": {
-        "owner": "uga-rosa",
-        "repo": "ccc.nvim",
-        "type": "github"
-      }
-    },
     "comment-nvim": {
       "flake": false,
       "locked": {
@@ -1277,6 +1277,7 @@
         "alpha-nvim": "alpha-nvim",
         "bufdelete-nvim": "bufdelete-nvim",
         "catppuccin": "catppuccin",
+        "ccc": "ccc",
         "cellular-automaton": "cellular-automaton",
         "cheatsheet-nvim": "cheatsheet-nvim",
         "cinnamon-nvim": "cinnamon-nvim",
@@ -1286,7 +1287,6 @@
         "cmp-treesitter": "cmp-treesitter",
         "cmp-vsnip": "cmp-vsnip",
         "codewindow-nvim": "codewindow-nvim",
-        "colorizer": "colorizer",
         "comment-nvim": "comment-nvim",
         "copilot-lua": "copilot-lua",
         "crates-nvim": "crates-nvim",
diff --git a/flake.nix b/flake.nix
index a47d1a9..a61adba 100644
--- a/flake.nix
+++ b/flake.nix
@@ -373,7 +373,7 @@
     };
 
     # Utilities
-    colorizer = {
+    ccc = {
       url = "github:uga-rosa/ccc.nvim";
       flake = false;
     };
diff --git a/lib/types/plugins.nix b/lib/types/plugins.nix
index 0d31aab..d5a0524 100644
--- a/lib/types/plugins.nix
+++ b/lib/types/plugins.nix
@@ -50,7 +50,7 @@ with lib; let
     "nvim-notify"
     "cinnamon-nvim"
     "cheatsheet-nvim"
-    "colorizer"
+    "ccc"
     "cellular-automaton"
     "presence-nvim"
     "icon-picker-nvim"
diff --git a/modules/utility/ccc/ccc.nix b/modules/utility/ccc/ccc.nix
new file mode 100644
index 0000000..f7366bd
--- /dev/null
+++ b/modules/utility/ccc/ccc.nix
@@ -0,0 +1,13 @@
+{lib, ...}:
+with lib;
+with builtins; {
+  options.vim.utility.ccc = {
+    enable = mkEnableOption "Enable ccc color picker for neovim";
+
+    mappings = {
+      quit = mkMappingOption "Cancel and close the UI without replace or insert" "<Esc>";
+      increase10 = mkMappingOption "Increase the value times delta of the slider" "<L>";
+      decrease10 = mkMappingOption "Decrease the value times delta of the slider" "<H>";
+    };
+  };
+}
diff --git a/modules/utility/ccc/config.nix b/modules/utility/ccc/config.nix
new file mode 100644
index 0000000..4ec2f16
--- /dev/null
+++ b/modules/utility/ccc/config.nix
@@ -0,0 +1,58 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.utility.ccc;
+  self = import ./ccc.nix {inherit lib;};
+
+  mappingDefinitions = self.options.vim.utility.ccc.mappings;
+  mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
+in {
+  config = mkIf (cfg.enable) {
+    vim.startPlugins = [
+      "ccc"
+    ];
+
+    vim.maps.normal = mkMerge [
+      (mkSetLuaBinding mappings.quit "require('ccc').mapping.quit")
+      (mkSetLuaBinding mappings.increase10 "require('ccc').mapping.increase10")
+      (mkSetLuaBinding mappings.decrease10 "require('ccc').mapping.decrease10")
+    ];
+
+    vim.luaConfigRC.ccc = nvim.dag.entryAnywhere ''
+      local ccc = require("ccc")
+      ccc.setup {
+      	highlighter = {
+      		auto_enable = true,
+      		max_byte = 2 * 1024 * 1024, -- 2mb
+      		lsp = true,
+      		filetypes = colorPickerFts,
+      	},
+      	pickers = {
+      		ccc.picker.hex,
+      		ccc.picker.css_rgb,
+      		ccc.picker.css_hsl,
+      		ccc.picker.ansi_escape {
+      			meaning1 = "bright", -- whether the 1 means bright or yellow
+      		},
+      	},
+      	alpha_show = "hide", -- needed when highlighter.lsp is set to true
+      	recognize = { output = true }, -- automatically recognize color format under cursor
+      	inputs = { ccc.input.hsl },
+      	outputs = {
+      		ccc.output.css_hsl,
+      		ccc.output.css_rgb,
+      		ccc.output.hex,
+      	},
+      	convert = {
+      		{ ccc.picker.hex, ccc.output.css_hsl },
+      		{ ccc.picker.css_rgb, ccc.output.css_hsl },
+      		{ ccc.picker.css_hsl, ccc.output.hex },
+      	},
+      }
+    '';
+  };
+}
diff --git a/modules/utility/colorizer/default.nix b/modules/utility/ccc/default.nix
similarity index 68%
rename from modules/utility/colorizer/default.nix
rename to modules/utility/ccc/default.nix
index 3b5b491..65e13e9 100644
--- a/modules/utility/colorizer/default.nix
+++ b/modules/utility/ccc/default.nix
@@ -1,6 +1,6 @@
 _: {
   imports = [
-    ./colorizer.nix
+    ./ccc.nix
     ./config.nix
   ];
 }
diff --git a/modules/utility/colorizer/colorizer.nix b/modules/utility/colorizer/colorizer.nix
deleted file mode 100644
index 565f3f6..0000000
--- a/modules/utility/colorizer/colorizer.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib;
-with builtins; {
-  options.vim.utility.colorizer = {
-    enable = mkEnableOption "Enable ccc color picker for neovim";
-  };
-}
diff --git a/modules/utility/colorizer/config.nix b/modules/utility/colorizer/config.nix
deleted file mode 100644
index 93c72dc..0000000
--- a/modules/utility/colorizer/config.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib;
-with builtins; let
-  cfg = config.vim.utility.colorizer;
-in {
-  config = mkIf (cfg.enable) {
-    vim.startPlugins = [
-      "colorizer"
-    ];
-  };
-}
diff --git a/modules/utility/default.nix b/modules/utility/default.nix
index 96589dd..ca4730c 100644
--- a/modules/utility/default.nix
+++ b/modules/utility/default.nix
@@ -4,7 +4,7 @@ _: {
     ./gestures
     ./motion
     ./telescope
-    ./colorizer
+    ./ccc
     ./icon-picker
     ./telescope
     ./diffview

From 471677d403452de37386c289d18134b00c47ee60 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Sun, 4 Jun 2023 10:24:06 +0300
Subject: [PATCH 111/162] feat: color previews via nvim-colorizer-lua

---
 extra.nix                          |  2 +-
 flake.lock                         | 17 ++++++++
 flake.nix                          |  5 +++
 lib/types/plugins.nix              |  4 +-
 modules/ui/colorizer/colorizer.nix | 67 ++++++++++++++++++++++++++++++
 modules/ui/colorizer/config.nix    | 32 ++++++++++++++
 modules/ui/colorizer/default.nix   |  6 +++
 modules/ui/default.nix             |  1 +
 8 files changed, 130 insertions(+), 4 deletions(-)
 create mode 100644 modules/ui/colorizer/colorizer.nix
 create mode 100644 modules/ui/colorizer/config.nix
 create mode 100644 modules/ui/colorizer/default.nix

diff --git a/extra.nix b/extra.nix
index ed9bd80..a91ff9b 100644
--- a/extra.nix
+++ b/extra.nix
@@ -179,11 +179,11 @@ inputs: let
       vim.ui = {
         noice.enable = true;
         smartcolumn.enable = true;
+        colorizer.enable = true;
       };
 
       vim.assistant = {
         copilot.enable = isMaximal;
-        #tabnine.enable = false; # FIXME: this is not working because the plugin depends on an internal script to be ran by the package manager
       };
 
       vim.session = {
diff --git a/flake.lock b/flake.lock
index 6ab3a98..08d8c5b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -964,6 +964,22 @@
         "type": "github"
       }
     },
+    "nvim-colorizer-lua": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1591879145,
+        "narHash": "sha256-6YrnItxExL2C8pNIdLd+hXCjsB2MbZANwWkah6dreD8=",
+        "owner": "norcalli",
+        "repo": "nvim-colorizer.lua",
+        "rev": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "norcalli",
+        "repo": "nvim-colorizer.lua",
+        "type": "github"
+      }
+    },
     "nvim-compe": {
       "flake": false,
       "locked": {
@@ -1325,6 +1341,7 @@
         "nvim-bufferline-lua": "nvim-bufferline-lua",
         "nvim-cmp": "nvim-cmp",
         "nvim-code-action-menu": "nvim-code-action-menu",
+        "nvim-colorizer-lua": "nvim-colorizer-lua",
         "nvim-compe": "nvim-compe",
         "nvim-cursorline": "nvim-cursorline",
         "nvim-lightbulb": "nvim-lightbulb",
diff --git a/flake.nix b/flake.nix
index a61adba..5498d61 100644
--- a/flake.nix
+++ b/flake.nix
@@ -451,6 +451,11 @@
       flake = false;
     };
 
+    nvim-colorizer-lua = {
+      url = "github:norcalli/nvim-colorizer.lua";
+      flake = false;
+    };
+
     # Assistant
     copilot-lua = {
       url = "github:zbirenbaum/copilot.lua";
diff --git a/lib/types/plugins.nix b/lib/types/plugins.nix
index d5a0524..c8fc593 100644
--- a/lib/types/plugins.nix
+++ b/lib/types/plugins.nix
@@ -81,9 +81,7 @@ with lib; let
     "project-nvim"
     "elixir-ls"
     "elixir-tools"
-    "vim-svelte"
-    "vim-javascript"
-    "vim-html"
+    "nvim-colorizer-lua"
   ];
   # You can either use the name of the plugin or a package.
   pluginsType = with types;
diff --git a/modules/ui/colorizer/colorizer.nix b/modules/ui/colorizer/colorizer.nix
new file mode 100644
index 0000000..48ec2bd
--- /dev/null
+++ b/modules/ui/colorizer/colorizer.nix
@@ -0,0 +1,67 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; {
+  options.vim.ui.colorizer = {
+    enable = mkEnableOption "Enable nvim-colorizer.lua for color highlighting";
+
+    options = {
+      rgb = mkOption {
+        type = types.bool;
+        default = true;
+        description = "#RGB hex codes";
+      };
+
+      rrggbb = mkOption {
+        type = types.bool;
+        default = true;
+        description = "#RRGGBB hex codes";
+      };
+
+      names = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''"Name" codes such as "Blue"'';
+      };
+
+      rgb_fn = mkOption {
+        type = types.bool;
+        default = false;
+        description = "CSS rgb() and rgba() functions";
+      };
+
+      rrggbbaa = mkOption {
+        type = types.bool;
+        default = false;
+        description = "#RRGGBBAA hex codes";
+      };
+
+      hsl_fn = mkOption {
+        type = types.bool;
+        default = false;
+        description = "CSS hsl() and hsla() functions";
+      };
+
+      css = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB";
+      };
+
+      css_fn = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Enable all CSS *functions*: rgb_fn, hsl_fn";
+      };
+
+      mode = mkOption {
+        type = types.enum ["foreground" "background"];
+        default = "background";
+        description = "Set the display mode";
+      };
+    };
+  };
+}
diff --git a/modules/ui/colorizer/config.nix b/modules/ui/colorizer/config.nix
new file mode 100644
index 0000000..2b2d743
--- /dev/null
+++ b/modules/ui/colorizer/config.nix
@@ -0,0 +1,32 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.ui.colorizer;
+in {
+  config = mkIf cfg.enable {
+    vim.startPlugins = [
+      "nvim-colorizer-lua"
+    ];
+
+    vim.luaConfigRC.colorizer = nvim.dag.entryAnywhere ''
+      require('colorizer').setup({
+         DEFAULT_OPTIONS = {
+           RGB      = ${boolToString cfg.options.rgb};
+           RRGGBB   = ${boolToString cfg.options.rrggbb};
+           names    = ${boolToString cfg.options.names};
+           RRGGBBAA = ${boolToString cfg.options.rrggbbaa};
+           rgb_fn   = ${boolToString cfg.options.rgb_fn};
+           hsl_fn   = ${boolToString cfg.options.hsl_fn};
+           css      = ${boolToString cfg.options.css};
+           css_fn   = ${boolToString cfg.options.css_fn};
+           mode     = '${toString cfg.options.mode}';
+        }
+      })
+    '';
+  };
+}
diff --git a/modules/ui/colorizer/default.nix b/modules/ui/colorizer/default.nix
new file mode 100644
index 0000000..3b5b491
--- /dev/null
+++ b/modules/ui/colorizer/default.nix
@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./colorizer.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/ui/default.nix b/modules/ui/default.nix
index 58ab015..286b3ce 100644
--- a/modules/ui/default.nix
+++ b/modules/ui/default.nix
@@ -4,5 +4,6 @@ _: {
     ./modes
     ./notifications
     ./smartcolumn
+    ./colorizer
   ];
 }

From c6bcc873a6781a53cc15eaa0ddef09eb5537a76b Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Sun, 4 Jun 2023 10:37:27 +0300
Subject: [PATCH 112/162] docs: update release notes

---
 docs/release-notes/rl-0.4.adoc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index 21d0e8e..9f3299b 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -51,3 +51,7 @@ https://github.com/notashelf[notashelf]:
 * Added experimental Svelte support under `vim.languages`.
 
 * Removed unnecessary scrollbar element from notifications and codeaction warning UI.
+
+* `vim.utility.colorizer` has been renamed to `vim.utility.ccc` after the plugin it uses
+
+* Color preview via `nvim-colorizer.lua`

From 2cfeb2276438eb64121be689c3c5806e41f6f7a9 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Sun, 4 Jun 2023 14:12:08 +0300
Subject: [PATCH 113/162] feat: implement freeform smartcolumn column positions

---
 extra.nix                              | 10 +++++++-
 lib/lua.nix                            | 22 +++++++++++++++-
 modules/ui/smartcolumn/config.nix      |  8 +-----
 modules/ui/smartcolumn/smartcolumn.nix | 35 +++++++++-----------------
 modules/utility/ccc/config.nix         | 11 ++++----
 5 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/extra.nix b/extra.nix
index a91ff9b..60d6cf9 100644
--- a/extra.nix
+++ b/extra.nix
@@ -178,7 +178,15 @@ inputs: let
 
       vim.ui = {
         noice.enable = true;
-        smartcolumn.enable = true;
+        smartcolumn = {
+          enable = true;
+          columnAt.languages = {
+            # this is a freeform module, it's `buftype = int;` for configuring column position
+            nix = 110;
+            ruby = 120;
+            java = 130;
+          };
+        };
         colorizer.enable = true;
       };
 
diff --git a/lib/lua.nix b/lib/lua.nix
index b21c459..f665159 100644
--- a/lib/lua.nix
+++ b/lib/lua.nix
@@ -1,12 +1,32 @@
 # Helpers for converting values to lua
-{lib}: {
+{lib}: rec {
+  # yes? no.
   yesNo = value:
     if value
     then "yes"
     else "no";
 
+  # Convert a null value to lua's nil
   nullString = value:
     if value == null
     then "nil"
     else "'${value}'";
+
+  # Helper function to convert an attribute name to a Lua table key
+  attrToKey = name: name;
+
+  # Function to convert a Nix attrset to a Lua table
+  attrsetToLuaTable = attrset:
+    "{ "
+    + (
+      builtins.concatStringsSep ", "
+      (builtins.attrValues (
+        builtins.mapAttrs (
+          name: value:
+            attrToKey name + " = " + ("\"" + builtins.toJSON value + "\"")
+        )
+        attrset
+      ))
+    )
+    + " }";
 }
diff --git a/modules/ui/smartcolumn/config.nix b/modules/ui/smartcolumn/config.nix
index 6d017db..afa9fc7 100644
--- a/modules/ui/smartcolumn/config.nix
+++ b/modules/ui/smartcolumn/config.nix
@@ -18,13 +18,7 @@ in {
          colorcolumn = "${toString cfg.showColumnAt}",
          -- { "help", "text", "markdown", "NvimTree", "alpha"},
          disabled_filetypes = { ${concatStringsSep ", " (map (x: "\"" + x + "\"") cfg.disabledFiletypes)} },
-         custom_colorcolumn = {
-           -- TODO: use cfg.languages.<language>.columnAt when it's fixed to dynamically define per-language length
-           ruby = "120",
-           java = "120",
-           nix = "120",
-           markdown = "80",
-         },
+         custom_colorcolumn = ${nvim.lua.attrsetToLuaTable cfg.columnAt.languages},
          scope = "file",
       })
     '';
diff --git a/modules/ui/smartcolumn/smartcolumn.nix b/modules/ui/smartcolumn/smartcolumn.nix
index cad0899..1b965a0 100644
--- a/modules/ui/smartcolumn/smartcolumn.nix
+++ b/modules/ui/smartcolumn/smartcolumn.nix
@@ -1,19 +1,8 @@
-{
-  config,
-  lib,
-  ...
-}:
+{lib, ...}:
 with lib;
-with builtins; let
-  languageOpts = {
-    columnAt = mkOption {
-      type = types.nullOr types.int;
-      default = 80;
-    };
-  };
-in {
+with builtins; {
   options.vim.ui.smartcolumn = {
-    enable = mkEnableOption "Enable smartcolumn line length indicator";
+    enable = mkEnableOption "Enable Smartcolumn line length indicator";
 
     showColumnAt = mkOption {
       type = types.nullOr types.int;
@@ -27,15 +16,15 @@ in {
       description = "The filetypes smartcolumn will be disabled for.";
     };
 
-    /*
-    languages = mkOption {
-      default = {};
-      description = "Language specific configuration.";
-      type = with types;
-        attrsOf (submodule {
-          options = languageOpts;
-        });
+    columnAt = {
+      # TODO: the current implementation only allows for options such as { ruby = "120", java = "120" }
+      # whereas the lua config would allow { ruby = "120", java = { "180", "200"} }, this needs to be fixed in the custom lib
+      languages = lib.mkOption {
+        description = "The position at which smart column should be displayed for each individual buffer type";
+        type = lib.types.submodule {
+          freeformType = with lib.types; attrsOf int;
+        };
+      };
     };
-    */
   };
 }
diff --git a/modules/utility/ccc/config.nix b/modules/utility/ccc/config.nix
index 4ec2f16..1b04618 100644
--- a/modules/utility/ccc/config.nix
+++ b/modules/utility/ccc/config.nix
@@ -16,12 +16,6 @@ in {
       "ccc"
     ];
 
-    vim.maps.normal = mkMerge [
-      (mkSetLuaBinding mappings.quit "require('ccc').mapping.quit")
-      (mkSetLuaBinding mappings.increase10 "require('ccc').mapping.increase10")
-      (mkSetLuaBinding mappings.decrease10 "require('ccc').mapping.decrease10")
-    ];
-
     vim.luaConfigRC.ccc = nvim.dag.entryAnywhere ''
       local ccc = require("ccc")
       ccc.setup {
@@ -52,6 +46,11 @@ in {
       		{ ccc.picker.css_rgb, ccc.output.css_hsl },
       		{ ccc.picker.css_hsl, ccc.output.hex },
       	},
+      	mappings = {
+      		["q"] = ccc.mapping.quit,
+      		["L"] = ccc.mapping.increase10,
+      		["H"] = ccc.mapping.decrease10,
+      	},
       }
     '';
   };

From 86fec8646d16bd6d3fe3dda13df7b7b7c3655dee Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Sun, 4 Jun 2023 17:36:01 +0300
Subject: [PATCH 114/162] feat: improved smartcolumn freeform

---
 extra.nix                              |  1 +
 lib/lua.nix                            | 22 +++++++++++++++-------
 modules/ui/smartcolumn/config.nix      | 10 +++++-----
 modules/ui/smartcolumn/smartcolumn.nix | 14 +++++++++++---
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/extra.nix b/extra.nix
index 60d6cf9..8463fb2 100644
--- a/extra.nix
+++ b/extra.nix
@@ -185,6 +185,7 @@ inputs: let
             nix = 110;
             ruby = 120;
             java = 130;
+            go = [90 130];
           };
         };
         colorizer.enable = true;
diff --git a/lib/lua.nix b/lib/lua.nix
index f665159..be285c1 100644
--- a/lib/lua.nix
+++ b/lib/lua.nix
@@ -12,21 +12,29 @@
     then "nil"
     else "'${value}'";
 
-  # Helper function to convert an attribute name to a Lua table key
-  attrToKey = name: name;
+  expToLua = exp:
+    if builtins.isList exp
+    then listToLuaTable exp
+    else if builtins.isAttrs exp
+    then attrsetToLuaTable exp
+    else ("\"" + builtins.toJSON exp + "\"");
+
+  listToLuaTable = list:
+    "{ " + (builtins.concatStringsSep ", " (map expToLua list)) + " }";
 
-  # Function to convert a Nix attrset to a Lua table
   attrsetToLuaTable = attrset:
     "{ "
     + (
       builtins.concatStringsSep ", "
-      (builtins.attrValues (
-        builtins.mapAttrs (
+      (
+        lib.mapAttrsToList (
           name: value:
-            attrToKey name + " = " + ("\"" + builtins.toJSON value + "\"")
+            name
+            + " = "
+            + (expToLua value)
         )
         attrset
-      ))
+      )
     )
     + " }";
 }
diff --git a/modules/ui/smartcolumn/config.nix b/modules/ui/smartcolumn/config.nix
index afa9fc7..6b611ad 100644
--- a/modules/ui/smartcolumn/config.nix
+++ b/modules/ui/smartcolumn/config.nix
@@ -15,11 +15,11 @@ in {
 
     vim.luaConfigRC.smartcolumn = nvim.dag.entryAnywhere ''
       require("smartcolumn").setup({
-         colorcolumn = "${toString cfg.showColumnAt}",
-         -- { "help", "text", "markdown", "NvimTree", "alpha"},
-         disabled_filetypes = { ${concatStringsSep ", " (map (x: "\"" + x + "\"") cfg.disabledFiletypes)} },
-         custom_colorcolumn = ${nvim.lua.attrsetToLuaTable cfg.columnAt.languages},
-         scope = "file",
+        colorcolumn = "${toString cfg.showColumnAt}",
+        -- { "help", "text", "markdown", "NvimTree", "alpha"},
+        disabled_filetypes = { ${concatStringsSep ", " (map (x: "\"" + x + "\"") cfg.disabledFiletypes)} },
+        custom_colorcolumn = ${nvim.lua.attrsetToLuaTable cfg.columnAt.languages},
+        scope = "file",
       })
     '';
   };
diff --git a/modules/ui/smartcolumn/smartcolumn.nix b/modules/ui/smartcolumn/smartcolumn.nix
index 1b965a0..349bf48 100644
--- a/modules/ui/smartcolumn/smartcolumn.nix
+++ b/modules/ui/smartcolumn/smartcolumn.nix
@@ -17,13 +17,21 @@ with builtins; {
     };
 
     columnAt = {
-      # TODO: the current implementation only allows for options such as { ruby = "120", java = "120" }
-      # whereas the lua config would allow { ruby = "120", java = { "180", "200"} }, this needs to be fixed in the custom lib
       languages = lib.mkOption {
         description = "The position at which smart column should be displayed for each individual buffer type";
         type = lib.types.submodule {
-          freeformType = with lib.types; attrsOf int;
+          freeformType = with lib.types; attrsOf (either int (listOf int));
         };
+
+        example = lib.literalExpression ''
+          vim.ui.smartcolumn.columnAt.languages = {
+            nix = 110;
+            ruby = 120;
+            java = 130;
+            go = [90 130];
+          };
+
+        '';
       };
     };
   };

From 1f78026cc0cff56fb6798f2a585465b807295944 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Mon, 5 Jun 2023 21:36:43 +0300
Subject: [PATCH 115/162] docs: update contribution guidelines

---
 .github/CONTRIBUTING.md | 70 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 68 insertions(+), 2 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 9d24607..19f0287 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -18,13 +18,77 @@ If you have any questions regarding those files, feel free to open an issue or [
 
 The contribution process is mostly documented in the [pull request template](.github/pull_request_template.md). You will find a checklist of items to complete before submitting a pull request. Please make sure you complete it before submitting a pull request. If you are unsure about any of the items, please ask.
 
-## Code of Conduct
+### Code of Conduct
 
 This project does not quite have a code of conduct yet. And to be honest, I'm not sure if I want one. I'm not expecting this project to be a hotbed of activity, but I do want to make sure that everyone who does contribute feels welcome and safe. As such, I will do my best to make sure that those who distrupt the project are dealt with swiftly and appropriately.
 
 If you feel that you are not being treated with respect, please contact me directly.
 
-## Custom key mappings support for a plugin
+### Guidelines
+
+Here are the overall boundaries I would like you to follow while contributing to neovim-flake.
+
+#### Documentation
+
+If you are making a pull request to add a 
+
+
+#### Style
+
+**Nix**
+We use Alejandra for formatting nix code, which can be invoked directly with `nix fmt` in the repository. 
+
+While Alejandra is mostly opinionated on how code looks after formatting, certain formattings are done at the user's discretion.
+
+Please use one line code for attribute sets that contain only one subset.
+For example:
+
+```nix 
+# parent modules should always be unfolded
+module = { 
+    value = mkEnableOption "some description" // { default = true; };
+    # same as parent modules, unfold submodules
+    subModule = {
+        # this is an option that contains more than one nested value
+        someOtherValue = mkOption {
+            type = lib.types.bool;
+            description = "Some other description"
+            default = true;
+        };
+    };
+}
+```
+
+If you move a line down after the merge operator, Alejandra will automatically unfold the whole merged attrset for you, which we do not want.
+
+```nix
+module = {
+    key = mkEnableOption "some description" // {
+        default = true; # we want this to be inline
+    }; 
+    # ...
+}
+```
+
+For lists, it's up mostly to your discretion but please try to avoid unfolded lists if there is only one item in the list.
+```nix
+
+# ok 
+acceptableList = [
+    item1
+    item2
+    item3
+    item4
+];
+
+# not ok
+listToBeAvoided = [item1 item2 item3 item4];
+```
+
+*This will be moved elsewhere, disregard unless you are adding a new plugin with keybinds*
+#### Keybinds
+
+#####  Custom key mappings support for a plugin
 
 To add custom keymappings to a plugin, a couple of helper functions are available in the project.
 
@@ -173,3 +237,5 @@ in {
 ```
 
 If you have come across a plugin that has an API that doesn't seem to easily allow custom keybindings, don't be scared to implement a draft PR. We'll help you get it done.
+
+

From 9781a1071da87aeaa5aafd3f0f89d8ac40908d77 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Mon, 5 Jun 2023 21:36:53 +0300
Subject: [PATCH 116/162] chore: default flake formatter

---
 flake.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flake.nix b/flake.nix
index 5498d61..62053c6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,6 +49,7 @@
         ...
       }: {
         devShells.default = pkgs.mkShell {nativeBuildInputs = [config.packages.nix];};
+        formatter = pkgs.alejandra;
       };
     };
 

From 6891c86c58459798159519e534659cda55f8b575 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Mon, 5 Jun 2023 21:37:12 +0300
Subject: [PATCH 117/162] docs: add comments to lua converters

---
 lib/lua.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/lua.nix b/lib/lua.nix
index be285c1..75f96e1 100644
--- a/lib/lua.nix
+++ b/lib/lua.nix
@@ -12,6 +12,7 @@
     then "nil"
     else "'${value}'";
 
+  # convert an expression to lua
   expToLua = exp:
     if builtins.isList exp
     then listToLuaTable exp
@@ -19,9 +20,11 @@
     then attrsetToLuaTable exp
     else ("\"" + builtins.toJSON exp + "\"");
 
+  # convert list to a lua table
   listToLuaTable = list:
     "{ " + (builtins.concatStringsSep ", " (map expToLua list)) + " }";
 
+  # convert attrset to a lua table
   attrsetToLuaTable = attrset:
     "{ "
     + (

From 5cef662ccf6d54d75bb3f7126541f003f50eba30 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Mon, 5 Jun 2023 23:10:07 +0300
Subject: [PATCH 118/162] dev: move colorizer option to the correct module

---
 extra.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra.nix b/extra.nix
index 8463fb2..32d96e7 100644
--- a/extra.nix
+++ b/extra.nix
@@ -178,6 +178,7 @@ inputs: let
 
       vim.ui = {
         noice.enable = true;
+        colorizer.enable = true;
         smartcolumn = {
           enable = true;
           columnAt.languages = {
@@ -188,7 +189,6 @@ inputs: let
             go = [90 130];
           };
         };
-        colorizer.enable = true;
       };
 
       vim.assistant = {

From a2b58e17af8f2cbb54c905d5c18052b8afbf884b Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Mon, 5 Jun 2023 23:10:25 +0300
Subject: [PATCH 119/162] docs: fix mkEnableOption usage for autogenerated
 documentation

---
 modules/assistant/copilot/copilot.nix         |  2 +-
 modules/assistant/tabnine/tabnine.nix         |  2 +-
 .../nvim-autopairs/nvim-autopairs.nix         | 12 +--
 modules/basic/module.nix                      |  4 +-
 .../comments/comment-nvim/comment-nvim.nix    |  2 +-
 modules/completion/nvim-cmp/nvim-cmp.nix      |  6 +-
 modules/dashboard/alpha/alpha.nix             |  2 +-
 .../dashboard-nvim/dashboard-nvim.nix         |  2 +-
 modules/dashboard/startify/startify.nix       |  2 +-
 .../filetree/nvimtree-lua/nvimtree-lua.nix    |  6 +-
 modules/git/git.nix                           |  2 +-
 modules/languages/clang.nix                   | 15 ++--
 modules/languages/dart/dart.nix               |  8 +-
 modules/languages/elixir/elixir-tools.nix     |  2 +-
 modules/languages/go.nix                      | 15 ++--
 modules/languages/markdown/markdown.nix       |  2 +-
 modules/languages/nix.nix                     | 14 +---
 modules/languages/python.nix                  | 22 ++---
 modules/languages/rust.nix                    | 14 +---
 modules/languages/sql.nix                     | 30 +++----
 modules/languages/svelte.nix                  | 30 +++----
 modules/languages/tidal/tidal.nix             |  2 +-
 modules/languages/ts.nix                      | 29 ++-----
 modules/languages/zig.nix                     | 15 ++--
 modules/minimap/codewindow/codewindow.nix     |  2 +-
 modules/minimap/minimap-vim/minimap-vim.nix   |  2 +-
 modules/notes/mind-nvim/mind-nvim.nix         |  2 +-
 modules/notes/obsidian/obsidian.nix           |  2 +-
 modules/notes/orgmode/orgmode.nix             |  6 +-
 modules/notes/todo-comments/todo-comments.nix |  2 +-
 modules/projects/project-nvim/config.nix      | 82 ++++++++-----------
 .../projects/project-nvim/project-nvim.nix    | 82 +++++++++++--------
 .../presence-nvim/presence-nvim.nix           |  2 +-
 .../nvim-session-manager.nix                  |  2 +-
 modules/snippets/vsnip/vsnip.nix              | 11 +--
 modules/statusline/lualine/lualine.nix        | 21 ++---
 .../nvim-bufferline/nvim-bufferline.nix       |  4 +-
 modules/terminal/toggleterm/toggleterm.nix    |  6 +-
 modules/ui/colorizer/colorizer.nix            |  2 +-
 modules/ui/modes/modes.nix                    |  2 +-
 modules/ui/noice/noice.nix                    |  2 +-
 .../notifications/nvim-notify/nvim-notify.nix |  8 +-
 modules/ui/smartcolumn/smartcolumn.nix        |  2 +-
 .../utility/binds/cheatsheet/cheatsheet.nix   |  2 +-
 modules/utility/binds/which-key/which-key.nix |  8 +-
 modules/utility/ccc/ccc.nix                   |  2 +-
 modules/utility/diffview/diffview.nix         |  8 +-
 .../gestures/gesture-nvim/gesture-nvim.nix    |  2 +-
 modules/utility/icon-picker/icon-picker.nix   |  8 +-
 modules/utility/motion/hop/hop.nix            |  2 +-
 modules/utility/motion/leap/leap.nix          |  2 +-
 modules/utility/telescope/config.nix          |  5 ++
 modules/utility/telescope/telescope.nix       |  4 +-
 modules/utility/wakatime/vim-wakatime.nix     |  2 +-
 modules/visuals/visuals.nix                   | 31 ++-----
 55 files changed, 225 insertions(+), 333 deletions(-)

diff --git a/modules/assistant/copilot/copilot.nix b/modules/assistant/copilot/copilot.nix
index 9cd8dab..003308a 100644
--- a/modules/assistant/copilot/copilot.nix
+++ b/modules/assistant/copilot/copilot.nix
@@ -9,7 +9,7 @@ with builtins; let
   cfg = config.vim.assistant.copilot;
 in {
   options.vim.assistant.copilot = {
-    enable = mkEnableOption "Enable GitHub Copilot";
+    enable = mkEnableOption "GitHub Copilot AI assistant";
 
     panel = {
       position = mkOption {
diff --git a/modules/assistant/tabnine/tabnine.nix b/modules/assistant/tabnine/tabnine.nix
index b977cef..0682f79 100644
--- a/modules/assistant/tabnine/tabnine.nix
+++ b/modules/assistant/tabnine/tabnine.nix
@@ -2,7 +2,7 @@
 with lib;
 with builtins; {
   options.vim.assistant.tabnine = {
-    enable = mkEnableOption "Enable TabNine assistant";
+    enable = mkEnableOption "Tabnine assistant";
 
     disable_auto_comment = mkOption {
       type = types.bool;
diff --git a/modules/autopairs/nvim-autopairs/nvim-autopairs.nix b/modules/autopairs/nvim-autopairs/nvim-autopairs.nix
index 1b3f8b7..9dc8c64 100644
--- a/modules/autopairs/nvim-autopairs/nvim-autopairs.nix
+++ b/modules/autopairs/nvim-autopairs/nvim-autopairs.nix
@@ -1,17 +1,9 @@
-{
-  lib,
-  config,
-  ...
-}:
+{lib, ...}:
 with lib;
 with builtins; {
   options.vim = {
     autopairs = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable autopairs";
-      };
+      enable = mkEnableOption "autopairs" // {default = false;};
 
       type = mkOption {
         type = types.enum ["nvim-autopairs"];
diff --git a/modules/basic/module.nix b/modules/basic/module.nix
index e93c4d4..3db8dfe 100644
--- a/modules/basic/module.nix
+++ b/modules/basic/module.nix
@@ -7,7 +7,7 @@ with lib;
 with builtins; {
   options.vim = {
     debugMode = {
-      enable = mkEnableOption "Enable debug mode";
+      enable = mkEnableOption "debug mode";
       level = mkOption {
         type = types.int;
         default = 20;
@@ -151,6 +151,6 @@ with builtins; {
       description = "Highlight the text line of the cursor with CursorLine hl-CursorLine";
     };
 
-    enableLuaLoader = mkEnableOption "Enable the experimental Lua module loader to speed up the start up process";
+    enableLuaLoader = mkEnableOption "experimental Lua module loader to speed up the start up process";
   };
 }
diff --git a/modules/comments/comment-nvim/comment-nvim.nix b/modules/comments/comment-nvim/comment-nvim.nix
index 6ffbce0..29646ac 100644
--- a/modules/comments/comment-nvim/comment-nvim.nix
+++ b/modules/comments/comment-nvim/comment-nvim.nix
@@ -2,7 +2,7 @@
 with lib;
 with builtins; {
   options.vim.comments.comment-nvim = {
-    enable = mkEnableOption "Enable comment-nvim";
+    enable = mkEnableOption "smart and powerful comment plugin for neovim comment-nvim";
 
     mappings = {
       toggleCurrentLine = mkMappingOption "Toggle current line comment" "gcc";
diff --git a/modules/completion/nvim-cmp/nvim-cmp.nix b/modules/completion/nvim-cmp/nvim-cmp.nix
index 8011feb..fa7041b 100644
--- a/modules/completion/nvim-cmp/nvim-cmp.nix
+++ b/modules/completion/nvim-cmp/nvim-cmp.nix
@@ -3,11 +3,7 @@ with lib;
 with builtins; {
   options.vim = {
     autocomplete = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = "enable autocomplete";
-      };
+      enable = mkEnableOption "enable autocomplete" // {default = false;};
 
       mappings = {
         complete = mkMappingOption "Complete [nvim-cmp]" "<C-Space>";
diff --git a/modules/dashboard/alpha/alpha.nix b/modules/dashboard/alpha/alpha.nix
index 40edafb..48b8bfa 100644
--- a/modules/dashboard/alpha/alpha.nix
+++ b/modules/dashboard/alpha/alpha.nix
@@ -6,6 +6,6 @@
 with lib;
 with builtins; {
   options.vim.dashboard.alpha = {
-    enable = mkEnableOption "Enable alpha.nvim";
+    enable = mkEnableOption "dashboard via alpha.nvim";
   };
 }
diff --git a/modules/dashboard/dashboard-nvim/dashboard-nvim.nix b/modules/dashboard/dashboard-nvim/dashboard-nvim.nix
index e74e39e..6823deb 100644
--- a/modules/dashboard/dashboard-nvim/dashboard-nvim.nix
+++ b/modules/dashboard/dashboard-nvim/dashboard-nvim.nix
@@ -6,6 +6,6 @@
 with lib;
 with builtins; {
   options.vim.dashboard.dashboard-nvim = {
-    enable = mkEnableOption "Enable dashboard.nvim";
+    enable = mkEnableOption "dashboard via dashboard.nvim";
   };
 }
diff --git a/modules/dashboard/startify/startify.nix b/modules/dashboard/startify/startify.nix
index 5d75964..de208cd 100644
--- a/modules/dashboard/startify/startify.nix
+++ b/modules/dashboard/startify/startify.nix
@@ -6,7 +6,7 @@
 with builtins;
 with lib; {
   options.vim.dashboard.startify = {
-    enable = mkEnableOption "Enable vim-startify";
+    enable = mkEnableOption "dashboard via vim-startify";
 
     bookmarks = mkOption {
       default = [];
diff --git a/modules/filetree/nvimtree-lua/nvimtree-lua.nix b/modules/filetree/nvimtree-lua/nvimtree-lua.nix
index d4d167e..4fe9d6f 100644
--- a/modules/filetree/nvimtree-lua/nvimtree-lua.nix
+++ b/modules/filetree/nvimtree-lua/nvimtree-lua.nix
@@ -6,11 +6,7 @@
 with lib;
 with builtins; {
   options.vim.filetree.nvimTreeLua = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enable nvim-tree-lua";
-    };
+    enable = mkEnableOption "filetree via nvim-tree-lua" // {default = false;};
 
     mappings = {
       toggle = mkOption {
diff --git a/modules/git/git.nix b/modules/git/git.nix
index 51f162f..c9d059e 100644
--- a/modules/git/git.nix
+++ b/modules/git/git.nix
@@ -2,7 +2,7 @@
 with lib;
 with builtins; {
   options.vim.git = {
-    enable = mkEnableOption "Git support";
+    enable = mkEnableOption "git tools via gitsigns";
 
     gitsigns = {
       enable = mkEnableOption "gitsigns";
diff --git a/modules/languages/clang.nix b/modules/languages/clang.nix
index a779dd5..c7f421f 100644
--- a/modules/languages/clang.nix
+++ b/modules/languages/clang.nix
@@ -47,31 +47,26 @@ in {
     };
 
     treesitter = {
-      enable = mkOption {
-        description = "Enable C/C++ treesitter";
-        type = types.bool;
-        default = config.vim.languages.enableTreesitter;
-      };
+      enable = mkEnableOption "C/C++ treesitter" // {default = config.vim.languages.enableTreesitter;};
       cPackage = nvim.types.mkGrammarOption pkgs "c";
       cppPackage = nvim.types.mkGrammarOption pkgs "cpp";
     };
 
     lsp = {
-      enable = mkOption {
-        description = "Enable clang LSP support";
-        type = types.bool;
-        default = config.vim.languages.enableLSP;
-      };
+      enable = mkEnableOption "Enable clang LSP support" // {default = config.vim.languages.enableLSP;};
+
       server = mkOption {
         description = "The clang LSP server to use";
         type = with types; enum (attrNames servers);
         default = defaultServer;
       };
+
       package = mkOption {
         description = "clang LSP server package";
         type = types.package;
         default = servers.${cfg.lsp.server}.package;
       };
+
       opts = mkOption {
         description = "Options to pass to clang LSP server";
         type = with types; nullOr str;
diff --git a/modules/languages/dart/dart.nix b/modules/languages/dart/dart.nix
index bc11d2c..728e64d 100644
--- a/modules/languages/dart/dart.nix
+++ b/modules/languages/dart/dart.nix
@@ -26,16 +26,12 @@ in {
     enable = mkEnableOption "Dart language support";
 
     treesitter = {
-      enable = mkOption {
-        description = "Enable Dart treesitter";
-        type = types.bool;
-        default = config.vim.languages.enableTreesitter;
-      };
+      enable = mkEnableOption "Enable Dart treesitter" // {default = config.vim.languages.enableTreesitter;};
       package = nvim.types.mkGrammarOption pkgs "dart";
     };
 
     lsp = {
-      enable = mkEnableOption "Enable Dart LSP support";
+      enable = mkEnableOption "Dart LSP support";
       server = mkOption {
         description = "The Dart LSP server to use";
         type = with types; enum (attrNames servers);
diff --git a/modules/languages/elixir/elixir-tools.nix b/modules/languages/elixir/elixir-tools.nix
index 83da10f..5232acb 100644
--- a/modules/languages/elixir/elixir-tools.nix
+++ b/modules/languages/elixir/elixir-tools.nix
@@ -6,6 +6,6 @@
 with lib;
 with builtins; {
   options.vim.languages.elixir = {
-    enable = mkEnableOption "elixir support";
+    enable = mkEnableOption "Elixir language support";
   };
 }
diff --git a/modules/languages/go.nix b/modules/languages/go.nix
index f63a6f4..9944006 100644
--- a/modules/languages/go.nix
+++ b/modules/languages/go.nix
@@ -26,25 +26,20 @@ in {
     enable = mkEnableOption "Go language support";
 
     treesitter = {
-      enable = mkOption {
-        description = "Enable Go treesitter";
-        type = types.bool;
-        default = config.vim.languages.enableTreesitter;
-      };
+      enable = mkEnableOption "Enable Go treesitter" // {default = config.vim.languages.enableTreesitter;};
+
       package = nvim.types.mkGrammarOption pkgs "go";
     };
 
     lsp = {
-      enable = mkOption {
-        description = "Enable Go LSP support";
-        type = types.bool;
-        default = config.vim.languages.enableLSP;
-      };
+      enable = mkEnableOption "Enable Go LSP support" // {default = config.vim.languages.enableLSP;};
+
       server = mkOption {
         description = "Go LSP server to use";
         type = with types; enum (attrNames servers);
         default = defaultServer;
       };
+
       package = mkOption {
         description = "Go LSP server package";
         type = types.package;
diff --git a/modules/languages/markdown/markdown.nix b/modules/languages/markdown/markdown.nix
index d81cb1b..551a655 100644
--- a/modules/languages/markdown/markdown.nix
+++ b/modules/languages/markdown/markdown.nix
@@ -9,7 +9,7 @@ with builtins; let
   cfg = config.vim.languages.markdown;
 in {
   options.vim.languages.markdown = {
-    enable = mkEnableOption "Markdown language support";
+    enable = mkEnableOption "Markdown markup language support";
 
     glow.enable = mkOption {
       type = types.bool;
diff --git a/modules/languages/nix.nix b/modules/languages/nix.nix
index c6dae73..4a1c892 100644
--- a/modules/languages/nix.nix
+++ b/modules/languages/nix.nix
@@ -96,11 +96,8 @@ in {
     };
 
     lsp = {
-      enable = mkOption {
-        description = "Enable Nix LSP support";
-        type = types.bool;
-        default = config.vim.languages.enableLSP;
-      };
+      enable = mkEnableOption "Enable Nix LSP support" // {default = config.vim.languages.enableLSP;};
+
       server = mkOption {
         description = "Nix LSP server to use";
         type = types.str;
@@ -114,11 +111,8 @@ in {
     };
 
     format = {
-      enable = mkOption {
-        description = "Enable Nix formatting";
-        type = types.bool;
-        default = config.vim.languages.enableFormat;
-      };
+      enable = mkEnableOption "Enable Nix formatting" // {default = config.vim.languages.enableFormat;};
+
       type = mkOption {
         description = "Nix formatter to use";
         type = with types; enum (attrNames formats);
diff --git a/modules/languages/python.nix b/modules/languages/python.nix
index 367391e..d25e7c1 100644
--- a/modules/languages/python.nix
+++ b/modules/languages/python.nix
@@ -41,11 +41,7 @@ in {
     enable = mkEnableOption "Python language support";
 
     treesitter = {
-      enable = mkOption {
-        description = "Enable Python treesitter";
-        type = types.bool;
-        default = config.vim.languages.enableTreesitter;
-      };
+      enable = mkEnableOption "Enable Python treesitter" // {default = config.vim.languages.enableTreesitter;};
       package = mkOption {
         description = "Python treesitter grammar to use";
         type = types.package;
@@ -54,16 +50,14 @@ in {
     };
 
     lsp = {
-      enable = mkOption {
-        description = "Enable Python LSP support";
-        type = types.bool;
-        default = config.vim.languages.enableLSP;
-      };
+      enable = mkEnableOption "Enable Python LSP support" // {default = config.vim.languages.enableLSP;};
+
       server = mkOption {
         description = "Python LSP server to use";
         type = with types; enum (attrNames servers);
         default = defaultServer;
       };
+
       package = mkOption {
         description = "python LSP server package";
         type = types.package;
@@ -72,16 +66,14 @@ in {
     };
 
     format = {
-      enable = mkOption {
-        description = "Enable Python formatting";
-        type = types.bool;
-        default = config.vim.languages.enableFormat;
-      };
+      enable = mkEnableOption "Enable Python formatting" // {default = config.vim.languages.enableFormat;};
+
       type = mkOption {
         description = "Python formatter to use";
         type = with types; enum (attrNames formats);
         default = defaultFormat;
       };
+
       package = mkOption {
         description = "Python formatter package";
         type = types.package;
diff --git a/modules/languages/rust.nix b/modules/languages/rust.nix
index 25930cd..1298c9f 100644
--- a/modules/languages/rust.nix
+++ b/modules/languages/rust.nix
@@ -12,11 +12,7 @@ in {
     enable = mkEnableOption "Rust language support";
 
     treesitter = {
-      enable = mkOption {
-        description = "Enable Rust treesitter";
-        type = types.bool;
-        default = config.vim.languages.enableTreesitter;
-      };
+      enable = mkEnableOption "Enable Rust treesitter" // {default = config.vim.languages.enableTreesitter;};
       package = nvim.types.mkGrammarOption pkgs "rust";
     };
 
@@ -30,16 +26,14 @@ in {
     };
 
     lsp = {
-      enable = mkOption {
-        description = "Rust LSP support (rust-analyzer with extra tools)";
-        type = types.bool;
-        default = config.vim.languages.enableLSP;
-      };
+      enable = mkEnableOption "Rust LSP support (rust-analyzer with extra tools)" // {default = config.vim.languages.enableLSP;};
+
       package = mkOption {
         description = "rust-analyzer package";
         type = types.package;
         default = pkgs.rust-analyzer;
       };
+
       opts = mkOption {
         description = "Options to pass to rust analyzer";
         type = types.str;
diff --git a/modules/languages/sql.nix b/modules/languages/sql.nix
index 0b03cbc..4093ec9 100644
--- a/modules/languages/sql.nix
+++ b/modules/languages/sql.nix
@@ -68,11 +68,8 @@ in {
     };
 
     treesitter = {
-      enable = mkOption {
-        description = "Enable SQL treesitter";
-        type = types.bool;
-        default = config.vim.languages.enableTreesitter;
-      };
+      enable = mkEnableOption "Enable SQL treesitter" // {default = config.vim.languages.enableTreesitter;};
+
       package = mkOption {
         description = "SQL treesitter grammar to use";
         type = types.package;
@@ -81,16 +78,14 @@ in {
     };
 
     lsp = {
-      enable = mkOption {
-        description = "Enable SQL LSP support";
-        type = types.bool;
-        default = config.vim.languages.enableLSP;
-      };
+      enable = mkEnableOption "Enable SQL LSP support" // {default = config.vim.languages.enableLSP;};
+
       server = mkOption {
         description = "SQL LSP server to use";
         type = with types; enum (attrNames servers);
         default = defaultServer;
       };
+
       package = mkOption {
         description = "SQL LSP server package";
         type = types.package;
@@ -99,16 +94,14 @@ in {
     };
 
     format = {
-      enable = mkOption {
-        description = "Enable SQL formatting";
-        type = types.bool;
-        default = config.vim.languages.enableFormat;
-      };
+      enable = mkEnableOption "Enable SQL formatting" // {default = config.vim.languages.enableFormat;};
+
       type = mkOption {
         description = "SQL formatter to use";
         type = with types; enum (attrNames formats);
         default = defaultFormat;
       };
+
       package = mkOption {
         description = "SQL formatter package";
         type = types.package;
@@ -117,11 +110,8 @@ in {
     };
 
     extraDiagnostics = {
-      enable = mkOption {
-        description = "Enable extra SQL diagnostics";
-        type = types.bool;
-        default = config.vim.languages.enableExtraDiagnostics;
-      };
+      enable = mkEnableOption "Enable extra SQL diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;};
+
       types = lib.nvim.types.diagnostics {
         langDesc = "SQL";
         inherit diagnostics;
diff --git a/modules/languages/svelte.nix b/modules/languages/svelte.nix
index 31aaf6d..a300f05 100644
--- a/modules/languages/svelte.nix
+++ b/modules/languages/svelte.nix
@@ -58,25 +58,20 @@ in {
     enable = mkEnableOption "Svelte language support";
 
     treesitter = {
-      enable = mkOption {
-        description = "Enable Svelte treesitter";
-        type = types.bool;
-        default = config.vim.languages.enableTreesitter;
-      };
+      enable = mkEnableOption "Enable Svelte treesitter" // {default = config.vim.languages.enableTreesitter;};
+
       sveltePackage = nvim.types.mkGrammarOption pkgs "svelte";
     };
 
     lsp = {
-      enable = mkOption {
-        description = "Enable Svelte LSP support";
-        type = types.bool;
-        default = config.vim.languages.enableLSP;
-      };
+      enable = mkEnableOption "Enable Svelte LSP support" // {default = config.vim.languages.enableLSP;};
+
       server = mkOption {
         description = "Svelte LSP server to use";
         type = with types; enum (attrNames servers);
         default = defaultServer;
       };
+
       package = mkOption {
         description = "Svelte LSP server package";
         type = types.package;
@@ -85,16 +80,14 @@ in {
     };
 
     format = {
-      enable = mkOption {
-        description = "Enable Svelte formatting";
-        type = types.bool;
-        default = config.vim.languages.enableFormat;
-      };
+      enable = mkEnableOption "Enable Svelte formatting" // {default = config.vim.languages.enableFormat;};
+
       type = mkOption {
         description = "Svelte formatter to use";
         type = with types; enum (attrNames formats);
         default = defaultFormat;
       };
+
       package = mkOption {
         description = "Svelte formatter package";
         type = types.package;
@@ -103,11 +96,8 @@ in {
     };
 
     extraDiagnostics = {
-      enable = mkOption {
-        description = "Enable extra Svelte diagnostics";
-        type = types.bool;
-        default = config.vim.languages.enableExtraDiagnostics;
-      };
+      enable = mkEnableOption "Enable extra Svelte diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;};
+
       types = lib.nvim.types.diagnostics {
         langDesc = "Svelte";
         inherit diagnostics;
diff --git a/modules/languages/tidal/tidal.nix b/modules/languages/tidal/tidal.nix
index 9554571..5bcd255 100644
--- a/modules/languages/tidal/tidal.nix
+++ b/modules/languages/tidal/tidal.nix
@@ -6,7 +6,7 @@
 with lib;
 with builtins; {
   options.vim.tidal = {
-    enable = mkEnableOption "Enable tidalcycles tools and plugins";
+    enable = mkEnableOption "tidalcycles tools and plugins";
 
     flash = mkOption {
       description = ''When sending a paragraph or a single line, vim-tidal will "flash" the selection for some milliseconds'';
diff --git a/modules/languages/ts.nix b/modules/languages/ts.nix
index 940f8d9..3989b47 100644
--- a/modules/languages/ts.nix
+++ b/modules/languages/ts.nix
@@ -58,26 +58,20 @@ in {
     enable = mkEnableOption "Typescript/Javascript language support";
 
     treesitter = {
-      enable = mkOption {
-        description = "Enable Typescript/Javascript treesitter";
-        type = types.bool;
-        default = config.vim.languages.enableTreesitter;
-      };
+      enable = mkEnableOption "Enable Typescript/Javascript treesitter" // {default = config.vim.languages.enableTreesitter;};
       tsPackage = nvim.types.mkGrammarOption pkgs "tsx";
       jsPackage = nvim.types.mkGrammarOption pkgs "javascript";
     };
 
     lsp = {
-      enable = mkOption {
-        description = "Enable Typescript/Javascript LSP support";
-        type = types.bool;
-        default = config.vim.languages.enableLSP;
-      };
+      enable = mkEnableOption "Enable Typescript/Javascript LSP support" // {default = config.vim.languages.enableLSP;};
+
       server = mkOption {
         description = "Typescript/Javascript LSP server to use";
         type = with types; enum (attrNames servers);
         default = defaultServer;
       };
+
       package = mkOption {
         description = "Typescript/Javascript LSP server package";
         type = types.package;
@@ -86,16 +80,14 @@ in {
     };
 
     format = {
-      enable = mkOption {
-        description = "Enable Typescript/Javascript formatting";
-        type = types.bool;
-        default = config.vim.languages.enableFormat;
-      };
+      enable = mkEnableOption "Enable Typescript/Javascript formatting" // {default = config.vim.languages.enableFormat;};
+
       type = mkOption {
         description = "Typescript/Javascript formatter to use";
         type = with types; enum (attrNames formats);
         default = defaultFormat;
       };
+
       package = mkOption {
         description = "Typescript/Javascript formatter package";
         type = types.package;
@@ -104,11 +96,8 @@ in {
     };
 
     extraDiagnostics = {
-      enable = mkOption {
-        description = "Enable extra Typescript/Javascript diagnostics";
-        type = types.bool;
-        default = config.vim.languages.enableExtraDiagnostics;
-      };
+      enable = mkEnableOption "Enable extra Typescript/Javascript diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;};
+
       types = lib.nvim.types.diagnostics {
         langDesc = "Typescript/Javascript";
         inherit diagnostics;
diff --git a/modules/languages/zig.nix b/modules/languages/zig.nix
index 02410be..2c8bf0f 100644
--- a/modules/languages/zig.nix
+++ b/modules/languages/zig.nix
@@ -12,24 +12,19 @@ in {
     enable = mkEnableOption "SQL language support";
 
     treesitter = {
-      enable = mkOption {
-        description = "Enable Zig treesitter";
-        type = types.bool;
-        default = config.vim.languages.enableTreesitter;
-      };
+      enable = mkEnableOption "Enable Zig treesitter" // {default = config.vim.languages.enableTreesitter;};
       package = nvim.types.mkGrammarOption pkgs "zig";
     };
+
     lsp = {
-      enable = mkOption {
-        description = "Zig LSP support (zls)";
-        type = types.bool;
-        default = config.vim.languages.enableLSP;
-      };
+      enable = mkEnableOption "Zig LSP support (zls)" // {default = config.vim.languages.enableLSP;};
+
       package = mkOption {
         description = "ZLS package";
         type = types.package;
         default = pkgs.zls;
       };
+
       zigPackage = mkOption {
         description = "Zig package used by ZLS";
         type = types.package;
diff --git a/modules/minimap/codewindow/codewindow.nix b/modules/minimap/codewindow/codewindow.nix
index 802673e..d67762b 100644
--- a/modules/minimap/codewindow/codewindow.nix
+++ b/modules/minimap/codewindow/codewindow.nix
@@ -1,7 +1,7 @@
 {lib, ...}:
 with lib; {
   options.vim.minimap.codewindow = {
-    enable = mkEnableOption "Enable codewindow plugin for minimap view";
+    enable = mkEnableOption "codewindow plugin for minimap view";
 
     mappings = {
       open = mkMappingOption "Open minimap [codewindow]" "<leader>mo";
diff --git a/modules/minimap/minimap-vim/minimap-vim.nix b/modules/minimap/minimap-vim/minimap-vim.nix
index 33d166a..bd237aa 100644
--- a/modules/minimap/minimap-vim/minimap-vim.nix
+++ b/modules/minimap/minimap-vim/minimap-vim.nix
@@ -6,6 +6,6 @@
 with lib;
 with builtins; {
   options.vim.minimap.minimap-vim = {
-    enable = mkEnableOption "Enable minimap-vim plugin for minimap view";
+    enable = mkEnableOption "minimap-vim plugin for minimap view";
   };
 }
diff --git a/modules/notes/mind-nvim/mind-nvim.nix b/modules/notes/mind-nvim/mind-nvim.nix
index aa496d8..d9b069c 100644
--- a/modules/notes/mind-nvim/mind-nvim.nix
+++ b/modules/notes/mind-nvim/mind-nvim.nix
@@ -6,6 +6,6 @@
 with lib;
 with builtins; {
   options.vim.notes.mind-nvim = {
-    enable = mkEnableOption "The power of trees at your fingertips. ";
+    enable = mkEnableOption "organizer tool for Neovim.";
   };
 }
diff --git a/modules/notes/obsidian/obsidian.nix b/modules/notes/obsidian/obsidian.nix
index c4631d9..674c66b 100644
--- a/modules/notes/obsidian/obsidian.nix
+++ b/modules/notes/obsidian/obsidian.nix
@@ -7,7 +7,7 @@ with lib;
 with builtins; {
   options.vim.notes = {
     obsidian = {
-      enable = mkEnableOption "Complementary neovim plugins for Obsidian editor";
+      enable = mkEnableOption "complementary neovim plugins for Obsidian editor";
       dir = mkOption {
         type = types.str;
         default = "~/my-vault";
diff --git a/modules/notes/orgmode/orgmode.nix b/modules/notes/orgmode/orgmode.nix
index 68a7620..3ba9e30 100644
--- a/modules/notes/orgmode/orgmode.nix
+++ b/modules/notes/orgmode/orgmode.nix
@@ -6,15 +6,15 @@
 with lib;
 with builtins; {
   options.vim.notes.orgmode = {
-    enable = mkEnableOption "Enable nvim-orgmode: Neovim plugin for Emac Orgmode. Get the best of both worlds";
+    enable = mkEnableOption "nvim-orgmode: Neovim plugin for Emac Orgmode. Get the best of both worlds";
     orgAgendaFiles = mkOption {
       type = types.str;
-      default = "{'~/Dropbox/org/*', '~/my-orgs/**/*'}";
+      default = "{'~/Documents/org/*', '~/my-orgs/**/*'}";
       description = "List of org files to be used as agenda files.";
     };
     orgDefaultNotesFile = mkOption {
       type = types.str;
-      default = "~/Dropbox/org/refile.org";
+      default = "~/Documents/org/refile.org";
       description = "Default org file to be used for notes.";
     };
   };
diff --git a/modules/notes/todo-comments/todo-comments.nix b/modules/notes/todo-comments/todo-comments.nix
index 39b8aad..992a6c6 100644
--- a/modules/notes/todo-comments/todo-comments.nix
+++ b/modules/notes/todo-comments/todo-comments.nix
@@ -2,7 +2,7 @@
 with lib;
 with builtins; {
   options.vim.notes.todo-comments = {
-    enable = mkEnableOption "Enable todo-comments";
+    enable = mkEnableOption "todo-comments: highlight and search for todo comments like TODO, HACK, BUG in your code base";
 
     patterns = {
       highlight = mkOption {
diff --git a/modules/projects/project-nvim/config.nix b/modules/projects/project-nvim/config.nix
index c0faff4..c7f0c67 100644
--- a/modules/projects/project-nvim/config.nix
+++ b/modules/projects/project-nvim/config.nix
@@ -4,59 +4,49 @@
   ...
 }:
 with lib;
-with builtins; {
-  options.vim.projects.project-nvim = {
-    enable = mkEnableOption "Enable project-nvim for project management";
+with builtins; let
+  cfg = config.vim.projects.project-nvim;
+in {
+  config = mkIf cfg.enable {
+    vim.startPlugins = [
+      "project-nvim"
+    ];
 
-    manualMode = mkOption {
-      type = types.bool;
-      default = true;
-      description = "don't automatically change the root directory so the user has the option to manually do so using `:ProjectRoot` command";
-    };
+    vim.luaConfigRC.project-nvim = nvim.dag.entryAnywhere ''
+      require('project_nvim').setup({
+        manual_mode = ${boolToString cfg.manualMode},
+        detection_methods = { ${concatStringsSep ", " (map (x: "\"" + x + "\"") cfg.detectionMethods)} },
 
-    # detection methods should accept one or more strings from a list
-    detectionMethods = mkOption {
-      type = types.listOf types.str;
-      default = ["lsp" "pattern"];
-      description = "Detection methods to use";
-    };
+        -- All the patterns used to detect root dir, when **"pattern"** is in
+        -- detection_methods
+        patterns = { ${concatStringsSep ", " (map (x: "\"" + x + "\"") cfg.patterns)} },
 
-    # patterns
-    patterns = mkOption {
-      type = types.listOf types.str;
-      default = [".git" "_darcs" ".hg" ".bzr" ".svn" "Makefile" "package.json" "flake.nix" "cargo.toml"];
-      description = "Patterns to use for pattern detection method";
-    };
+        -- Table of lsp clients to ignore by name
+        -- eg: { "efm", ... }
+        ignore_lsp = { ${concatStringsSep ", " (map (x: "\"" + x + "\"") cfg.lspIgnored)} },
 
-    # table of lsp servers to ignore by name
-    lspIgnored = mkOption {
-      type = types.listOf types.str;
-      default = [];
-      description = "LSP servers no ignore by name";
-    };
+        -- Don't calculate root dir on specific directories
+        -- Ex: { "~/.cargo/*", ... }
+        exclude_dirs = { ${concatStringsSep ", " (map (x: "\"" + x + "\"") cfg.excludeDirs)} },
 
-    excludeDirs = mkOption {
-      type = types.listOf types.str;
-      default = [];
-      description = "Directories to exclude from project root search";
-    };
+        -- Show hidden files in telescope
+        show_hidden = ${boolToString cfg.showHidden},
 
-    showHidden = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Show hidden files in telescope picker";
-    };
+        -- When set to false, you will get a message when project.nvim changes your
+        -- directory.
+        silent_chdir = ${boolToString cfg.silentChdir},
 
-    silentChdir = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Silently change directory when changing project";
-    };
+        -- What scope to change the directory, valid options are
+        -- * global (default)
+        -- * tab
+        -- * win
+        scope_chdir = '${toString cfg.scopeChdir}',
 
-    scopeChdir = mkOption {
-      type = types.enum ["global" "tab" "win"];
-      default = "global";
-      description = "What scope to change the directory";
-    };
+        -- Path where project.nvim will store the project history for use in
+        -- telescope
+        datapath = vim.fn.stdpath("data"),
+      })
+    '';
   };
 }
+
diff --git a/modules/projects/project-nvim/project-nvim.nix b/modules/projects/project-nvim/project-nvim.nix
index d78e10f..1a4dc63 100644
--- a/modules/projects/project-nvim/project-nvim.nix
+++ b/modules/projects/project-nvim/project-nvim.nix
@@ -4,48 +4,60 @@
   ...
 }:
 with lib;
-with builtins; let
-  cfg = config.vim.projects.project-nvim;
-in {
-  config = mkIf cfg.enable {
-    vim.startPlugins = [
-      "project-nvim"
-    ];
+with builtins; {
+  options.vim.projects.project-nvim = {
+    enable = mkEnableOption "Enable project-nvim for project management";
 
-    vim.luaConfigRC.project-nvim = nvim.dag.entryAnywhere ''
-      require('project_nvim').setup({
-        manual_mode = ${boolToString cfg.manualMode},
-        detection_methods = { ${concatStringsSep ", " (map (x: "\"" + x + "\"") cfg.detectionMethods)} },
+    manualMode = mkOption {
+      type = types.bool;
+      default = true;
+      description = "don't automatically change the root directory so the user has the option to manually do so using `:ProjectRoot` command";
+    };
 
-        -- All the patterns used to detect root dir, when **"pattern"** is in
-        -- detection_methods
-        patterns = { ${concatStringsSep ", " (map (x: "\"" + x + "\"") cfg.patterns)} },
+    # detection methods should accept one or more strings from a list
+    detectionMethods = mkOption {
+      type = types.listOf types.str;
+      default = ["lsp" "pattern"];
+      description = "Detection methods to use";
+    };
 
-        -- Table of lsp clients to ignore by name
-        -- eg: { "efm", ... }
-        ignore_lsp = { ${concatStringsSep ", " (map (x: "\"" + x + "\"") cfg.lspIgnored)} },
+    # patterns
+    patterns = mkOption {
+      type = types.listOf types.str;
+      default = [".git" "_darcs" ".hg" ".bzr" ".svn" "Makefile" "package.json" "flake.nix" "cargo.toml"];
+      description = "Patterns to use for pattern detection method";
+    };
 
-        -- Don't calculate root dir on specific directories
-        -- Ex: { "~/.cargo/*", ... }
-        exclude_dirs = { ${concatStringsSep ", " (map (x: "\"" + x + "\"") cfg.excludeDirs)} },
+    # table of lsp servers to ignore by name
+    lspIgnored = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = "LSP servers no ignore by name";
+    };
 
-        -- Show hidden files in telescope
-        show_hidden = ${boolToString cfg.showHidden},
+    excludeDirs = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = "Directories to exclude from project root search";
+    };
 
-        -- When set to false, you will get a message when project.nvim changes your
-        -- directory.
-        silent_chdir = ${boolToString cfg.silentChdir},
+    showHidden = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Show hidden files in telescope picker";
+    };
 
-        -- What scope to change the directory, valid options are
-        -- * global (default)
-        -- * tab
-        -- * win
-        scope_chdir = '${toString cfg.scopeChdir}',
+    silentChdir = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Silently change directory when changing project";
+    };
 
-        -- Path where project.nvim will store the project history for use in
-        -- telescope
-        datapath = vim.fn.stdpath("data"),
-      })
-    '';
+    scopeChdir = mkOption {
+      type = types.enum ["global" "tab" "win"];
+      default = "global";
+      description = "What scope to change the directory";
+    };
   };
 }
+
diff --git a/modules/rich-presence/presence-nvim/presence-nvim.nix b/modules/rich-presence/presence-nvim/presence-nvim.nix
index 491aadd..f2cc90e 100644
--- a/modules/rich-presence/presence-nvim/presence-nvim.nix
+++ b/modules/rich-presence/presence-nvim/presence-nvim.nix
@@ -6,7 +6,7 @@
 with lib;
 with builtins; {
   options.vim.presence.presence-nvim = {
-    enable = mkEnableOption "Enable presence.nvim plugin for discord rich presence";
+    enable = mkEnableOption "presence.nvim plugin for discord rich presence";
 
     image_text = mkOption {
       type = types.str;
diff --git a/modules/session/nvim-session-manager/nvim-session-manager.nix b/modules/session/nvim-session-manager/nvim-session-manager.nix
index 7f84c21..881a6ae 100644
--- a/modules/session/nvim-session-manager/nvim-session-manager.nix
+++ b/modules/session/nvim-session-manager/nvim-session-manager.nix
@@ -6,7 +6,7 @@
 with lib;
 with builtins; {
   options.vim.session.nvim-session-manager = {
-    enable = mkEnableOption "Enable nvim-session-manager";
+    enable = mkEnableOption "nvim-session-manager: manage sessions like folders in VSCode";
 
     mappings = {
       loadSession = mkOption {
diff --git a/modules/snippets/vsnip/vsnip.nix b/modules/snippets/vsnip/vsnip.nix
index 88e421c..c59a5d6 100644
--- a/modules/snippets/vsnip/vsnip.nix
+++ b/modules/snippets/vsnip/vsnip.nix
@@ -1,11 +1,6 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib;
-with builtins; {
+{lib, ...}:
+with lib; {
   options.vim.snippets.vsnip = {
-    enable = mkEnableOption "Enable vim-vsnip";
+    enable = mkEnableOption "vim-vsnip: snippet LSP/VSCode's format";
   };
 }
diff --git a/modules/statusline/lualine/lualine.nix b/modules/statusline/lualine/lualine.nix
index ebc217b..da89180 100644
--- a/modules/statusline/lualine/lualine.nix
+++ b/modules/statusline/lualine/lualine.nix
@@ -8,14 +8,10 @@ with builtins; let
   supported_themes = import ./supported_themes.nix;
 in {
   options.vim.statusline.lualine = {
-    enable = mkEnableOption "lualine";
+    enable = mkEnableOption "lualine statusline plugin";
 
     icons = {
-      enable = mkOption {
-        type = types.bool;
-        description = "Enable icons for lualine";
-        default = true;
-      };
+      enable = mkEnableOption "icons for lualine" // {default = true;};
     };
 
     refresh = {
@@ -125,6 +121,7 @@ in {
               "mode",
               separator = {
                 left = '▎',
+                right = ''
               },
             },
           }
@@ -184,7 +181,12 @@ in {
             {
               "diagnostics",
               sources = {'nvim_lsp', 'nvim_diagnostic', 'coc'},
-              symbols = {error = '󰅙 ', warn = ' ', info = ' ', hint = '󰌵 '}
+              symbols = {error = '󰅙 ', warn = ' ', info = ' ', hint = '󰌵 '},
+              diagnostics_color = {
+                color_error = { fg = colors.red },
+                color_warn = { fg = colors.yellow },
+                color_info = { fg = colors.cyan },
+              },
             },
           }
         '';
@@ -224,12 +226,7 @@ in {
             {
               "branch",
               icon = ' •',
-              separator = {
-                left = '(',
-                right = ')'
-              },
               color = {bg='none', fg='lavender'},
-
             },
           }
         '';
diff --git a/modules/tabline/nvim-bufferline/nvim-bufferline.nix b/modules/tabline/nvim-bufferline/nvim-bufferline.nix
index 32e2dd3..ec2478e 100644
--- a/modules/tabline/nvim-bufferline/nvim-bufferline.nix
+++ b/modules/tabline/nvim-bufferline/nvim-bufferline.nix
@@ -2,6 +2,8 @@
 with lib;
 with builtins; {
   options.vim.tabline.nvimBufferline = {
+    enable = mkEnableOption "nvim-bufferline-lua as a bufferline";
+
     mappings = {
       closeCurrent = mkMappingOption "Close buffer" null;
       cycleNext = mkMappingOption "Next buffer" "<leader>bn";
@@ -13,7 +15,5 @@ with builtins; {
       moveNext = mkMappingOption "Move next buffer" "<leader>bmn";
       movePrevious = mkMappingOption "Move previous buffer" "<leader>bmp";
     };
-
-    enable = mkEnableOption "Enable nvim-bufferline-lua as a bufferline";
   };
 }
diff --git a/modules/terminal/toggleterm/toggleterm.nix b/modules/terminal/toggleterm/toggleterm.nix
index 35effff..2bef2f8 100644
--- a/modules/terminal/toggleterm/toggleterm.nix
+++ b/modules/terminal/toggleterm/toggleterm.nix
@@ -15,23 +15,27 @@ with builtins; {
         default = "<c-t>";
       };
     };
+
     direction = mkOption {
       type = types.enum ["horizontal" "vertical" "tab" "float"];
       default = "horizontal";
       description = "Direction of the terminal";
     };
+
     enable_winbar = mkOption {
       type = types.bool;
       default = false;
       description = "Enable winbar";
     };
+
     lazygit = {
-      enable = mkEnableOption "Enable LazyGit integration";
+      enable = mkEnableOption "LazyGit integration";
       direction = mkOption {
         type = types.enum ["horizontal" "vertical" "tab" "float"];
         default = "float";
         description = "Direction of the lazygit window";
       };
+
       package = mkOption {
         type = with types; nullOr package;
         default = pkgs.lazygit;
diff --git a/modules/ui/colorizer/colorizer.nix b/modules/ui/colorizer/colorizer.nix
index 48ec2bd..54c932a 100644
--- a/modules/ui/colorizer/colorizer.nix
+++ b/modules/ui/colorizer/colorizer.nix
@@ -6,7 +6,7 @@
 with lib;
 with builtins; {
   options.vim.ui.colorizer = {
-    enable = mkEnableOption "Enable nvim-colorizer.lua for color highlighting";
+    enable = mkEnableOption "nvim-colorizer.lua for color highlighting";
 
     options = {
       rgb = mkOption {
diff --git a/modules/ui/modes/modes.nix b/modules/ui/modes/modes.nix
index 0aab957..a1b2dcc 100644
--- a/modules/ui/modes/modes.nix
+++ b/modules/ui/modes/modes.nix
@@ -6,6 +6,6 @@
 with lib;
 with builtins; {
   options.vim.ui.modes-nvim = {
-    enable = mkEnableOption "Enable modes.nvim UI elements";
+    enable = mkEnableOption "modes.nvim's prismatic line decorations";
   };
 }
diff --git a/modules/ui/noice/noice.nix b/modules/ui/noice/noice.nix
index 481785e..0b3bd71 100644
--- a/modules/ui/noice/noice.nix
+++ b/modules/ui/noice/noice.nix
@@ -6,6 +6,6 @@
 with lib;
 with builtins; {
   options.vim.ui.noice = {
-    enable = mkEnableOption "Enable noice-nvim UI modifications";
+    enable = mkEnableOption "noice-nvim UI modification library";
   };
 }
diff --git a/modules/ui/notifications/nvim-notify/nvim-notify.nix b/modules/ui/notifications/nvim-notify/nvim-notify.nix
index d24e82d..0028a89 100644
--- a/modules/ui/notifications/nvim-notify/nvim-notify.nix
+++ b/modules/ui/notifications/nvim-notify/nvim-notify.nix
@@ -6,29 +6,34 @@
 with lib;
 with builtins; {
   options.vim.notify.nvim-notify = {
-    enable = mkEnableOption "Enable nvim-notify plugin";
+    enable = mkEnableOption "nvim-notify notifications";
     stages = mkOption {
       type = types.enum ["fade_in_slide_out" "fade_in" "slide_out" "none"];
       default = "fade_in_slide_out";
       description = "The stages of the notification";
     };
+
     timeout = mkOption {
       type = types.int;
       default = 1000;
       description = "The timeout of the notification";
     };
+
     background_colour = mkOption {
       type = types.str;
       default = "#000000";
       description = "The background colour of the notification";
     };
+
     position = mkOption {
       type = types.enum ["top_left" "top_right" "bottom_left" "bottom_right"];
       default = "top_right";
       description = "The position of the notification";
     };
+
     icons = mkOption {
       type = types.attrsOf types.str;
+      description = "The icons of the notification";
       default = {
         ERROR = "";
         WARN = "";
@@ -36,7 +41,6 @@ with builtins; {
         DEBUG = "";
         TRACE = "";
       };
-      description = "The icons of the notification";
     };
   };
 }
diff --git a/modules/ui/smartcolumn/smartcolumn.nix b/modules/ui/smartcolumn/smartcolumn.nix
index 349bf48..0f01cfc 100644
--- a/modules/ui/smartcolumn/smartcolumn.nix
+++ b/modules/ui/smartcolumn/smartcolumn.nix
@@ -2,7 +2,7 @@
 with lib;
 with builtins; {
   options.vim.ui.smartcolumn = {
-    enable = mkEnableOption "Enable Smartcolumn line length indicator";
+    enable = mkEnableOption "line length indicator";
 
     showColumnAt = mkOption {
       type = types.nullOr types.int;
diff --git a/modules/utility/binds/cheatsheet/cheatsheet.nix b/modules/utility/binds/cheatsheet/cheatsheet.nix
index c16b1f4..517f4e2 100644
--- a/modules/utility/binds/cheatsheet/cheatsheet.nix
+++ b/modules/utility/binds/cheatsheet/cheatsheet.nix
@@ -6,6 +6,6 @@
 with lib;
 with builtins; {
   options.vim.binds.cheatsheet = {
-    enable = mkEnableOption "Enable cheatsheet-nvim: searchable cheatsheet for nvim using telescope";
+    enable = mkEnableOption "cheatsheet-nvim: searchable cheatsheet for nvim using telescope";
   };
 }
diff --git a/modules/utility/binds/which-key/which-key.nix b/modules/utility/binds/which-key/which-key.nix
index 4135451..b8e6fa0 100644
--- a/modules/utility/binds/which-key/which-key.nix
+++ b/modules/utility/binds/which-key/which-key.nix
@@ -1,11 +1,7 @@
-{
-  config,
-  lib,
-  ...
-}:
+{lib, ...}:
 with lib;
 with builtins; {
   options.vim.binds.whichKey = {
-    enable = mkEnableOption "Enable which-key keybind menu";
+    enable = mkEnableOption "which-key keybind helper menu";
   };
 }
diff --git a/modules/utility/ccc/ccc.nix b/modules/utility/ccc/ccc.nix
index f7366bd..c0faa55 100644
--- a/modules/utility/ccc/ccc.nix
+++ b/modules/utility/ccc/ccc.nix
@@ -2,7 +2,7 @@
 with lib;
 with builtins; {
   options.vim.utility.ccc = {
-    enable = mkEnableOption "Enable ccc color picker for neovim";
+    enable = mkEnableOption "ccc color picker for neovim";
 
     mappings = {
       quit = mkMappingOption "Cancel and close the UI without replace or insert" "<Esc>";
diff --git a/modules/utility/diffview/diffview.nix b/modules/utility/diffview/diffview.nix
index ad66155..dd6fae3 100644
--- a/modules/utility/diffview/diffview.nix
+++ b/modules/utility/diffview/diffview.nix
@@ -1,11 +1,7 @@
-{
-  config,
-  lib,
-  ...
-}:
+{lib, ...}:
 with lib;
 with builtins; {
   options.vim.utility.diffview-nvim = {
-    enable = mkEnableOption "Enable diffview-nvim";
+    enable = mkEnableOption "diffview-nvim: cycle through diffs for all modified files for any git rev";
   };
 }
diff --git a/modules/utility/gestures/gesture-nvim/gesture-nvim.nix b/modules/utility/gestures/gesture-nvim/gesture-nvim.nix
index d65f4cb..06071b8 100644
--- a/modules/utility/gestures/gesture-nvim/gesture-nvim.nix
+++ b/modules/utility/gestures/gesture-nvim/gesture-nvim.nix
@@ -1,7 +1,7 @@
 {lib, ...}:
 with lib; {
   options.vim.gestures.gesture-nvim = {
-    enable = mkEnableOption "Enable gesture-nvim plugin";
+    enable = mkEnableOption "gesture-nvim: mouse gestures";
 
     mappings = {
       draw = mkMappingOption "Start drawing [gesture.nvim]" "<LeftDrag>";
diff --git a/modules/utility/icon-picker/icon-picker.nix b/modules/utility/icon-picker/icon-picker.nix
index 231a8b4..29aee8e 100644
--- a/modules/utility/icon-picker/icon-picker.nix
+++ b/modules/utility/icon-picker/icon-picker.nix
@@ -1,11 +1,7 @@
-{
-  config,
-  lib,
-  ...
-}:
+{lib, ...}:
 with lib;
 with builtins; {
   options.vim.utility.icon-picker = {
-    enable = mkEnableOption "Enable nerdfonts icon picker for nvim";
+    enable = mkEnableOption "nerdfonts icon picker for nvim";
   };
 }
diff --git a/modules/utility/motion/hop/hop.nix b/modules/utility/motion/hop/hop.nix
index c57dc7a..1eef3f8 100644
--- a/modules/utility/motion/hop/hop.nix
+++ b/modules/utility/motion/hop/hop.nix
@@ -5,6 +5,6 @@ with lib; {
       hop = mkMappingOption "Jump to occurences [hop.nvim]" "<leader>h";
     };
 
-    enable = mkEnableOption "Enable Hop.nvim plugin (easy motion)";
+    enable = mkEnableOption "Hop.nvim plugin (easy motion)";
   };
 }
diff --git a/modules/utility/motion/leap/leap.nix b/modules/utility/motion/leap/leap.nix
index 045562d..3ff9302 100644
--- a/modules/utility/motion/leap/leap.nix
+++ b/modules/utility/motion/leap/leap.nix
@@ -2,7 +2,7 @@
 with lib;
 with builtins; {
   options.vim.utility.motion.leap = {
-    enable = mkEnableOption "Enable leap.nvim plugin (easy motion)";
+    enable = mkEnableOption "leap.nvim plugin (easy motion)";
 
     mappings = {
       leapForwardTo = mkOption {
diff --git a/modules/utility/telescope/config.nix b/modules/utility/telescope/config.nix
index e7e00dc..0156a0d 100644
--- a/modules/utility/telescope/config.nix
+++ b/modules/utility/telescope/config.nix
@@ -45,6 +45,11 @@ in {
         mkIf config.vim.treesitter.enable
         (mkSetBinding mappings.treesitter "<cmd> Telescope treesitter<CR>")
       )
+
+      (
+        mkIf config.vim.projects.project-nvim.enable
+        (mkSetBinding mappings.findProjects "<cmd Telescope projects<CR>")
+      )
     ];
 
     vim.luaConfigRC.telescope = nvim.dag.entryAnywhere ''
diff --git a/modules/utility/telescope/telescope.nix b/modules/utility/telescope/telescope.nix
index 7735fc1..a48ac06 100644
--- a/modules/utility/telescope/telescope.nix
+++ b/modules/utility/telescope/telescope.nix
@@ -3,6 +3,8 @@ with lib;
 with builtins; {
   options.vim.telescope = {
     mappings = {
+      findProjects = mkMappingOption "Find files [Telescope]" "<leader>fp";
+
       findFiles = mkMappingOption "Find files [Telescope]" "<leader>ff";
       liveGrep = mkMappingOption "Live grep [Telescope]" "<leader>fg";
       buffers = mkMappingOption "Buffers [Telescope]" "<leader>fb";
@@ -26,6 +28,6 @@ with builtins; {
       treesitter = mkMappingOption "Treesitter [Telescope]" "<leader>fs";
     };
 
-    enable = mkEnableOption "Enable multi-purpose telescope utility";
+    enable = mkEnableOption "telescope.nvim: multi-purpose search & picker utility";
   };
 }
diff --git a/modules/utility/wakatime/vim-wakatime.nix b/modules/utility/wakatime/vim-wakatime.nix
index 2df357e..496e929 100644
--- a/modules/utility/wakatime/vim-wakatime.nix
+++ b/modules/utility/wakatime/vim-wakatime.nix
@@ -6,7 +6,7 @@
 with lib;
 with builtins; {
   options.vim.utility.vim-wakatime = {
-    enable = mkEnableOption "Enable vim-wakatime";
+    enable = mkEnableOption "vim-wakatime: live code statistics";
 
     cli-package = mkOption {
       type = with types; nullOr package;
diff --git a/modules/visuals/visuals.nix b/modules/visuals/visuals.nix
index ceefe55..2a6bf8e 100644
--- a/modules/visuals/visuals.nix
+++ b/modules/visuals/visuals.nix
@@ -12,24 +12,12 @@ in {
 
     nvimWebDevicons.enable = mkEnableOption "dev icons. Required for certain plugins [nvim-web-devicons].";
 
-    scrollBar.enable = mkOption {
-      type = types.bool;
-      description = "Enable scrollbar [scrollbar.nvim]";
-      default = false;
-    };
+    scrollBar.enable = mkEnableOption "Enable scrollbar [scrollbar.nvim]";
 
-    smoothScroll.enable = mkOption {
-      type = types.bool;
-      description = "Enable smooth scrolling [cinnamon-nvim]";
-      default = false;
-    };
+    smoothScroll.enable = mkEnableOption "Enable smooth scrolling [cinnamon-nvim]";
 
     cellularAutomaton = {
-      enable = mkOption {
-        type = types.bool;
-        description = "Enable cellular automaton [cellular-automaton]";
-        default = false;
-      };
+      enable = mkEnableOption "Enable cellular automaton [cellular-automaton]";
 
       mappings = {
         makeItRain = mkMappingOption "Make it rain [cellular-automaton]" "<leader>fml";
@@ -37,11 +25,8 @@ in {
     };
 
     fidget-nvim = {
-      enable = mkOption {
-        type = types.bool;
-        description = "Enable nvim LSP UI element [fidget-nvim]";
-        default = false;
-      };
+      enable = mkEnableOption "Enable nvim LSP UI element [fidget-nvim]";
+
       align = {
         bottom = mkOption {
           type = types.bool;
@@ -68,11 +53,7 @@ in {
     };
 
     indentBlankline = {
-      enable = mkOption {
-        type = types.bool;
-        description = "Enable indentation guides [indent-blankline]";
-        default = false;
-      };
+      enable = mkEnableOption "Enable indentation guides [indent-blankline]";
 
       listChar = mkOption {
         type = types.str;

From 2cb1e3b110b7e341854de0c2d958e081ae6a806b Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Mon, 5 Jun 2023 23:14:47 +0300
Subject: [PATCH 120/162] fix: regression in lualine config

---
 modules/statusline/lualine/lualine.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/statusline/lualine/lualine.nix b/modules/statusline/lualine/lualine.nix
index da89180..92f8dff 100644
--- a/modules/statusline/lualine/lualine.nix
+++ b/modules/statusline/lualine/lualine.nix
@@ -183,9 +183,9 @@ in {
               sources = {'nvim_lsp', 'nvim_diagnostic', 'coc'},
               symbols = {error = '󰅙 ', warn = ' ', info = ' ', hint = '󰌵 '},
               diagnostics_color = {
-                color_error = { fg = colors.red },
-                color_warn = { fg = colors.yellow },
-                color_info = { fg = colors.cyan },
+                color_error = { fg = 'red' },
+                color_warn = { fg = 'yellow' },
+                color_info = { fg = 'cyan' },
               },
             },
           }

From 6e21655c3ffe18315f59e4de9a246a7c8d14ce9d Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Tue, 6 Jun 2023 01:49:38 +0300
Subject: [PATCH 121/162] feat: customizable cursorline option

---
 modules/ui/modes/config.nix |  4 +++-
 modules/ui/modes/modes.nix  | 12 +++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/ui/modes/config.nix b/modules/ui/modes/config.nix
index 067a2e1..bb7130e 100644
--- a/modules/ui/modes/config.nix
+++ b/modules/ui/modes/config.nix
@@ -14,7 +14,9 @@ in {
     ];
 
     vim.luaConfigRC.modes-nvim = nvim.dag.entryAnywhere ''
-      require('modes').setup()
+      require('modes').setup({
+        set_cursorline = ${boolToString cfg.setCursorline}, -- looks ugly
+      })
     '';
   };
 }
diff --git a/modules/ui/modes/modes.nix b/modules/ui/modes/modes.nix
index a1b2dcc..0633bb5 100644
--- a/modules/ui/modes/modes.nix
+++ b/modules/ui/modes/modes.nix
@@ -1,11 +1,13 @@
-{
-  config,
-  lib,
-  ...
-}:
+{lib, ...}:
 with lib;
 with builtins; {
   options.vim.ui.modes-nvim = {
     enable = mkEnableOption "modes.nvim's prismatic line decorations";
+
+    setCursorline = mkOption {
+      type = types.bool;
+      description = "Set a colored cursorline on current line";
+      default = false;
+    };
   };
 }

From 8845d7a54d6a2162060060c191b122aa4d63d73c Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Tue, 6 Jun 2023 01:49:48 +0300
Subject: [PATCH 122/162] feat: lualine UI improvements

---
 extra.nix                              |  1 +
 modules/statusline/lualine/lualine.nix | 45 +++++++++++++++++---------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/extra.nix b/extra.nix
index 32d96e7..b1ecfa4 100644
--- a/extra.nix
+++ b/extra.nix
@@ -179,6 +179,7 @@ inputs: let
       vim.ui = {
         noice.enable = true;
         colorizer.enable = true;
+        modes-nvim.enable = true;
         smartcolumn = {
           enable = true;
           columnAt.languages = {
diff --git a/modules/statusline/lualine/lualine.nix b/modules/statusline/lualine/lualine.nix
index 92f8dff..3409194 100644
--- a/modules/statusline/lualine/lualine.nix
+++ b/modules/statusline/lualine/lualine.nix
@@ -6,6 +6,10 @@
 with lib;
 with builtins; let
   supported_themes = import ./supported_themes.nix;
+  colorPuccin =
+    if config.vim.statusline.lualine.theme == "catppuccin"
+    then "#181825"
+    else "none";
 in {
   options.vim.statusline.lualine = {
     enable = mkEnableOption "lualine statusline plugin";
@@ -119,6 +123,7 @@ in {
           {
             {
               "mode",
+              icons_enabled = true,
               separator = {
                 left = '▎',
                 right = ''
@@ -138,11 +143,11 @@ in {
               colored = true,
               icon_only = true,
               icon = { align = 'left' },
-              color = {bg='none', fg='lavender'},
+              color = {bg='${colorPuccin}', fg='lavender'},
             },
             {
               "filename",
-              color = {bg='none'},
+              color = {bg='${colorPuccin}'},
               symbols = {modified = '', readonly = ''},
             },
           }
@@ -165,7 +170,7 @@ in {
               },
               symbols = {added = '+', modified = '~', removed = '-'}, -- Changes the diff symbols
               color = {
-                bg='none',
+                bg='${colorPuccin}',
                 fg='lavender'
               },
             },
@@ -181,7 +186,7 @@ in {
             {
               "diagnostics",
               sources = {'nvim_lsp', 'nvim_diagnostic', 'coc'},
-              symbols = {error = '󰅙 ', warn = ' ', info = ' ', hint = '󰌵 '},
+              symbols = {error = '󰅙  ', warn = '  ', info = '  ', hint = '󰌵 '},
               diagnostics_color = {
                 color_error = { fg = 'red' },
                 color_warn = { fg = 'yellow' },
@@ -198,13 +203,15 @@ in {
         default = ''
           {
             {
-              "fileformat",
-              color = {bg='none', fg='lavender'},
-              symbols = {
-                unix = '', -- e712
-                dos = '',  -- e70f
-                mac = '',  -- e711
-              },
+              'searchcount',
+              maxcount = 999,
+              timeout = 120,
+
+            },
+            {
+              "branch",
+              icon = ' •',
+              color = {bg='${colorPuccin}', fg='lavender'},
             },
           }
         '';
@@ -217,16 +224,22 @@ in {
           {
             {
               "progress",
-              color = {bg='none', fg='lavender'},
+              separator = {
+                left = '',
+              },
+
             },
             {
               "location",
-              color = {bg='none', fg='lavender'},
             },
             {
-              "branch",
-              icon = ' •',
-              color = {bg='none', fg='lavender'},
+              "fileformat",
+              color = {fg='black'},
+              symbols = {
+                unix = '', -- e712
+                dos = '',  -- e70f
+                mac = '',  -- e711
+              },
             },
           }
         '';

From a1d99ca752d1f50e2cb7b540e2fbdaa5e1ed64cc Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Tue, 6 Jun 2023 02:22:55 +0300
Subject: [PATCH 123/162] fix: '&' causing build failures

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

diff --git a/modules/utility/telescope/telescope.nix b/modules/utility/telescope/telescope.nix
index a48ac06..39d399b 100644
--- a/modules/utility/telescope/telescope.nix
+++ b/modules/utility/telescope/telescope.nix
@@ -28,6 +28,6 @@ with builtins; {
       treesitter = mkMappingOption "Treesitter [Telescope]" "<leader>fs";
     };
 
-    enable = mkEnableOption "telescope.nvim: multi-purpose search & picker utility";
+    enable = mkEnableOption "telescope.nvim: multi-purpose search and picker utility";
   };
 }

From 1f4b6d7a9afb2f3f1ac508a0df0daa6a3ae69fea Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Tue, 6 Jun 2023 02:23:29 +0300
Subject: [PATCH 124/162] dev: disable some plugins on minimal configuration

---
 extra.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/extra.nix b/extra.nix
index b1ecfa4..9afba32 100644
--- a/extra.nix
+++ b/extra.nix
@@ -135,12 +135,12 @@ inputs: let
 
       vim.minimap = {
         minimap-vim.enable = false;
-        codewindow.enable = true; # lighter, faster, and uses lua for configuration
+        codewindow.enable = isMaximal; # lighter, faster, and uses lua for configuration
       };
 
       vim.dashboard = {
         dashboard-nvim.enable = false;
-        alpha.enable = true;
+        alpha.enable = isMaximal;
       };
 
       vim.notify = {
@@ -152,9 +152,9 @@ inputs: let
       };
 
       vim.utility = {
-        ccc.enable = true;
-        vim-wakatime.enable = true;
-        icon-picker.enable = true;
+        ccc.enable = isMaximal;
+        vim-wakatime.enable = isMaximal;
+        icon-picker.enable = isMaximal;
         diffview-nvim.enable = true;
         motion = {
           hop.enable = true;
@@ -197,7 +197,7 @@ inputs: let
       };
 
       vim.session = {
-        nvim-session-manager.enable = true;
+        nvim-session-manager.enable = isMaximal;
       };
 
       vim.gestures = {

From 5300f9c253bad184d1518bc6b5669343d3209912 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Tue, 6 Jun 2023 02:25:10 +0300
Subject: [PATCH 125/162] style: formatting

---
 modules/projects/project-nvim/config.nix       | 1 -
 modules/projects/project-nvim/project-nvim.nix | 1 -
 2 files changed, 2 deletions(-)

diff --git a/modules/projects/project-nvim/config.nix b/modules/projects/project-nvim/config.nix
index c7f0c67..d78e10f 100644
--- a/modules/projects/project-nvim/config.nix
+++ b/modules/projects/project-nvim/config.nix
@@ -49,4 +49,3 @@ in {
     '';
   };
 }
-
diff --git a/modules/projects/project-nvim/project-nvim.nix b/modules/projects/project-nvim/project-nvim.nix
index 1a4dc63..c0faff4 100644
--- a/modules/projects/project-nvim/project-nvim.nix
+++ b/modules/projects/project-nvim/project-nvim.nix
@@ -60,4 +60,3 @@ with builtins; {
     };
   };
 }
-

From b8d2c23eaf35f9244e94a9ae746908eaa48ac8e1 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Tue, 6 Jun 2023 02:33:18 +0300
Subject: [PATCH 126/162] feat: add more configuration options for modes.nvim

---
 modules/ui/modes/config.nix |  9 +++++++--
 modules/ui/modes/modes.nix  | 25 ++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/modules/ui/modes/config.nix b/modules/ui/modes/config.nix
index bb7130e..2e9ac04 100644
--- a/modules/ui/modes/config.nix
+++ b/modules/ui/modes/config.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...
@@ -15,7 +14,13 @@ in {
 
     vim.luaConfigRC.modes-nvim = nvim.dag.entryAnywhere ''
       require('modes').setup({
-        set_cursorline = ${boolToString cfg.setCursorline}, -- looks ugly
+        set_cursorline = ${boolToString cfg.setCursorline},
+        colors = {
+          copy = "${toString cfg.colors.copy}",
+          delete = "${toString cfg.colors.delete}",
+          insert = "${toString cfg.colors.insert}",
+          visual = "${toString cfg.colors.visual}",
+        },
       })
     '';
   };
diff --git a/modules/ui/modes/modes.nix b/modules/ui/modes/modes.nix
index 0633bb5..be4ed50 100644
--- a/modules/ui/modes/modes.nix
+++ b/modules/ui/modes/modes.nix
@@ -7,7 +7,30 @@ with builtins; {
     setCursorline = mkOption {
       type = types.bool;
       description = "Set a colored cursorline on current line";
-      default = false;
+      default = false; # looks ugly, disabled by default
+    };
+
+    colors = {
+      copy = mkOption {
+        type = types.str;
+        description = "The #RRGGBB color code for the visual mode highlights";
+        default = "#f5c359";
+      };
+      delete = mkOption {
+        type = types.str;
+        description = "The #RRGGBB color code for the visual mode highlights";
+        default = "#c75c6a";
+      };
+      insert = mkOption {
+        type = types.str;
+        description = "The #RRGGBB color code for the visual mode highlights";
+        default = "#78ccc5";
+      };
+      visual = mkOption {
+        type = types.str;
+        description = "The #RRGGBB color code for the visual mode highlights";
+        default = "#9745be";
+      };
     };
   };
 }

From 294b712c15e1f3b1452c38ea07a789b9d8e79701 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Tue, 6 Jun 2023 03:01:44 +0300
Subject: [PATCH 127/162] docs: clean up documentation directory

---
 .github/README.md                      | 20 +++----
 docs/home-manager.adoc                 | 44 --------------
 docs/manual.xml                        | 12 ++--
 docs/{ => manual}/custom-configs.adoc  |  0
 docs/{ => manual}/custom-plugins.adoc  |  0
 docs/{ => manual}/default-configs.adoc |  0
 docs/manual/home-manager.adoc          | 80 ++++++++++++++++++++++++++
 docs/{ => manual}/languages.adoc       |  0
 docs/{ => manual}/try-it-out.adoc      |  0
 docs/release-notes/rl-0.4.adoc         |  4 ++
 10 files changed, 100 insertions(+), 60 deletions(-)
 delete mode 100644 docs/home-manager.adoc
 rename docs/{ => manual}/custom-configs.adoc (100%)
 rename docs/{ => manual}/custom-plugins.adoc (100%)
 rename docs/{ => manual}/default-configs.adoc (100%)
 create mode 100644 docs/manual/home-manager.adoc
 rename docs/{ => manual}/languages.adoc (100%)
 rename docs/{ => manual}/try-it-out.adoc (100%)

diff --git a/.github/README.md b/.github/README.md
index 719a711..e208bf3 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -41,10 +41,10 @@
 <div align="center"><p>
 
 **[<kbd> <br> Get Started <br> </kbd>][Get Started]**
-**[<kbd> <br> Documentation <br> </kbd>][Documentation]** 
-**[<kbd> <br> Help <br> </kbd>][Help]** 
-**[<kbd> <br> Contribute <br> </kbd>][Contribute]** 
-**[<kbd> <br> FAQ <br> </kbd>][Faq]** 
+**[<kbd> <br> Documentation <br> </kbd>][Documentation]**
+**[<kbd> <br> Help <br> </kbd>][Help]**
+**[<kbd> <br> Contribute <br> </kbd>][Contribute]**
+**[<kbd> <br> FAQ <br> </kbd>][Faq]**
 **[<kbd> <br> Credits <br> </kbd>][Credits]**
 
 </p></div>
@@ -78,7 +78,7 @@ nix run github:notashelf/neovim-flake#tidal
 
 Similar instructions will apply for `nix profile install`.
 
-P.S. The `maximal` configuration is *massive* and will take a while to build. To get a feel for the configuration, use the default `nix` or `tidal` configurations.
+P.S. The `maximal` configuration is _massive_ and will take a while to build. To get a feel for the configuration, use the default `nix` or `tidal` configurations.
 
 ## Documentation
 
@@ -103,8 +103,8 @@ I am always looking for new ways to help improve this flake. If you would like t
 ## Philosophy
 
 The philosophy behind this flake configuration is to create an easily configurable and reproducible Neovim environment. While it does sacrifice in size
-(which I know some users will find *disagreeable*), it offers a lot of flexibility and customizability in exchange for the large size of the flake inputs.
-The KISS (Keep it simple, stupid) principle has been abandoned here, however, you *can* ultimately leverage the flexibility of this flake to declare a configuration that follows KISS principles, it is very easy to bring your own plugins and configurations from non-nix. What this flake is meant to be does eventually fall into your hands. Whether you are a developer, writer, or live coder (see tidal cycles below!), you can quickly craft a config that suits every project's need. Think of it like a distribution of Neovim that takes advantage of pinning vim plugins and
+(which I know some users will find _disagreeable_), it offers a lot of flexibility and customizability in exchange for the large size of the flake inputs.
+The KISS (Keep it simple, stupid) principle has been abandoned here, however, you _can_ ultimately leverage the flexibility of this flake to declare a configuration that follows KISS principles, it is very easy to bring your own plugins and configurations from non-nix. What this flake is meant to be does eventually fall into your hands. Whether you are a developer, writer, or live coder, you can quickly craft a config that suits every project's need. Think of it like a distribution of Neovim that takes advantage of pinning vim plugins and
 third party dependencies (such as tree-sitter grammars, language servers, and more).
 
 One should never get a broken config when setting options. If setting multiple options results in a broken Neovim, file an issue! Each plugin knows when another plugin which allows for smart configuration of keybindings and automatic setup of things like completion sources and languages.
@@ -128,9 +128,9 @@ instead of the `maximal` output. This will reduce size by a lot, but you will lo
 **A**: No. If you feel the need to ask that question, then you have missed the whole point of using nix and ultimately this flake. The whole reason we use nix is to be able to handle EVERYTHING declaratively, well including the LSP and plugin installations.
 <br/><br/>
 
-**Q**: Can you add *X*?
+**Q**: Can you add _X_?
 <br/>
-**A**: Maybe. Open an issue using the appropriate template and I will consider it. I do not intend to add *every plugin that is in existence*, but I will consider it, should it offer something useful to the flake.
+**A**: Maybe. Open an issue using the appropriate template and I will consider it. I do not intend to add _every plugin that is in existence_, but I will consider it, should it offer something useful to the flake.
 
 ## Credits
 
@@ -149,9 +149,9 @@ and everyone who has submitted issues or pull requests!
 
 This configuration borrows from and is based on a few other configurations, including:
 
+- [@jordanisaacs's](https://github.com/jordanisaacs) [neovim-flake](https://github.com/jordanisaacs/neovim-flake)
 - [@sioodmy's](https://github.com/sioodmy) [dotfiles](https://github.com/sioodmy/dotfiles)
 - [@wiltaylor's](https://github.com/wiltaylor) [neovim-flake](https://github.com/wiltaylor/neovim-flake)
-- [@jordanisaacs's](https://github.com/jordanisaacs) [neovim-flake](https://github.com/jordanisaacs/neovim-flake)
 - [@gvolpe's](https://github.com/gvolpe) [neovim-flake](https://github.com/gvolpe/neovim-flake)
 
 I am grateful for their previous work and inspiration.
diff --git a/docs/home-manager.adoc b/docs/home-manager.adoc
deleted file mode 100644
index bd24a16..0000000
--- a/docs/home-manager.adoc
+++ /dev/null
@@ -1,44 +0,0 @@
-[[ch-hm-module]]
-== Home Manager
-
-The Home Manager module allows us to customize the different `vim` options. To use it, we first add the input flake.
-
-[source,nix]
-----
-{
-  neovim-flake = {
-    url = github:notashelf/neovim-flake;
-    # you can override input nixpkgs
-    inputs.nixpkgs.follows = "nixpkgs";
-  };
-}
-----
-
-Followed by importing the HM module.
-
-[source,nix]
-----
-{
-  imports = [ neovim-flake.homeManagerModules.default ];
-}
-----
-
-Then we should be able to use the given module. E.g.
-
-[source,nix]
-----
-{
-  programs.neovim-flake = {
-
-    enable = true;
-    # your settings need to go into the settings attrset
-    settings = {
-      vim.viAlias = false;
-      vim.vimAlias = true;
-      vim.lsp = {
-        enable = true;
-      };
-    };
-  };
-}
-----
diff --git a/docs/manual.xml b/docs/manual.xml
index 5597b36..7184dbb 100644
--- a/docs/manual.xml
+++ b/docs/manual.xml
@@ -16,12 +16,12 @@
 
   </para>
  </preface>
- <xi:include href="try-it-out.xml"/>
- <xi:include href="default-configs.xml"/>
- <xi:include href="custom-configs.xml"/>
- <xi:include href="custom-plugins.xml"/>
- <xi:include href="home-manager.xml"/>
- <xi:include href="languages.xml"/>
+ <xi:include href="manual/try-it-out.xml"/>
+ <xi:include href="manual/default-configs.xml"/>
+ <xi:include href="manual/custom-configs.xml"/>
+ <xi:include href="manual/custom-plugins.xml"/>
+ <xi:include href="manual/home-manager.xml"/>
+ <xi:include href="manual/languages.xml"/>
  <appendix xml:id="ch-options">
   <title>Configuration Options</title>
   <xi:include href="./nmd-result/neovim-flake-options.xml" />
diff --git a/docs/custom-configs.adoc b/docs/manual/custom-configs.adoc
similarity index 100%
rename from docs/custom-configs.adoc
rename to docs/manual/custom-configs.adoc
diff --git a/docs/custom-plugins.adoc b/docs/manual/custom-plugins.adoc
similarity index 100%
rename from docs/custom-plugins.adoc
rename to docs/manual/custom-plugins.adoc
diff --git a/docs/default-configs.adoc b/docs/manual/default-configs.adoc
similarity index 100%
rename from docs/default-configs.adoc
rename to docs/manual/default-configs.adoc
diff --git a/docs/manual/home-manager.adoc b/docs/manual/home-manager.adoc
new file mode 100644
index 0000000..a937738
--- /dev/null
+++ b/docs/manual/home-manager.adoc
@@ -0,0 +1,80 @@
+[[ch-hm-module]]
+== Home Manager
+
+The Home Manager module allows us to customize the different `vim` options. To use it, we first add the input flake.
+
+[source,nix]
+----
+{
+  neovim-flake = {
+    url = github:notashelf/neovim-flake;
+    # you can override input nixpkgs
+    inputs.nixpkgs.follows = "nixpkgs";
+  };
+}
+----
+
+Followed by importing the HM module.
+
+[source,nix]
+----
+{
+  imports = [ neovim-flake.homeManagerModules.default ];
+}
+----
+
+Then we should be able to use the given module. E.g.
+
+[source,nix]
+----
+{
+  programs.neovim-flake = {
+
+    enable = true;
+    # your settings need to go into the settings attrset
+    settings = {
+      vim.viAlias = false;
+      vim.vimAlias = true;
+      vim.lsp = {
+        enable = true;
+      };
+    };
+  };
+}
+----
+
+=== Custom vim/neovim plugins
+
+It is possible to add custom plugins to your configuration by using the `vim.startPlugins` option and the this flake's lua DAG library. 
+
+Start by adding it to startPlugins. This example uses nvim-surround, but the process will be similar for other plugins as well.
+
+[source,nix]
+----
+{
+  programs.neovim-flake = {
+    enable = true;
+    settings = {
+      vim.startPlugins = [ pkgs.vimPlugins.nvim-surround ];
+    };
+  };
+}
+----
+
+Followed by requiring the plugin, should it need one, in the lua DAG. Please note that you're able to name the DAG to however you want, the name will add a `--SECTION <name>` in the init.vim, under which it will be initialized. `lib.nvim.dag.entryAfter ["name"]` could also be used to initialize a plugin only after a previous plugin has beeni initialize
+Your final setup will likely look like this, where nvim-flake refers to your flake input or fetch.
+
+[source,nix]
+----
+{
+  programs.neovim-flake = {
+    enable = true;
+    settings = {
+      vim.startPlugins = [ pkgs.vimPlugins.nvim-surround ];
+      luaConfigRC.nvim-surround = nvim-flake.lib.nvim.dag.entryAnywhere '' # nvim-flake is a reference to the flake. Please change this accordingly to your config.
+        require("nvim-surround").setup()
+      '';
+    };
+  };
+}
+----
diff --git a/docs/languages.adoc b/docs/manual/languages.adoc
similarity index 100%
rename from docs/languages.adoc
rename to docs/manual/languages.adoc
diff --git a/docs/try-it-out.adoc b/docs/manual/try-it-out.adoc
similarity index 100%
rename from docs/try-it-out.adoc
rename to docs/manual/try-it-out.adoc
diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index 9f3299b..4eff20b 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -55,3 +55,7 @@ https://github.com/notashelf[notashelf]:
 * `vim.utility.colorizer` has been renamed to `vim.utility.ccc` after the plugin it uses
 
 * Color preview via `nvim-colorizer.lua`
+
+* Updated Lualine statusline UI
+
+* Cleaned up documentation

From c20456e3a103de224795d5c64bb4e931055e5c90 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Tue, 6 Jun 2023 03:05:05 +0300
Subject: [PATCH 128/162] feat: vim-illuminate

---
 extra.nix                            |  1 +
 flake.lock                           | 17 +++++++++++++++++
 flake.nix                            |  5 +++++
 lib/types/plugins.nix                |  1 +
 modules/ui/default.nix               |  1 +
 modules/ui/illuminate/config.nix     | 17 +++++++++++++++++
 modules/ui/illuminate/default.nix    |  6 ++++++
 modules/ui/illuminate/illuminate.nix | 11 +++++++++++
 8 files changed, 59 insertions(+)
 create mode 100644 modules/ui/illuminate/config.nix
 create mode 100644 modules/ui/illuminate/default.nix
 create mode 100644 modules/ui/illuminate/illuminate.nix

diff --git a/extra.nix b/extra.nix
index 9afba32..01d4282 100644
--- a/extra.nix
+++ b/extra.nix
@@ -180,6 +180,7 @@ inputs: let
         noice.enable = true;
         colorizer.enable = true;
         modes-nvim.enable = true;
+        illuminate.enable = true;
         smartcolumn = {
           enable = true;
           columnAt.languages = {
diff --git a/flake.lock b/flake.lock
index 08d8c5b..5d222ac 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1372,6 +1372,7 @@
         "toggleterm-nvim": "toggleterm-nvim",
         "tokyonight": "tokyonight",
         "trouble": "trouble",
+        "vim-illuminate": "vim-illuminate",
         "vim-markdown": "vim-markdown",
         "vim-repeat": "vim-repeat",
         "vim-startify": "vim-startify",
@@ -1668,6 +1669,22 @@
         "type": "github"
       }
     },
+    "vim-illuminate": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1679187974,
+        "narHash": "sha256-8dL3cBjQ2iY4D4gTxKVVmOGhxcSSRuDBvmEwwFIbWsQ=",
+        "owner": "RRethy",
+        "repo": "vim-illuminate",
+        "rev": "a2907275a6899c570d16e95b9db5fd921c167502",
+        "type": "github"
+      },
+      "original": {
+        "owner": "RRethy",
+        "repo": "vim-illuminate",
+        "type": "github"
+      }
+    },
     "vim-markdown": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 62053c6..00631bd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -457,6 +457,11 @@
       flake = false;
     };
 
+    vim-illuminate = {
+      url = "github:RRethy/vim-illuminate";
+      flake = false;
+    };
+
     # Assistant
     copilot-lua = {
       url = "github:zbirenbaum/copilot.lua";
diff --git a/lib/types/plugins.nix b/lib/types/plugins.nix
index c8fc593..6267dc7 100644
--- a/lib/types/plugins.nix
+++ b/lib/types/plugins.nix
@@ -82,6 +82,7 @@ with lib; let
     "elixir-ls"
     "elixir-tools"
     "nvim-colorizer-lua"
+    "vim-illuminate"
   ];
   # You can either use the name of the plugin or a package.
   pluginsType = with types;
diff --git a/modules/ui/default.nix b/modules/ui/default.nix
index 286b3ce..980a04a 100644
--- a/modules/ui/default.nix
+++ b/modules/ui/default.nix
@@ -5,5 +5,6 @@ _: {
     ./notifications
     ./smartcolumn
     ./colorizer
+    ./illuminate
   ];
 }
diff --git a/modules/ui/illuminate/config.nix b/modules/ui/illuminate/config.nix
new file mode 100644
index 0000000..0795d9d
--- /dev/null
+++ b/modules/ui/illuminate/config.nix
@@ -0,0 +1,17 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.ui.illuminate;
+in {
+  config = mkIf cfg.enable {
+    vim.startPlugins = ["vim-illuminate"];
+
+    vim.luaConfigRC.vim-illuminate =
+      nvim.dag.entryAnywhere ''
+      '';
+  };
+}
diff --git a/modules/ui/illuminate/default.nix b/modules/ui/illuminate/default.nix
new file mode 100644
index 0000000..366bb7b
--- /dev/null
+++ b/modules/ui/illuminate/default.nix
@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./config.nix
+    ./illuminate.nix
+  ];
+}
diff --git a/modules/ui/illuminate/illuminate.nix b/modules/ui/illuminate/illuminate.nix
new file mode 100644
index 0000000..952e28c
--- /dev/null
+++ b/modules/ui/illuminate/illuminate.nix
@@ -0,0 +1,11 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; {
+  options.vim.ui.illuminate = {
+    enable = mkEnableOption "vim-illuminate: automatically highlight other uses of the word under the cursor";
+  };
+}

From c290c2adc3810e8489b82349c8bae616012c9ef1 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Tue, 6 Jun 2023 03:25:16 +0300
Subject: [PATCH 129/162] docs: update 0.4 release notes

---
 docs/release-notes/rl-0.4.adoc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index 4eff20b..c1e548c 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -58,4 +58,9 @@ https://github.com/notashelf[notashelf]:
 
 * Updated Lualine statusline UI
 
+* Added vim-illuminate for smart highlighting
+
+* Added a module for enabling Neovim's spellchecker
+
 * Cleaned up documentation
+

From 79edfbdb475b74495957d6248ff36c24d42968ad Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Tue, 6 Jun 2023 03:25:43 +0300
Subject: [PATCH 130/162] fix(illuminate): ignore NvimTree for highlighting

---
 modules/ui/illuminate/config.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/ui/illuminate/config.nix b/modules/ui/illuminate/config.nix
index 0795d9d..dcf9ba3 100644
--- a/modules/ui/illuminate/config.nix
+++ b/modules/ui/illuminate/config.nix
@@ -10,8 +10,15 @@ in {
   config = mkIf cfg.enable {
     vim.startPlugins = ["vim-illuminate"];
 
-    vim.luaConfigRC.vim-illuminate =
-      nvim.dag.entryAnywhere ''
-      '';
+    vim.luaConfigRC.vim-illuminate = nvim.dag.entryAnywhere ''
+        require('illuminate').configure({
+          filetypes_denylist = {
+          'dirvish',
+          'fugitive',
+          'NvimTree',
+          'TelescopePrompt',
+        },
+      })
+    '';
   };
 }

From 30519c1a23404153ab0395b4c4241556806cfbee Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Tue, 6 Jun 2023 03:25:50 +0300
Subject: [PATCH 131/162] feat: neovim spellchecking

---
 modules/basic/config.nix |  4 ++++
 modules/basic/module.nix | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/modules/basic/config.nix b/modules/basic/config.nix
index a3e62c2..d510505 100644
--- a/modules/basic/config.nix
+++ b/modules/basic/config.nix
@@ -138,6 +138,10 @@ in {
       ${optionalString (!cfg.enableEditorconfig) ''
         let g:editorconfig = v:false
       ''}
+      ${optionalString (cfg.spellChecking.enable) ''
+        set spell
+        set spelllang=${toString cfg.spellChecking.language}
+      ''}
     '';
   };
 }
diff --git a/modules/basic/module.nix b/modules/basic/module.nix
index 3db8dfe..ade7d10 100644
--- a/modules/basic/module.nix
+++ b/modules/basic/module.nix
@@ -13,6 +13,7 @@ with builtins; {
         default = 20;
         description = "Set the debug level";
       };
+
       logFile = mkOption {
         type = types.path;
         default = "/tmp/nvim.log";
@@ -20,6 +21,16 @@ with builtins; {
       };
     };
 
+    spellChecking = {
+      enable = mkEnableOption "neovim's built-in spellchecking";
+      language = mkOption {
+        type = types.str;
+        description = "The language to be used for spellchecking";
+        default = "en_US";
+        example = "de";
+      };
+    };
+
     colourTerm = mkOption {
       type = types.bool;
       default = true;

From 0c01fbc12150ea487dbeabc0b3c6dd4b3e61fd60 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Wed, 7 Jun 2023 02:36:02 +0300
Subject: [PATCH 132/162] feat: display LSP source on statusline

---
 modules/statusline/lualine/config.nix  |  5 +++--
 modules/statusline/lualine/lualine.nix | 20 +++++++++++++++++++-
 modules/ui/modes/config.nix            |  3 +++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/modules/statusline/lualine/config.nix b/modules/statusline/lualine/config.nix
index 7d4d879..385e139 100644
--- a/modules/statusline/lualine/config.nix
+++ b/modules/statusline/lualine/config.nix
@@ -12,13 +12,14 @@ in {
     ];
 
     vim.luaConfigRC.lualine = nvim.dag.entryAnywhere ''
-      require('lualine').setup {
+      local lualine = require('lualine')
+      lualine.setup {
         options = {
           icons_enabled = ${boolToString cfg.icons.enable},
           theme = "${cfg.theme}",
           component_separators = {"${cfg.componentSeparator.left}","${cfg.componentSeparator.right}"},
           section_separators = {"${cfg.sectionSeparator.left}","${cfg.sectionSeparator.right}"},
-          disabled_filetypes = { 'alpha' }, -- 'NvimTree'
+          disabled_filetypes = { 'alpha' },
           always_divide_middle = true,
           globalstatus = ${boolToString cfg.globalStatus},
           ignore_focus = {'NvimTree'},
diff --git a/modules/statusline/lualine/lualine.nix b/modules/statusline/lualine/lualine.nix
index 3409194..f9e3473 100644
--- a/modules/statusline/lualine/lualine.nix
+++ b/modules/statusline/lualine/lualine.nix
@@ -183,6 +183,25 @@ in {
         description = "active config for: | A | B | C       (X) | Y | Z |";
         default = ''
           {
+            {
+              -- Lsp server name .
+              function()
+                local msg = 'No Active Lsp'
+                local buf_ft = vim.api.nvim_buf_get_option(0, 'filetype')
+                local clients = vim.lsp.get_active_clients()
+                if next(clients) == nil then
+                  return msg
+                end
+                for _, client in ipairs(clients) do
+                  local filetypes = client.config.filetypes
+                  if filetypes and vim.fn.index(filetypes, buf_ft) ~= -1 then
+                    return client.name
+                  end
+                end
+                return msg
+              end,
+              icon = ' ',
+            },
             {
               "diagnostics",
               sources = {'nvim_lsp', 'nvim_diagnostic', 'coc'},
@@ -227,7 +246,6 @@ in {
               separator = {
                 left = '',
               },
-
             },
             {
               "location",
diff --git a/modules/ui/modes/config.nix b/modules/ui/modes/config.nix
index 2e9ac04..827eca5 100644
--- a/modules/ui/modes/config.nix
+++ b/modules/ui/modes/config.nix
@@ -15,6 +15,9 @@ in {
     vim.luaConfigRC.modes-nvim = nvim.dag.entryAnywhere ''
       require('modes').setup({
         set_cursorline = ${boolToString cfg.setCursorline},
+        line_opacity = {
+          visual = 0,
+        },
         colors = {
           copy = "${toString cfg.colors.copy}",
           delete = "${toString cfg.colors.delete}",

From 2e4025345720985a5f69cd0b3efee529dedd6c9a Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Wed, 7 Jun 2023 14:28:27 +0300
Subject: [PATCH 133/162] feat: nvim-surround

---
 extra.nix                             |  3 ++-
 flake.lock                            | 17 +++++++++++++++++
 flake.nix                             |  5 +++++
 lib/types/plugins.nix                 |  1 +
 modules/utility/default.nix           |  1 +
 modules/utility/surround/config.nix   | 19 +++++++++++++++++++
 modules/utility/surround/default.nix  |  6 ++++++
 modules/utility/surround/surround.nix |  7 +++++++
 8 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 modules/utility/surround/config.nix
 create mode 100644 modules/utility/surround/default.nix
 create mode 100644 modules/utility/surround/surround.nix

diff --git a/extra.nix b/extra.nix
index 01d4282..70ccbfb 100644
--- a/extra.nix
+++ b/extra.nix
@@ -155,6 +155,7 @@ inputs: let
         ccc.enable = isMaximal;
         vim-wakatime.enable = isMaximal;
         icon-picker.enable = isMaximal;
+        surround.enable = isMaximal;
         diffview-nvim.enable = true;
         motion = {
           hop.enable = true;
@@ -179,7 +180,7 @@ inputs: let
       vim.ui = {
         noice.enable = true;
         colorizer.enable = true;
-        modes-nvim.enable = true;
+        modes-nvim.enable = false; # the theme looks terrible with catppuccin
         illuminate.enable = true;
         smartcolumn = {
           enable = true;
diff --git a/flake.lock b/flake.lock
index 5d222ac..1650abd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1092,6 +1092,22 @@
         "type": "github"
       }
     },
+    "nvim-surround": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1685464327,
+        "narHash": "sha256-r3D5WTqEnIL1T3p7cmkRmBY8qgwFFJptM7BKNNsCT8k=",
+        "owner": "kylechui",
+        "repo": "nvim-surround",
+        "rev": "10b20ca7d9da1ac8df8339e140ffef94f9ab3b18",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kylechui",
+        "repo": "nvim-surround",
+        "type": "github"
+      }
+    },
     "nvim-tree-lua": {
       "flake": false,
       "locked": {
@@ -1349,6 +1365,7 @@
         "nvim-neoclip": "nvim-neoclip",
         "nvim-notify": "nvim-notify",
         "nvim-session-manager": "nvim-session-manager",
+        "nvim-surround": "nvim-surround",
         "nvim-tree-lua": "nvim-tree-lua",
         "nvim-treesitter-context": "nvim-treesitter-context",
         "nvim-ts-autotag": "nvim-ts-autotag",
diff --git a/flake.nix b/flake.nix
index 00631bd..6a635b1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -419,6 +419,11 @@
       flake = false;
     };
 
+    nvim-surround = {
+      url = "github:kylechui/nvim-surround";
+      flake = false;
+    };
+
     # Note-taking
     obsidian-nvim = {
       url = "github:epwalsh/obsidian.nvim";
diff --git a/lib/types/plugins.nix b/lib/types/plugins.nix
index 6267dc7..310fdaa 100644
--- a/lib/types/plugins.nix
+++ b/lib/types/plugins.nix
@@ -83,6 +83,7 @@ with lib; let
     "elixir-tools"
     "nvim-colorizer-lua"
     "vim-illuminate"
+    "nvim-surround"
   ];
   # You can either use the name of the plugin or a package.
   pluginsType = with types;
diff --git a/modules/utility/default.nix b/modules/utility/default.nix
index ca4730c..50ec048 100644
--- a/modules/utility/default.nix
+++ b/modules/utility/default.nix
@@ -9,5 +9,6 @@ _: {
     ./telescope
     ./diffview
     ./wakatime
+    ./surround
   ];
 }
diff --git a/modules/utility/surround/config.nix b/modules/utility/surround/config.nix
new file mode 100644
index 0000000..bcd1f51
--- /dev/null
+++ b/modules/utility/surround/config.nix
@@ -0,0 +1,19 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.utility.surround;
+in {
+  config = mkIf (cfg.enable) {
+    vim.startPlugins = [
+      "nvim-surround"
+    ];
+
+    vim.luaConfigRC.surround = nvim.dag.entryAnywhere ''
+      require('nvim-surround').setup()
+    '';
+  };
+}
diff --git a/modules/utility/surround/default.nix b/modules/utility/surround/default.nix
new file mode 100644
index 0000000..4f6d265
--- /dev/null
+++ b/modules/utility/surround/default.nix
@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./config.nix
+    ./surround.nix
+  ];
+}
diff --git a/modules/utility/surround/surround.nix b/modules/utility/surround/surround.nix
new file mode 100644
index 0000000..a29b19b
--- /dev/null
+++ b/modules/utility/surround/surround.nix
@@ -0,0 +1,7 @@
+{lib, ...}:
+with lib;
+with builtins; {
+  options.vim.utility.surround = {
+    enable = mkEnableOption "nvim-surround: add/change/delete surrounding delimiter pairs with ease";
+  };
+}

From 456dee6298a7befd83fb9b0a9a47ab83ede0d69b Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Wed, 7 Jun 2023 14:30:55 +0300
Subject: [PATCH 134/162] dev(lualine): remove background from search results
 component

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

diff --git a/modules/statusline/lualine/lualine.nix b/modules/statusline/lualine/lualine.nix
index f9e3473..ab4d05a 100644
--- a/modules/statusline/lualine/lualine.nix
+++ b/modules/statusline/lualine/lualine.nix
@@ -225,7 +225,7 @@ in {
               'searchcount',
               maxcount = 999,
               timeout = 120,
-
+              color = {bg='${colorPuccin}', fg='lavender'}
             },
             {
               "branch",

From 65dac2959799b51ae668d6979f2b440ee89ff103 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Sat, 10 Jun 2023 08:09:27 +0300
Subject: [PATCH 135/162] feat: bump flake inputs

---
 flake.lock | 126 ++++++++++++++++++++++++++---------------------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1650abd..f2b194b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "alpha-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1683670281,
-        "narHash": "sha256-Jy/p/5XFQY5fvCnalfb58tWvaSmW7sWeA5DUGMKHMr8=",
+        "lastModified": 1686353426,
+        "narHash": "sha256-DgKL4BgEVGSESxdBf8CbWMeAkcN/7vi1DuqIZVvmtlA=",
         "owner": "goolord",
         "repo": "alpha-nvim",
-        "rev": "1838ae926e8d49fe5330d1498ee8289ae2c340bc",
+        "rev": "9e33db324b8bb7a147bce9ea5496686ee859461d",
         "type": "github"
       },
       "original": {
@@ -19,11 +19,11 @@
     "bufdelete-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1685260243,
-        "narHash": "sha256-oqknglSi9leINjLCVgkEMAOiodwYjtiP43hZjCLxDbQ=",
+        "lastModified": 1686311160,
+        "narHash": "sha256-K/1N2FI+kFp4MeO5MNurqUvTPE8O/LsS5JBJcwIQIvY=",
         "owner": "famiu",
         "repo": "bufdelete.nvim",
-        "rev": "ccfa2589fa68512770639839ab3850097fbbf4dc",
+        "rev": "f476dc9d264136b72d386c53bbf77a29598e4b7b",
         "type": "github"
       },
       "original": {
@@ -35,11 +35,11 @@
     "catppuccin": {
       "flake": false,
       "locked": {
-        "lastModified": 1685792299,
-        "narHash": "sha256-SmYHM9NJ6mPKfS3cA840dSSeJU8CpToJDJk/r/4huZs=",
+        "lastModified": 1686327861,
+        "narHash": "sha256-NrZJ1B9z7qfNbLxbwn2ijAS0NwK1U3DbGwIgg0gyZ3c=",
         "owner": "catppuccin",
         "repo": "nvim",
-        "rev": "6c351a82966aad5c96f6bb9a785a1ca4ac68c678",
+        "rev": "2df7036c5c303c9184869936e40ca18935e4afcb",
         "type": "github"
       },
       "original": {
@@ -51,11 +51,11 @@
     "ccc": {
       "flake": false,
       "locked": {
-        "lastModified": 1685810171,
-        "narHash": "sha256-0/xRK6LTa7BZx2szwmBfu3fmh+CKhFbr/MQKCl3KTYc=",
+        "lastModified": 1686236221,
+        "narHash": "sha256-afwOkzcLi67xMzAupm9ZZbVqjm8W4XsWXX8AlrFZiI0=",
         "owner": "uga-rosa",
         "repo": "ccc.nvim",
-        "rev": "72461f8f7496863a54b7ae1681550c22c35080a8",
+        "rev": "5e85133b895b10f7dc7ce46bdad852c990a3f4b9",
         "type": "github"
       },
       "original": {
@@ -275,11 +275,11 @@
     "diffview-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1685633996,
-        "narHash": "sha256-pD/C/jYo91XI0ypruz7xvJY2/PPMoMGc4B+5pUe7db0=",
+        "lastModified": 1686306642,
+        "narHash": "sha256-4T6fTNjaLVP1r46kudg4IHw3MFWlw/hCTRVU9Jf8Xpo=",
         "owner": "sindrets",
         "repo": "diffview.nvim",
-        "rev": "86bf6182e2ea767c21711de8a3c396d9b635d970",
+        "rev": "77cd1e12e5acff62b7be9027325a6c3d9521dcdb",
         "type": "github"
       },
       "original": {
@@ -356,11 +356,11 @@
     "elixir-tools": {
       "flake": false,
       "locked": {
-        "lastModified": 1685794698,
-        "narHash": "sha256-OjTlhwime+bQ2kOruOk50g7Y7Gd7gTZlHTpm+JLWFzU=",
+        "lastModified": 1686251942,
+        "narHash": "sha256-YZh8Y6Qj47JOe0E6Ib9A80R+6p6dvL/rKeP09+ux9Ak=",
         "owner": "elixir-tools",
         "repo": "elixir-tools.nvim",
-        "rev": "807eed64cde71ee7e439a0f606d2b85b9cbd7c9f",
+        "rev": "27c488da1548e62d3e0d09afa1be00f1ba7d73bd",
         "type": "github"
       },
       "original": {
@@ -471,11 +471,11 @@
     "gesture-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1682809703,
-        "narHash": "sha256-ltYTHYgRjQwltnaXZgnZ96OehyMdF9aKgn/NH6pWCuM=",
+        "lastModified": 1686363212,
+        "narHash": "sha256-OK4GKdPDBWbJWyD62nBO+OgACvJYNSpPDv/iU08gZCU=",
         "owner": "notomo",
         "repo": "gesture.nvim",
-        "rev": "b78082f85f9e255f97cde9c8e9ac2025f708eee3",
+        "rev": "27a48729535046f0bd9bd9d2770fc6b0924d99ae",
         "type": "github"
       },
       "original": {
@@ -487,11 +487,11 @@
     "gitsigns-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1685027359,
-        "narHash": "sha256-R7ayrNWGJLKYAOg+P/On9i8nk7GQpY28N2mFb/yped0=",
+        "lastModified": 1686128643,
+        "narHash": "sha256-DmbtKxU/tyFzIUNzoKvtsqlucdINYCSePzLiV7LLGn4=",
         "owner": "lewis6991",
         "repo": "gitsigns.nvim",
-        "rev": "f868d82a36f7f7f5e110eb0a9659993984f59875",
+        "rev": "4455bb5364d29ff86639dfd5533d4fe4b48192d4",
         "type": "github"
       },
       "original": {
@@ -755,11 +755,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1685714850,
-        "narHash": "sha256-OcvbIJq4CGwwFr9m7M/SQcDPZ64hhR4t77oZgEeh7ZY=",
+        "lastModified": 1686338508,
+        "narHash": "sha256-F0bZVV5ChaduBQwAdee0o3zazmCufbXxn/teqsVRqXU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c6ffce3d5df7b4c588ce80a0c6e2d2348a611707",
+        "rev": "66c418d299cd454bd74644eaad905ec4ba2f81a1",
         "type": "github"
       },
       "original": {
@@ -854,11 +854,11 @@
     "noice-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1685295910,
-        "narHash": "sha256-FGxpAZ8srLxdXitR1lYyWtWgLi9+WInyJXF6d1GJynU=",
+        "lastModified": 1686051440,
+        "narHash": "sha256-eWHnaO0qTTOcDATASBKfKx6x7cGNpfX+xP5EqNX8m/A=",
         "owner": "folke",
         "repo": "noice.nvim",
-        "rev": "7e358170cea2314d9768b3f63616e8fad186195e",
+        "rev": "acf47e2b863eb20f177aa1bd5398041513e731e1",
         "type": "github"
       },
       "original": {
@@ -870,11 +870,11 @@
     "nui-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1685184324,
-        "narHash": "sha256-3wbIWsDjR1T8PrAQmiq2++BeGwMgCMx7Rb3qLb/zTy8=",
+        "lastModified": 1686255713,
+        "narHash": "sha256-/ZW760bzrWf0LhDVKhaYt/VuMl4UQM+1iMAwLqDQHCI=",
         "owner": "MunifTanjim",
         "repo": "nui.nvim",
-        "rev": "2b2732528e4a79eb8542568bd51d25f710395bd6",
+        "rev": "062e366afcdf2bc1e9d28313a1df4ff14f05cb4e",
         "type": "github"
       },
       "original": {
@@ -886,11 +886,11 @@
     "null-ls": {
       "flake": false,
       "locked": {
-        "lastModified": 1685458805,
-        "narHash": "sha256-ELMTBAo0d1zcDfOn+uxaOL6R2PyKpcr2+oqBW3yA/s4=",
+        "lastModified": 1686055738,
+        "narHash": "sha256-N8TlKUq9fGzlYaGtOVDE1A40AVoE6vQlM9J1P2WA+sk=",
         "owner": "jose-elias-alvarez",
         "repo": "null-ls.nvim",
-        "rev": "c89333e034a8daba654ebfcf9a4ec9f87765f01e",
+        "rev": "a138b14099e9623832027ea12b4631ddd2a49256",
         "type": "github"
       },
       "original": {
@@ -1031,11 +1031,11 @@
     "nvim-lspconfig": {
       "flake": false,
       "locked": {
-        "lastModified": 1685776137,
-        "narHash": "sha256-vLFbNs2iKD60oO1apfhyz7WK/mjydtHHZSewrothnNg=",
+        "lastModified": 1686358804,
+        "narHash": "sha256-HvaRkuqx7Uk0OTrR8CW4p6lv9h6SMKm7MeiYaeMzlho=",
         "owner": "neovim",
         "repo": "nvim-lspconfig",
-        "rev": "90f5b0c2d7c5d3deb76b5deb0ecc379023c4f299",
+        "rev": "179803f537807fff5b5961a2b3efd9e7ddac54a2",
         "type": "github"
       },
       "original": {
@@ -1063,11 +1063,11 @@
     "nvim-notify": {
       "flake": false,
       "locked": {
-        "lastModified": 1683967791,
-        "narHash": "sha256-WMty/xWLWt1/+1i+dBaOSQExem8zl5zgfpYuub3BHBY=",
+        "lastModified": 1685978736,
+        "narHash": "sha256-Rr2tzuEr06M9ZbvQbC07qcxkyjFJFYdABwRpYelKBFI=",
         "owner": "rcarriga",
         "repo": "nvim-notify",
-        "rev": "f3024b912073774111202f5fa6518b0cd2a74432",
+        "rev": "ea9c8ce7a37f2238f934e087c255758659948e0f",
         "type": "github"
       },
       "original": {
@@ -1111,11 +1111,11 @@
     "nvim-tree-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1685168613,
-        "narHash": "sha256-TZNibkRvpKBTxWwrziJMfVqbEOt4VGiuXjD/+bZhloE=",
+        "lastModified": 1685920257,
+        "narHash": "sha256-STpSTHsCZwMa0waml/grTGx4YiBS75mMG+nbGkPhvXc=",
         "owner": "nvim-tree",
         "repo": "nvim-tree.lua",
-        "rev": "e2a4c9d09d205ebe5f071264f43f73a0077c43a3",
+        "rev": "f5d970d4506f385b29534252d8c15a782fa53034",
         "type": "github"
       },
       "original": {
@@ -1175,11 +1175,11 @@
     "obsidian-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1685470514,
-        "narHash": "sha256-/WV0tibm5jA/O/sWcq/s6DLmI4L0RgiMC2wFF7/1ixU=",
+        "lastModified": 1686329536,
+        "narHash": "sha256-QeWyhWgG86lz33t46rPaBi+k0e14Co1l2eO3HksadoE=",
         "owner": "epwalsh",
         "repo": "obsidian.nvim",
-        "rev": "f509468fa7e8936919e32c0626b477a7ea2b70b7",
+        "rev": "a132e2fb697c85aff0a984d9f00637af10306a0c",
         "type": "github"
       },
       "original": {
@@ -1191,11 +1191,11 @@
     "onedark": {
       "flake": false,
       "locked": {
-        "lastModified": 1683327179,
-        "narHash": "sha256-Cyzix6wdnLly7DTgVUBwervTGguc65vL5LTyyy+HDxg=",
+        "lastModified": 1685799706,
+        "narHash": "sha256-GtTWpOeYVfczc8nd36BIL0Z8J77YC3VjONF+419kJpw=",
         "owner": "navarasu",
         "repo": "onedark.nvim",
-        "rev": "f6e82074761473d30a722f5d90c60282de1ac41d",
+        "rev": "8ef51924724d506e515f2d3ac9f959a9eaf38f3d",
         "type": "github"
       },
       "original": {
@@ -1207,11 +1207,11 @@
     "orgmode-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1685702583,
-        "narHash": "sha256-iEErJZiFUzBbD4tdbt51eihNbvyOd8Lj3ArxSmS9e4g=",
+        "lastModified": 1685983743,
+        "narHash": "sha256-BtS9L2yUM3iSQxZ0Kb1wQ41attdUA/zHck7BjRbEoFw=",
         "owner": "nvim-orgmode",
         "repo": "orgmode",
-        "rev": "7d4a3ffe9f766db7eab4c98610078f62f83965df",
+        "rev": "2737ef2be69b92fb58c6fb3861ca0bbb8f5d499e",
         "type": "github"
       },
       "original": {
@@ -1538,11 +1538,11 @@
     "telescope": {
       "flake": false,
       "locked": {
-        "lastModified": 1684993479,
-        "narHash": "sha256-FIAN3NQrD7PhrtCKnlrr//bZ259qcvGogL45nC8tLpw=",
+        "lastModified": 1686329477,
+        "narHash": "sha256-AvAA21UGL8mpnArvIp0h1Cm9ChsIxnCITrbizvlaa8A=",
         "owner": "nvim-telescope",
         "repo": "telescope.nvim",
-        "rev": "6d3fbffe426794296a77bb0b37b6ae0f4f14f807",
+        "rev": "69e8715786d1ee86249eff326f9d6804ee388502",
         "type": "github"
       },
       "original": {
@@ -1643,11 +1643,11 @@
     "trouble": {
       "flake": false,
       "locked": {
-        "lastModified": 1685083769,
-        "narHash": "sha256-SybmV5wqIcTYSTCvgE3fHII0dsxyFU8qzXE3adCRYsI=",
+        "lastModified": 1686232808,
+        "narHash": "sha256-0aYCAP0714za8CoXPqwWOX8RKn/OdIHxsVWyo2X00fM=",
         "owner": "folke",
         "repo": "trouble.nvim",
-        "rev": "324c977cfeacb8498ca9ba1c74cc35bd18858a8d",
+        "rev": "2af0dd9767526410c88c628f1cbfcb6cf22dd683",
         "type": "github"
       },
       "original": {
@@ -1823,11 +1823,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1685794073,
-        "narHash": "sha256-RrZ6pH2yHhtPqhdR3aMmklOSlLIUyKx5eehDfDWdZFA=",
+        "lastModified": 1686270445,
+        "narHash": "sha256-8oOtdqr2sFsgCVFMcSaHyR8QluCs3okKVopvG/TCaiU=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "8746cd47d75c8533e5859bab1181b33df33c94b4",
+        "rev": "e76cb85afd54b2747ba10bc25f595d6fe71992fb",
         "type": "github"
       },
       "original": {

From b5d5700fcc9c2237a83cb30e2c1a176794516fd7 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Sun, 11 Jun 2023 16:18:37 +0300
Subject: [PATCH 136/162] feat: un-deprecate darwin as zig is no longer marked
 as broken

---
 flake.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6a635b1..0198f1e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,11 +10,8 @@
       systems = [
         "x86_64-linux"
         "aarch64-linux"
-
-        # FIXME: zig compiler - therefore the maximal version - is broken on darwin
-        # see https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/compilers/zig/0.10.nix#L70
-        # "x86_64-darwin"
-        # "aarch64-darwin"
+        "x86_64-darwin"
+        "aarch64-darwin"
       ];
 
       imports = [

From 99c69c4e9ce40fcb01f41f1b1edf54fe6bf288f5 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Mon, 12 Jun 2023 01:12:05 +0200
Subject: [PATCH 137/162] fix(clangd): use same offsetEncoding as null-ls

---
 modules/languages/clang.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/languages/clang.nix b/modules/languages/clang.nix
index c7f421f..32e02f9 100644
--- a/modules/languages/clang.nix
+++ b/modules/languages/clang.nix
@@ -24,8 +24,11 @@ with builtins; let
     clangd = {
       package = pkgs.clang-tools;
       lspConfig = ''
+        local clangd_cap = capabilities
+        -- use same offsetEncoding as null-ls
+        clangd_cap.offsetEncoding = {"utf-16"}
         lspconfig.clangd.setup{
-          capabilities = capabilities;
+          capabilities = clangd_cap;
           on_attach=default_on_attach;
           cmd = {"${cfg.lsp.package}/bin/clangd"};
           ${optionalString (cfg.lsp.opts != null) "init_options = ${cfg.lsp.opts}"}

From b4eaabea957cb2b3bde3e8076be67d797a72eddd Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sun, 25 Jun 2023 14:09:12 +0200
Subject: [PATCH 138/162] fix(flutter-tools): bug where dart lsp is not found

---
 lib/types/plugins.nix             |  1 +
 modules/default.nix               | 22 +++++++++++------
 modules/languages/dart/config.nix |  5 +++-
 modules/languages/dart/dart.nix   | 10 ++++++++
 patches/flutter-tools.patch       | 41 +++++++++++++++++++++++++++++++
 5 files changed, 70 insertions(+), 9 deletions(-)
 create mode 100644 patches/flutter-tools.patch

diff --git a/lib/types/plugins.nix b/lib/types/plugins.nix
index 310fdaa..9515b04 100644
--- a/lib/types/plugins.nix
+++ b/lib/types/plugins.nix
@@ -73,6 +73,7 @@ with lib; let
     "diffview-nvim"
     "todo-comments"
     "flutter-tools"
+    "flutter-tools-patched"
     "hop-nvim"
     "leap-nvim"
     "modes-nvim"
diff --git a/modules/default.nix b/modules/default.nix
index f7abc9e..1e06398 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -25,13 +25,13 @@ inputs: {
       // extraSpecialArgs;
   };
 
-  buildPlug = name:
-    buildVimPluginFrom2Nix rec {
-      pname = name;
-      version = "master";
-      src = assert lib.asserts.assertMsg (name != "nvim-treesitter") "Use buildTreesitterPlug for building nvim-treesitter.";
-        getAttr pname inputs;
-    };
+  buildPlug = {pname, ...} @ args:
+    assert lib.asserts.assertMsg (pname != "nvim-treesitter") "Use buildTreesitterPlug for building nvim-treesitter.";
+      buildVimPluginFrom2Nix (args
+        // {
+          version = "master";
+          src = getAttr pname inputs;
+        });
 
   buildTreesitterPlug = grammars: vimPlugins.nvim-treesitter.withPlugins (_: grammars);
 
@@ -45,7 +45,13 @@ inputs: {
         (
           if (plug == "nvim-treesitter")
           then (buildTreesitterPlug vimOptions.treesitter.grammars)
-          else (buildPlug plug)
+          else if (plug == "flutter-tools-patched")
+          then
+            (buildPlug {
+              pname = "flutter-tools";
+              patches = [../patches/flutter-tools.patch];
+            })
+          else (buildPlug {pname = plug;})
         )
       else plug
     ))
diff --git a/modules/languages/dart/config.nix b/modules/languages/dart/config.nix
index ff19ede..82b061d 100644
--- a/modules/languages/dart/config.nix
+++ b/modules/languages/dart/config.nix
@@ -35,7 +35,10 @@ in {
     })
 
     (mkIf (ftcfg.enable) {
-      vim.startPlugins = ["flutter-tools"];
+      vim.startPlugins =
+        if ftcfg.enableNoResolvePatch
+        then ["flutter-tools-patched"]
+        else ["flutter-tools"];
 
       vim.luaConfigRC.flutter-tools = nvim.dag.entryAnywhere ''
         require('flutter-tools').setup {
diff --git a/modules/languages/dart/dart.nix b/modules/languages/dart/dart.nix
index 728e64d..f6694ad 100644
--- a/modules/languages/dart/dart.nix
+++ b/modules/languages/dart/dart.nix
@@ -56,6 +56,16 @@ in {
         default = config.vim.languages.enableLSP;
       };
 
+      enableNoResolvePatch = mkOption {
+        description = ''
+          Patch flutter-tools so that it doesn't resolve symlinks when detecting flutter path.
+          This is required if you want to use a flutter package built with nix.
+          If you are using a flutter SDK installed from a different source and encounter the error "`dart` missing from PATH", disable this option.
+        '';
+        type = types.bool;
+        default = true;
+      };
+
       color = {
         enable = mkEnableOption "Whether or mot to highlight color variables at all";
 
diff --git a/patches/flutter-tools.patch b/patches/flutter-tools.patch
new file mode 100644
index 0000000..b8315fe
--- /dev/null
+++ b/patches/flutter-tools.patch
@@ -0,0 +1,41 @@
+diff --git a/lua/flutter-tools/executable.lua b/lua/flutter-tools/executable.lua
+index 3807a4f..3345760 100644
+--- a/lua/flutter-tools/executable.lua
++++ b/lua/flutter-tools/executable.lua
+@@ -31,12 +31,12 @@ local function _dart_sdk_root(paths)
+   end
+ 
+   if utils.executable("flutter") then
+-    local flutter_path = fn.resolve(fn.exepath("flutter"))
++    local flutter_path = fn.exepath("flutter")
+     local flutter_bin = fn.fnamemodify(flutter_path, ":h")
+     return path.join(flutter_bin, dart_sdk)
+   end
+ 
+-  if utils.executable("dart") then return fn.resolve(fn.exepath("dart")) end
++  if utils.executable("dart") then return fn.exepath("dart") end
+ 
+   return ""
+ end
+@@ -50,10 +50,10 @@ end
+ ---Get paths for flutter and dart based on the binary locations
+ ---@return table<string, string>
+ local function get_default_binaries()
+-  local flutter_bin = fn.resolve(fn.exepath("flutter"))
++  local flutter_bin = fn.exepath("flutter")
+   return {
+     flutter_bin = flutter_bin,
+-    dart_bin = fn.resolve(fn.exepath("dart")),
++    dart_bin = fn.exepath("dart"),
+     flutter_sdk = _flutter_sdk_root(flutter_bin),
+   }
+ end
+@@ -119,7 +119,7 @@ function M.get(callback)
+   end
+ 
+   if config.flutter_path then
+-    local flutter_path = fn.resolve(config.flutter_path)
++    local flutter_path = config.flutter_path
+     _paths = { flutter_bin = flutter_path, flutter_sdk = _flutter_sdk_root(flutter_path) }
+     _paths.dart_sdk = _dart_sdk_root(_paths)
+     _paths.dart_bin = _flutter_sdk_dart_bin(_paths.flutter_sdk)

From e4c2c3dfe44ec68fd6179b0d5649298f6b5e82d4 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sun, 25 Jun 2023 14:31:01 +0200
Subject: [PATCH 139/162] update docs

---
 docs/release-notes/rl-0.4.adoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index c1e548c..14dcb78 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -1,6 +1,5 @@
 [[sec-release-0.4]]
 == Release 0.4
-
 Following the release of v0.3, I have decided to release v0.4 with a massive new change: customizable keybinds. As of the 0.4 release, keybinds will no longer be hardcoded and instead provided by each module's own keybinds section. The old keybind system (`vim.keybinds = {}`) is now considered deprecated and the new lib functions are recommended to be used for adding keybinds for new plugins, or adding keybinds to existing plugins.
 
 Alongside customizable keybinds, there are a few quality of life updates, such as `lazygit` integration and the new experimental Lua loader of Neovim 0.9 thanks to our awesome contributors who made this update possible during my absence.
@@ -34,6 +33,8 @@ https://github.com/horriblename[horriblename]:
 
 * Added new option `enableluaLoader` to enable neovim's experimental module loader for faster startup time.
 
+* Fixed bug where flutter-tools can't find `dart` LSP
+
 https://github.com/notashelf[notashelf]:
 
 * Made Copilot's Node package configurable. It is recommended to keep as default, but providing a different NodeJS version is now possible.

From 640e37bd0803636cf0f3bfea403764c6332a277b Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Thu, 4 May 2023 18:41:11 +0300
Subject: [PATCH 140/162] dev: init nvim-dap setup

---
 extra.nix                              |  8 ++++++
 flake.lock                             | 34 ++++++++++++++++++++++++++
 flake.nix                              | 11 +++++++++
 lib/types/plugins.nix                  |  2 ++
 modules/debugger/default.nix           |  5 ++++
 modules/debugger/nvim-dap/config.nix   | 23 +++++++++++++++++
 modules/debugger/nvim-dap/default.nix  |  6 +++++
 modules/debugger/nvim-dap/nvim-dap.nix | 10 ++++++++
 modules/modules.nix                    |  1 +
 9 files changed, 100 insertions(+)
 create mode 100644 modules/debugger/default.nix
 create mode 100644 modules/debugger/nvim-dap/config.nix
 create mode 100644 modules/debugger/nvim-dap/default.nix
 create mode 100644 modules/debugger/nvim-dap/nvim-dap.nix

diff --git a/extra.nix b/extra.nix
index 70ccbfb..a38a2da 100644
--- a/extra.nix
+++ b/extra.nix
@@ -39,6 +39,13 @@ inputs: let
         lspSignature.enable = true;
       };
 
+      vim.debugger = {
+        nvim-dap = {
+          enable = true;
+          ui.enable = true;
+        };
+      };
+
       vim.languages = {
         enableLSP = true;
         enableFormat = true;
@@ -217,6 +224,7 @@ inputs: let
           image_text = "The Superior Text Editor";
           client_id = "793271441293967371";
           main_image = "neovim";
+          show_time = true;
           rich_presence = {
             editing_text = "Editing %s";
           };
diff --git a/flake.lock b/flake.lock
index f2b194b..bdde15f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1012,6 +1012,38 @@
         "type": "github"
       }
     },
+    "nvim-dap": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1682077642,
+        "narHash": "sha256-l5sJ6PKW10CtOzSBKzWasWVMZq/mAkgpgWOecIVuV+0=",
+        "owner": "mfussenegger",
+        "repo": "nvim-dap",
+        "rev": "6cedcb527e264c8f25e86afa8dae74c6692dee51",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mfussenegger",
+        "repo": "nvim-dap",
+        "type": "github"
+      }
+    },
+    "nvim-dap-ui": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1683055722,
+        "narHash": "sha256-8TavZqkTCr2/jaO3C8fp+r7qfN6mCzVvidbHGtJGLfs=",
+        "owner": "rcarriga",
+        "repo": "nvim-dap-ui",
+        "rev": "749bfe12d1447703899fa823c1c075fbe2d42c24",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rcarriga",
+        "repo": "nvim-dap-ui",
+        "type": "github"
+      }
+    },
     "nvim-lightbulb": {
       "flake": false,
       "locked": {
@@ -1360,6 +1392,8 @@
         "nvim-colorizer-lua": "nvim-colorizer-lua",
         "nvim-compe": "nvim-compe",
         "nvim-cursorline": "nvim-cursorline",
+        "nvim-dap": "nvim-dap",
+        "nvim-dap-ui": "nvim-dap-ui",
         "nvim-lightbulb": "nvim-lightbulb",
         "nvim-lspconfig": "nvim-lspconfig",
         "nvim-neoclip": "nvim-neoclip",
diff --git a/flake.nix b/flake.nix
index 0198f1e..61aa9c3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -162,6 +162,17 @@
       inputs.flake-utils.follows = "flake-utils";
     };
 
+    # Debuggers
+    nvim-dap = {
+      url = "github:mfussenegger/nvim-dap";
+      flake = false;
+    };
+
+    nvim-dap-ui = {
+      url = "github:rcarriga/nvim-dap-ui";
+      flake = false;
+    };
+
     # Filetrees
     nvim-tree-lua = {
       url = "github:nvim-tree/nvim-tree.lua";
diff --git a/lib/types/plugins.nix b/lib/types/plugins.nix
index 9515b04..111fd8c 100644
--- a/lib/types/plugins.nix
+++ b/lib/types/plugins.nix
@@ -85,6 +85,8 @@ with lib; let
     "nvim-colorizer-lua"
     "vim-illuminate"
     "nvim-surround"
+    "nvim-dap"
+    "nvim-dap-ui"
   ];
   # You can either use the name of the plugin or a package.
   pluginsType = with types;
diff --git a/modules/debugger/default.nix b/modules/debugger/default.nix
new file mode 100644
index 0000000..f882196
--- /dev/null
+++ b/modules/debugger/default.nix
@@ -0,0 +1,5 @@
+_: {
+  imports = [
+    ./nvim-dap
+  ];
+}
diff --git a/modules/debugger/nvim-dap/config.nix b/modules/debugger/nvim-dap/config.nix
new file mode 100644
index 0000000..60d8a92
--- /dev/null
+++ b/modules/debugger/nvim-dap/config.nix
@@ -0,0 +1,23 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.debugger.nvim-dap;
+in {
+  config = mkIf cfg.enable {
+    vim.startPlugins =
+      [
+        "nvim-dap"
+      ]
+      ++ optionals cfg.ui.enable [
+        "nvim-dap-ui"
+      ];
+
+    vim.luaConfigRC.nvim-dap-ui = nvim.dag.entryAnywhere ''
+      require("dapui").setup()
+    '';
+  };
+}
diff --git a/modules/debugger/nvim-dap/default.nix b/modules/debugger/nvim-dap/default.nix
new file mode 100644
index 0000000..083220b
--- /dev/null
+++ b/modules/debugger/nvim-dap/default.nix
@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./config.nix
+    ./nvim-dap.nix
+  ];
+}
diff --git a/modules/debugger/nvim-dap/nvim-dap.nix b/modules/debugger/nvim-dap/nvim-dap.nix
new file mode 100644
index 0000000..14eb359
--- /dev/null
+++ b/modules/debugger/nvim-dap/nvim-dap.nix
@@ -0,0 +1,10 @@
+{lib, ...}:
+with lib; {
+  options.vim.debugger.nvim-dap = {
+    enable = mkEnableOption "Enable debugging via nvim-dap";
+
+    ui = {
+      enable = mkEnableOption "Enable UI extension for nvim-dap";
+    };
+  };
+}
diff --git a/modules/modules.nix b/modules/modules.nix
index a23241c..b3cb152 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -29,6 +29,7 @@
     ./comments
     ./projects
     ./languages
+    ./debugger
   ];
 
   pkgsModule = {config, ...}: {

From 595e76ed2fd1a946f94bff9a989f89f640a2ba29 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Fri, 5 May 2023 15:31:55 +0200
Subject: [PATCH 141/162] feat: option to autostart debugger UI

---
 modules/debugger/nvim-dap/config.nix   | 39 ++++++++++++++++++--------
 modules/debugger/nvim-dap/nvim-dap.nix |  5 ++++
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/modules/debugger/nvim-dap/config.nix b/modules/debugger/nvim-dap/config.nix
index 60d8a92..cf18897 100644
--- a/modules/debugger/nvim-dap/config.nix
+++ b/modules/debugger/nvim-dap/config.nix
@@ -7,17 +7,32 @@ with lib;
 with builtins; let
   cfg = config.vim.debugger.nvim-dap;
 in {
-  config = mkIf cfg.enable {
-    vim.startPlugins =
-      [
-        "nvim-dap"
-      ]
-      ++ optionals cfg.ui.enable [
-        "nvim-dap-ui"
-      ];
+  config = mkMerge [
+    (mkIf cfg.enable {
+      vim.startPlugins = ["nvim-dap"];
 
-    vim.luaConfigRC.nvim-dap-ui = nvim.dag.entryAnywhere ''
-      require("dapui").setup()
-    '';
-  };
+      vim.luaConfigRC.nvim-dap =
+        nvim.dag.entryAnywhere ''
+        '';
+    })
+    (mkIf (cfg.enable && cfg.ui.enable) {
+      vim.startPlugins = ["nvim-dap-ui"];
+
+      vim.luaConfigRC.nvim-dap-ui = nvim.dag.entryAfter ["nvim-dap"] (''
+          local dapui = require("dapui")
+          require("dapui").setup()
+        ''
+        + optionalString cfg.ui.autoStart ''
+          dap.listeners.after.event_initialized["dapui_config"] = function()
+            dapui.open()
+          end
+          dap.listeners.before.event_terminated["dapui_config"] = function()
+            dapui.close()
+          end
+          dap.listeners.before.event_exited["dapui_config"] = function()
+            dapui.close()
+          end
+        '');
+    })
+  ];
 }
diff --git a/modules/debugger/nvim-dap/nvim-dap.nix b/modules/debugger/nvim-dap/nvim-dap.nix
index 14eb359..1a9f2fe 100644
--- a/modules/debugger/nvim-dap/nvim-dap.nix
+++ b/modules/debugger/nvim-dap/nvim-dap.nix
@@ -5,6 +5,11 @@ with lib; {
 
     ui = {
       enable = mkEnableOption "Enable UI extension for nvim-dap";
+      autoStart = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Automatically Opens and Closes DAP-UI upon starting/closing a debugging session";
+      };
     };
   };
 }

From 1eceb04db99fad4412a7c0fa2871197203a3c5c8 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Fri, 5 May 2023 16:16:16 +0200
Subject: [PATCH 142/162] feat: new option enableDAP

---
 modules/languages/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/languages/default.nix b/modules/languages/default.nix
index 0b1ac28..9a5135e 100644
--- a/modules/languages/default.nix
+++ b/modules/languages/default.nix
@@ -27,6 +27,7 @@ in {
 
   options.vim.languages = {
     enableLSP = mkEnable "LSP";
+    enableDAP = mkEnable "Debug Adapter";
     enableTreesitter = mkEnable "treesitter";
     enableFormat = mkEnable "formatting";
     enableExtraDiagnostics = mkEnable "extra diagnostics";

From 624782e1963c5c0c8c1cd83d5ea14134ab0d78c8 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Mon, 8 May 2023 13:01:42 +0200
Subject: [PATCH 143/162] feat: add option for debugger configs

---
 modules/debugger/nvim-dap/config.nix   | 10 +++++++---
 modules/debugger/nvim-dap/nvim-dap.nix |  6 ++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/debugger/nvim-dap/config.nix b/modules/debugger/nvim-dap/config.nix
index cf18897..b3d08f7 100644
--- a/modules/debugger/nvim-dap/config.nix
+++ b/modules/debugger/nvim-dap/config.nix
@@ -11,9 +11,13 @@ in {
     (mkIf cfg.enable {
       vim.startPlugins = ["nvim-dap"];
 
-      vim.luaConfigRC.nvim-dap =
-        nvim.dag.entryAnywhere ''
-        '';
+      vim.luaConfigRC =
+        {
+          nvim-dap = nvim.dag.entryAnywhere ''
+            local dap = require("dap")
+          '';
+        }
+        // mapAttrs (_: v: (nvim.dag.entryAfter ["nvim-dap"] v)) cfg.sources;
     })
     (mkIf (cfg.enable && cfg.ui.enable) {
       vim.startPlugins = ["nvim-dap-ui"];
diff --git a/modules/debugger/nvim-dap/nvim-dap.nix b/modules/debugger/nvim-dap/nvim-dap.nix
index 1a9f2fe..159f88e 100644
--- a/modules/debugger/nvim-dap/nvim-dap.nix
+++ b/modules/debugger/nvim-dap/nvim-dap.nix
@@ -11,5 +11,11 @@ with lib; {
         description = "Automatically Opens and Closes DAP-UI upon starting/closing a debugging session";
       };
     };
+
+    sources = mkOption {
+      default = {};
+      description = "List of debuggers to install";
+      type = with types; attrsOf string;
+    };
   };
 }

From bdf77593ee31347c6521aaf0ca244816af50e1e7 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Mon, 8 May 2023 13:03:03 +0200
Subject: [PATCH 144/162] feat: default dap keybinds

---
 modules/debugger/nvim-dap/config.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/modules/debugger/nvim-dap/config.nix b/modules/debugger/nvim-dap/config.nix
index b3d08f7..805955a 100644
--- a/modules/debugger/nvim-dap/config.nix
+++ b/modules/debugger/nvim-dap/config.nix
@@ -13,8 +13,28 @@ in {
 
       vim.luaConfigRC =
         {
+          # TODO customizable keymaps
           nvim-dap = nvim.dag.entryAnywhere ''
             local dap = require("dap")
+            local opts = { noremap = true, silent = true }
+
+            vim.keymap.set("n", "<leader>d.", "<cmd>lua require'dap'.run_last()<cr>", opts)
+            vim.keymap.set("n", "<leader>dR", "<cmd>lua require'dap'.restart()<cr>", opts)
+            vim.keymap.set("n", "<leader>dq", "<cmd>lua require'dap'.terminate()<cr>", opts)
+            vim.keymap.set("n", "<leader>db", "<cmd>lua require'dap'.toggle_breakpoint()<cr>", opts)
+            vim.keymap.set("n", "<leader>dc", "<cmd>lua require'dap'.continue()<cr>", opts)
+            vim.keymap.set("n", "<leader>dl", "<cmd>lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: '))<cr>", opts)
+            vim.keymap.set("n", "<leader>dgb", "<cmd>lua require'dap'.continue()<cr>", opts)
+            vim.keymap.set("n", "<leader>dgc", "<cmd>lua require'dap'.run_to_cursor()<cr>", opts)
+            vim.keymap.set("n", "<leader>dgi", "<cmd>lua require'dap'.step_into()<cr>", opts)
+            vim.keymap.set("n", "<leader>dgo", "<cmd>lua require'dap'.step_out()<cr>", opts)
+            vim.keymap.set("n", "<leader>dgI", "<cmd>lua require'dap'.down()<cr>", opts)
+            vim.keymap.set("n", "<leader>dgO", "<cmd>lua require'dap'.up()<cr>", opts)
+            vim.keymap.set("n", "<leader>dgj", "<cmd>lua require'dap'.step_over()<cr>", opts)
+            vim.keymap.set("n", "<leader>dgk", "<cmd>lua require'dap'.step_back()<cr>", opts)
+            vim.keymap.set("n", "<leader>dr", "<cmd>lua require'dap'.repl.toggle()<cr>", opts)
+            vim.keymap.set("n", "<leader>dh", "<cmd>lua require'dap.ui.widgets'.hover()<cr>", opts)
+
           '';
         }
         // mapAttrs (_: v: (nvim.dag.entryAfter ["nvim-dap"] v)) cfg.sources;
@@ -25,6 +45,8 @@ in {
       vim.luaConfigRC.nvim-dap-ui = nvim.dag.entryAfter ["nvim-dap"] (''
           local dapui = require("dapui")
           require("dapui").setup()
+          vim.keymap.set("n", "<leader>du", "<cmd>lua require'dapui'.toggle()<cr>", opts)
+          vim.keymap.set({ "n", "v" }, "<leader>dd", "<cmd>lua require'dapui'.eval()<cr>", opts)
         ''
         + optionalString cfg.ui.autoStart ''
           dap.listeners.after.event_initialized["dapui_config"] = function()

From b029426d3444c5690c0e867afe45a2a072732991 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Mon, 8 May 2023 13:03:26 +0200
Subject: [PATCH 145/162] feat: add debugger for go

---
 modules/languages/go.nix | 63 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/modules/languages/go.nix b/modules/languages/go.nix
index 9944006..aae808b 100644
--- a/modules/languages/go.nix
+++ b/modules/languages/go.nix
@@ -21,6 +21,46 @@ with builtins; let
       '';
     };
   };
+  defaultDebugger = "delve";
+  debuggers = {
+    delve = {
+      package = pkgs.delve;
+      dapConfig = ''
+        dap.adapters.delve = {
+          type = "server",
+          port = "''${port}",
+          executable = {
+            command = "${getExe cfg.dap.package}",
+            args = { "dap", "-l", "127.0.0.1:''${port}" },
+          },
+        }
+
+        dap.configurations.go = {
+          {
+            type = "delve",
+            name = "Debug",
+            request = "launch",
+            program = "''${file}",
+          },
+          {
+            type = "delve",
+            name = "Debug test", -- configuration for debugging test files
+            request = "launch",
+            mode = "test",
+            program = "''${file}",
+          },
+          -- works with go.mod packages and sub packages
+          {
+            type = "delve",
+            name = "Debug test (go.mod)",
+            request = "launch",
+            mode = "test",
+            program = "./''${relativeFileDirname}",
+          },
+        }
+      '';
+    };
+  };
 in {
   options.vim.languages.go = {
     enable = mkEnableOption "Go language support";
@@ -46,6 +86,24 @@ in {
         default = servers.${cfg.lsp.server}.package;
       };
     };
+
+    dap = {
+      enable = mkOption {
+        description = "Enable Go Debug Adapter";
+        type = types.bool;
+        default = config.vim.languages.enableDAP;
+      };
+      debugger = mkOption {
+        description = "Go debugger to use";
+        type = with types; enum (attrNames debuggers);
+        default = defaultDebugger;
+      };
+      package = mkOption {
+        description = "Go debugger package.";
+        type = types.package;
+        default = debuggers.${cfg.dap.debugger}.package;
+      };
+    };
   };
 
   config = mkIf cfg.enable (mkMerge [
@@ -58,5 +116,10 @@ in {
       vim.lsp.lspconfig.enable = true;
       vim.lsp.lspconfig.sources.go-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
+
+    (mkIf cfg.dap.enable {
+      vim.debugger.nvim-dap.enable = true;
+      vim.debugger.nvim-dap.sources.go-debugger = debuggers.${cfg.dap.debugger}.dapConfig;
+    })
   ]);
 }

From b3b6f56fbc09240e768f126ea74d7c42906e3613 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 20 May 2023 12:29:55 +0200
Subject: [PATCH 146/162] feat: add dap support for python

---
 modules/languages/python.nix | 91 ++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

diff --git a/modules/languages/python.nix b/modules/languages/python.nix
index d25e7c1..daea5b8 100644
--- a/modules/languages/python.nix
+++ b/modules/languages/python.nix
@@ -36,6 +36,69 @@ with builtins; let
       '';
     };
   };
+
+  defaultDebugger = "debugpy";
+  debuggers = {
+    debugpy = {
+      # idk if this is the best way to install/run debugpy
+      package = pkgs.python3.withPackages (ps: with ps; [debugpy]);
+      dapConfig = ''
+        dap.adapters.python = function(cb, config)
+          if config.request == 'attach' then
+            ---@diagnostic disable-next-line: undefined-field
+            local port = (config.connect or config).port
+            ---@diagnostic disable-next-line: undefined-field
+            local host = (config.connect or config).host or '127.0.0.1'
+            cb({
+              type = 'server',
+              port = assert(port, '`connect.port` is required for a python `attach` configuration'),
+              host = host,
+              options = {
+                source_filetype = 'python',
+              },
+            })
+          else
+            cb({
+              type = 'executable',
+              command = '${getExe cfg.dap.package}',
+              args = { '-m', 'debugpy.adapter' },
+              options = {
+                source_filetype = 'python',
+              },
+            })
+          end
+        end
+
+        dap.configurations.python = {
+          {
+            -- The first three options are required by nvim-dap
+            type = 'python'; -- the type here established the link to the adapter definition: `dap.adapters.python`
+            request = 'launch';
+            name = "Launch file";
+
+            -- Options below are for debugpy, see https://github.com/microsoft/debugpy/wiki/Debug-configuration-settings for supported options
+
+            program = "''${file}"; -- This configuration will launch the current file if used.
+            pythonPath = function()
+              -- debugpy supports launching an application with a different interpreter then the one used to launch debugpy itself.
+              -- The code below looks for a `venv` or `.venv` folder in the current directly and uses the python within.
+              -- You could adapt this - to for example use the `VIRTUAL_ENV` environment variable.
+              local cwd = vim.fn.getcwd()
+              if vim.fn.executable(cwd .. '/venv/bin/python') == 1 then
+                return cwd .. '/venv/bin/python'
+              elseif vim.fn.executable(cwd .. '/.venv/bin/python') == 1 then
+                return cwd .. '/.venv/bin/python'
+              elseif vim.fn.executable("python") == 1 then
+                return vim.fn.exepath("python")
+              else -- WARNING cfg.dap.package probably has NO libraries other than builtins and debugpy
+                return '${getExe cfg.dap.package}'
+              end
+            end;
+          },
+        }
+      '';
+    };
+  };
 in {
   options.vim.languages.python = {
     enable = mkEnableOption "Python language support";
@@ -80,6 +143,29 @@ in {
         default = formats.${cfg.format.type}.package;
       };
     };
+
+    # TODO this implementation is very bare bones, I don't know enough python to implement everything
+    dap = {
+      enable = mkOption {
+        description = "Enable Python Debug Adapter";
+        type = types.bool;
+        default = config.vim.languages.enableDAP;
+      };
+      debugger = mkOption {
+        description = "Python debugger to use";
+        type = with types; enum (attrNames debuggers);
+        default = defaultDebugger;
+      };
+      package = mkOption {
+        description = ''
+          Python debugger package.
+          This is a python package with debugpy installed, see https://nixos.wiki/wiki/Python#Install_Python_Packages.
+        '';
+        example = literalExpression "with pkgs; python39.withPackages (ps: with ps; [debugpy])";
+        type = types.package;
+        default = debuggers.${cfg.dap.debugger}.package;
+      };
+    };
   };
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
@@ -96,5 +182,10 @@ in {
       vim.lsp.null-ls.enable = true;
       vim.lsp.null-ls.sources.python-format = formats.${cfg.format.type}.nullConfig;
     })
+
+    (mkIf cfg.dap.enable {
+      vim.debugger.nvim-dap.enable = true;
+      vim.debugger.nvim-dap.sources.python-debugger = debuggers.${cfg.dap.debugger}.dapConfig;
+    })
   ]);
 }

From 3a8b614ea9b2d5bcbf6fd03111eb9aa228ac546b Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sat, 20 May 2023 13:46:19 +0200
Subject: [PATCH 147/162] feat: add dap support for clang

---
 modules/languages/clang.nix | 52 +++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/modules/languages/clang.nix b/modules/languages/clang.nix
index 32e02f9..7d201e4 100644
--- a/modules/languages/clang.nix
+++ b/modules/languages/clang.nix
@@ -36,6 +36,35 @@ with builtins; let
       '';
     };
   };
+
+  defaultDebugger = "lldb-vscode";
+  debuggers = {
+    lldb-vscode = {
+      package = pkgs.lldb;
+      dapConfig = ''
+        dap.adapters.lldb = {
+          type = 'executable',
+          command = '${cfg.dap.package}/bin/lldb-vscode',
+          name = 'lldb'
+        }
+        dap.configurations.cpp = {
+          {
+            name = 'Launch',
+            type = 'lldb',
+            request = 'launch',
+            program = function()
+              return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
+            end,
+            cwd = "''${workspaceFolder}",
+            stopOnEntry = false,
+            args = {},
+          },
+        }
+
+        dap.configurations.c = dap.configurations.cpp
+      '';
+    };
+  };
 in {
   options.vim.languages.clang = {
     enable = mkEnableOption "C/C++ language support";
@@ -76,6 +105,24 @@ in {
         default = null;
       };
     };
+
+    dap = {
+      enable = mkOption {
+        description = "Enable clang Debug Adapter";
+        type = types.bool;
+        default = config.vim.languages.enableDAP;
+      };
+      debugger = mkOption {
+        description = "clang debugger to use";
+        type = with types; enum (attrNames debuggers);
+        default = defaultDebugger;
+      };
+      package = mkOption {
+        description = "clang debugger package.";
+        type = types.package;
+        default = debuggers.${cfg.dap.debugger}.package;
+      };
+    };
   };
 
   config = mkIf cfg.enable (mkMerge [
@@ -93,5 +140,10 @@ in {
 
       vim.lsp.lspconfig.sources.clang-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
+
+    (mkIf cfg.dap.enable {
+      vim.debugger.nvim-dap.enable = true;
+      vim.debugger.nvim-dap.sources.clang-debugger = debuggers.${cfg.dap.debugger}.dapConfig;
+    })
   ]);
 }

From 588d348bd299a3a2040c7d3daddbd7603c028d46 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Mon, 22 May 2023 01:55:26 +0200
Subject: [PATCH 148/162] feat: add dap support for rust

---
 modules/languages/rust.nix | 44 +++++++++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/modules/languages/rust.nix b/modules/languages/rust.nix
index 1298c9f..21ab58d 100644
--- a/modules/languages/rust.nix
+++ b/modules/languages/rust.nix
@@ -40,6 +40,19 @@ in {
         default = "";
       };
     };
+
+    dap = {
+      enable = mkOption {
+        description = "Rust Debug Adapter support";
+        type = types.bool;
+        default = config.vim.languages.enableDAP;
+      };
+      package = mkOption {
+        description = "lldb pacakge";
+        type = types.package;
+        default = pkgs.lldb;
+      };
+    };
   };
 
   config = mkIf cfg.enable (mkMerge [
@@ -62,8 +75,8 @@ in {
       vim.treesitter.enable = true;
       vim.treesitter.grammars = [cfg.treesitter.package];
     })
-    (mkIf cfg.lsp.enable {
-      vim.startPlugins = ["rust-tools"];
+    (mkIf (cfg.lsp.enable || cfg.dap.enable) {
+      vim.startPlugins = ["rust-tools"] ++ optionals cfg.dap.enable [cfg.dap.package];
 
       vim.lsp.lspconfig.enable = true;
       vim.lsp.lspconfig.sources.rust-lsp = ''
@@ -78,6 +91,21 @@ in {
           vim.keymap.set("n", "<leader>rm", rt.expand_macro.expand_macro, opts)
           vim.keymap.set("n", "<leader>rc", rt.open_cargo_toml.open_cargo_toml, opts)
           vim.keymap.set("n", "<leader>rg", function() rt.crate_graph.view_crate_graph("x11", nil) end, opts)
+          ${optionalString cfg.dap.enable ''
+          vim.keymap.set("n", "<leader>rd", ":RustDebuggables<cr>", opts)
+          vim.keymap.set(
+            "n", "${config.vim.debugger.nvim-dap.mappings.continue}",
+            function()
+              local dap = require("dap")
+              if dap.status() == "" then
+                vim.cmd "RustDebuggables"
+              else
+                dap.continue()
+              end
+            end,
+            opts
+          )
+        ''}
         end
         local rustopts = {
           tools = {
@@ -94,7 +122,17 @@ in {
             settings = {
               ${cfg.lsp.opts}
             }
-          }
+          },
+
+          ${optionalString cfg.dap.enable ''
+          dap = {
+            adapter = {
+              type = "executable",
+              command = "${cfg.dap.package}/bin/lldb-vscode",
+              name = "rt_lldb",
+            },
+          },
+        ''}
         }
         rt.setup(rustopts)
       '';

From fe9da14d85235cea756696fc17414d15efb848a0 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Mon, 12 Jun 2023 02:59:34 +0200
Subject: [PATCH 149/162] feat: add mapping options for nvim-dap

---
 modules/debugger/nvim-dap/config.nix   | 49 ++++++++++++++------------
 modules/debugger/nvim-dap/nvim-dap.nix | 22 ++++++++++++
 2 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/modules/debugger/nvim-dap/config.nix b/modules/debugger/nvim-dap/config.nix
index 805955a..35610a8 100644
--- a/modules/debugger/nvim-dap/config.nix
+++ b/modules/debugger/nvim-dap/config.nix
@@ -6,6 +6,11 @@
 with lib;
 with builtins; let
   cfg = config.vim.debugger.nvim-dap;
+  self = import ./nvim-dap.nix {
+    inherit lib;
+  };
+  mappingDefinitions = self.options.vim.debugger.nvim-dap.mappings;
+  mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkMerge [
     (mkIf cfg.enable {
@@ -16,37 +21,36 @@ in {
           # TODO customizable keymaps
           nvim-dap = nvim.dag.entryAnywhere ''
             local dap = require("dap")
-            local opts = { noremap = true, silent = true }
-
-            vim.keymap.set("n", "<leader>d.", "<cmd>lua require'dap'.run_last()<cr>", opts)
-            vim.keymap.set("n", "<leader>dR", "<cmd>lua require'dap'.restart()<cr>", opts)
-            vim.keymap.set("n", "<leader>dq", "<cmd>lua require'dap'.terminate()<cr>", opts)
-            vim.keymap.set("n", "<leader>db", "<cmd>lua require'dap'.toggle_breakpoint()<cr>", opts)
-            vim.keymap.set("n", "<leader>dc", "<cmd>lua require'dap'.continue()<cr>", opts)
-            vim.keymap.set("n", "<leader>dl", "<cmd>lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: '))<cr>", opts)
-            vim.keymap.set("n", "<leader>dgb", "<cmd>lua require'dap'.continue()<cr>", opts)
-            vim.keymap.set("n", "<leader>dgc", "<cmd>lua require'dap'.run_to_cursor()<cr>", opts)
-            vim.keymap.set("n", "<leader>dgi", "<cmd>lua require'dap'.step_into()<cr>", opts)
-            vim.keymap.set("n", "<leader>dgo", "<cmd>lua require'dap'.step_out()<cr>", opts)
-            vim.keymap.set("n", "<leader>dgI", "<cmd>lua require'dap'.down()<cr>", opts)
-            vim.keymap.set("n", "<leader>dgO", "<cmd>lua require'dap'.up()<cr>", opts)
-            vim.keymap.set("n", "<leader>dgj", "<cmd>lua require'dap'.step_over()<cr>", opts)
-            vim.keymap.set("n", "<leader>dgk", "<cmd>lua require'dap'.step_back()<cr>", opts)
-            vim.keymap.set("n", "<leader>dr", "<cmd>lua require'dap'.repl.toggle()<cr>", opts)
-            vim.keymap.set("n", "<leader>dh", "<cmd>lua require'dap.ui.widgets'.hover()<cr>", opts)
-
           '';
         }
         // mapAttrs (_: v: (nvim.dag.entryAfter ["nvim-dap"] v)) cfg.sources;
+
+      vim.maps.normal = mkMerge [
+        (mkSetLuaBinding mappings.continue "require('dap').continue")
+        (mkSetLuaBinding mappings.restart "require('dap').restart")
+        (mkSetLuaBinding mappings.terminate "require('dap').terminate")
+        (mkSetLuaBinding mappings.runLast "require('dap').run_last")
+
+        (mkSetLuaBinding mappings.toggleRepl "require('dap').repl.toggle")
+        (mkSetLuaBinding mappings.hover "require('dap.ui.widgets').hover")
+        (mkSetLuaBinding mappings.toggleBreakpoint "require('dap').toggle_breakpoint")
+
+        (mkSetLuaBinding mappings.runToCursor "require('dap').run_to_cursor")
+        (mkSetLuaBinding mappings.stepInto "require('dap').step_into")
+        (mkSetLuaBinding mappings.stepOut "require('dap').step_out")
+        (mkSetLuaBinding mappings.stepOver "require('dap').step_over")
+        (mkSetLuaBinding mappings.stepBack "require('dap').step_back")
+
+        (mkSetLuaBinding mappings.goUp "require('dap').up")
+        (mkSetLuaBinding mappings.goDown "require('dap').down")
+      ];
     })
     (mkIf (cfg.enable && cfg.ui.enable) {
       vim.startPlugins = ["nvim-dap-ui"];
 
       vim.luaConfigRC.nvim-dap-ui = nvim.dag.entryAfter ["nvim-dap"] (''
           local dapui = require("dapui")
-          require("dapui").setup()
-          vim.keymap.set("n", "<leader>du", "<cmd>lua require'dapui'.toggle()<cr>", opts)
-          vim.keymap.set({ "n", "v" }, "<leader>dd", "<cmd>lua require'dapui'.eval()<cr>", opts)
+          dapui.setup()
         ''
         + optionalString cfg.ui.autoStart ''
           dap.listeners.after.event_initialized["dapui_config"] = function()
@@ -59,6 +63,7 @@ in {
             dapui.close()
           end
         '');
+      vim.maps.normal = mkSetLuaBinding mappings.toggleDapUI "require('dapui').toggle";
     })
   ];
 }
diff --git a/modules/debugger/nvim-dap/nvim-dap.nix b/modules/debugger/nvim-dap/nvim-dap.nix
index 159f88e..b0fcb5e 100644
--- a/modules/debugger/nvim-dap/nvim-dap.nix
+++ b/modules/debugger/nvim-dap/nvim-dap.nix
@@ -17,5 +17,27 @@ with lib; {
       description = "List of debuggers to install";
       type = with types; attrsOf string;
     };
+
+    mappings = {
+      continue = mkMappingOption "Contiue" "<leader>dc";
+      restart = mkMappingOption "Restart" "<leader>dR";
+      terminate = mkMappingOption "Terminate" "<leader>dq";
+      runLast = mkMappingOption "Re-run Last Debug Session" "<leader>d.";
+
+      toggleRepl = mkMappingOption "Toggle Repl" "<leader>dr";
+      hover = mkMappingOption "Hover" "<leader>dh";
+      toggleBreakpoint = mkMappingOption "Toggle breakpoint" "<leader>db";
+
+      runToCursor = mkMappingOption "Continue to the current cursor" "<leader>dgc";
+      stepInto = mkMappingOption "Step into function" "<leader>dgi";
+      stepOut = mkMappingOption "Step out of function" "<leader>dgo";
+      stepOver = mkMappingOption "Next step" "<leader>dgj";
+      stepBack = mkMappingOption "Step back" "<leader>dgk";
+
+      goUp = mkMappingOption "Go up stacktrace" "<leader>dvo";
+      goDown = mkMappingOption "Go down stacktrace" "<leader>dvi";
+
+      toggleDapUI = mkMappingOption "Toggle DAP-UI" "<leader>du";
+    };
   };
 }

From ae0a2389ff1fca0d9dff29f2ccdc0baee9fc5f65 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 15 Jun 2023 18:17:13 +0200
Subject: [PATCH 150/162] feat(dap): add breakpoint icon

---
 modules/debugger/nvim-dap/config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/debugger/nvim-dap/config.nix b/modules/debugger/nvim-dap/config.nix
index 35610a8..874e1b6 100644
--- a/modules/debugger/nvim-dap/config.nix
+++ b/modules/debugger/nvim-dap/config.nix
@@ -21,6 +21,7 @@ in {
           # TODO customizable keymaps
           nvim-dap = nvim.dag.entryAnywhere ''
             local dap = require("dap")
+            vim.fn.sign_define("DapBreakpoint", { text = "🛑", texthl = "ErrorMsg", linehl = "", numhl = "" })
           '';
         }
         // mapAttrs (_: v: (nvim.dag.entryAfter ["nvim-dap"] v)) cfg.sources;

From b5efd5cba7e2d0c740e70e09a217e9cbb66a7e30 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Tue, 27 Jun 2023 00:04:48 +0200
Subject: [PATCH 151/162] feat: add dap support for dart

---
 modules/languages/dart/config.nix | 6 +++++-
 modules/languages/dart/dart.nix   | 8 ++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/languages/dart/config.nix b/modules/languages/dart/config.nix
index 82b061d..c4761cd 100644
--- a/modules/languages/dart/config.nix
+++ b/modules/languages/dart/config.nix
@@ -55,8 +55,12 @@ in {
             on_attach = default_on_attach;
             flags = lsp_flags,
           },
+          ${optionalString cfg.dap.enable ''
+          debugger = {
+            enabled = true,
+          },
+        ''}
         }
-
       '';
     })
   ]);
diff --git a/modules/languages/dart/dart.nix b/modules/languages/dart/dart.nix
index f6694ad..b985224 100644
--- a/modules/languages/dart/dart.nix
+++ b/modules/languages/dart/dart.nix
@@ -49,6 +49,14 @@ in {
       };
     };
 
+    dap = {
+      enable = mkOption {
+        description = "Enable Dart DAP support via flutter-tools";
+        type = types.bool;
+        default = config.vim.languages.enableDAP;
+      };
+    };
+
     flutter-tools = {
       enable = mkOption {
         description = "Enable flutter-tools for flutter support";

From 18e95533d6727ccc35710b0e4c5b4ec2a7d10e19 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Tue, 27 Jun 2023 00:07:56 +0200
Subject: [PATCH 152/162] update docs

---
 docs/release-notes/rl-0.4.adoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index 14dcb78..389a19c 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -35,6 +35,8 @@ https://github.com/horriblename[horriblename]:
 
 * Fixed bug where flutter-tools can't find `dart` LSP
 
+* Added Debug Adapter (DAP) support for clang, rust, go, python and dart.
+
 https://github.com/notashelf[notashelf]:
 
 * Made Copilot's Node package configurable. It is recommended to keep as default, but providing a different NodeJS version is now possible.

From 8cda01b8855f4fce2f35a9027e81f57e94ccbd12 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 11 Jul 2023 22:54:22 +0300
Subject: [PATCH 153/162] feat: add prettierd as an alternative to prettier

---
 docs/release-notes/rl-0.4.adoc |  2 ++
 modules/languages/ts.nix       | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index c1e548c..801f7f8 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -62,5 +62,7 @@ https://github.com/notashelf[notashelf]:
 
 * Added a module for enabling Neovim's spellchecker
 
+* Replaced prettier with prettierd - the daemonized version of prettier
+
 * Cleaned up documentation
 
diff --git a/modules/languages/ts.nix b/modules/languages/ts.nix
index 3989b47..8c2efe2 100644
--- a/modules/languages/ts.nix
+++ b/modules/languages/ts.nix
@@ -36,6 +36,17 @@ with builtins; let
         )
       '';
     };
+    prettierd = {
+      package = pkgs.prettierd;
+      nullConfig = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.prettier.with({
+            command = "${cfg.format.package}/bin/prettierd",
+          })
+        )
+      '';
+    };
   };
 
   # TODO: specify packages

From 24f6ed145e8fef5c1cab93b7b9db92c50ba5a754 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 11 Jul 2023 22:54:43 +0300
Subject: [PATCH 154/162] feat: default to prettierd over prettier

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

diff --git a/modules/languages/ts.nix b/modules/languages/ts.nix
index 8c2efe2..44fc765 100644
--- a/modules/languages/ts.nix
+++ b/modules/languages/ts.nix
@@ -23,7 +23,7 @@ with builtins; let
   };
 
   # TODO: specify packages
-  defaultFormat = "prettier";
+  defaultFormat = "prettierd";
   formats = {
     prettier = {
       package = pkgs.nodePackages.prettier;

From e8e60e5f2d68ac48b92a1616165deb8dfb7a62a1 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 11 Jul 2023 23:13:12 +0300
Subject: [PATCH 155/162] feat: bump flake inputs

---
 flake.lock | 288 ++++++++++++++++++++++++++---------------------------
 1 file changed, 144 insertions(+), 144 deletions(-)

diff --git a/flake.lock b/flake.lock
index bdde15f..1fd378d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -19,11 +19,11 @@
     "bufdelete-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1686311160,
-        "narHash": "sha256-K/1N2FI+kFp4MeO5MNurqUvTPE8O/LsS5JBJcwIQIvY=",
+        "lastModified": 1688027130,
+        "narHash": "sha256-UubYRfRAXZ89WOc3QFMvAMjNjLW6bV4nDgSa1CRZkIM=",
         "owner": "famiu",
         "repo": "bufdelete.nvim",
-        "rev": "f476dc9d264136b72d386c53bbf77a29598e4b7b",
+        "rev": "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4",
         "type": "github"
       },
       "original": {
@@ -35,11 +35,11 @@
     "catppuccin": {
       "flake": false,
       "locked": {
-        "lastModified": 1686327861,
-        "narHash": "sha256-NrZJ1B9z7qfNbLxbwn2ijAS0NwK1U3DbGwIgg0gyZ3c=",
+        "lastModified": 1689075390,
+        "narHash": "sha256-lMVMSj3pTgkzr3+tLS1jzNRNk5gBXuaqzWJFGi4Cwmc=",
         "owner": "catppuccin",
         "repo": "nvim",
-        "rev": "2df7036c5c303c9184869936e40ca18935e4afcb",
+        "rev": "3ffd2f511f3dc6c01258923d7170ccaf1445634b",
         "type": "github"
       },
       "original": {
@@ -51,11 +51,11 @@
     "ccc": {
       "flake": false,
       "locked": {
-        "lastModified": 1686236221,
-        "narHash": "sha256-afwOkzcLi67xMzAupm9ZZbVqjm8W4XsWXX8AlrFZiI0=",
+        "lastModified": 1686587775,
+        "narHash": "sha256-T1ryyTdbU/335MpD184PSnBLgj4S2Kzf9hZnwc9to+I=",
         "owner": "uga-rosa",
         "repo": "ccc.nvim",
-        "rev": "5e85133b895b10f7dc7ce46bdad852c990a3f4b9",
+        "rev": "4a0ddaf787cc82796e84ab8a7f70d086f250aeb6",
         "type": "github"
       },
       "original": {
@@ -131,11 +131,11 @@
     "cmp-nvim-lsp": {
       "flake": false,
       "locked": {
-        "lastModified": 1675708067,
-        "narHash": "sha256-DxpcPTBlvVP88PDoTheLV2fC76EXDqS2UpM5mAfj/D4=",
+        "lastModified": 1687494203,
+        "narHash": "sha256-mU0soCz79erJXMMqD/FyrJZ0mu2n6fE0deymPzQlxts=",
         "owner": "hrsh7th",
         "repo": "cmp-nvim-lsp",
-        "rev": "0e6b2ed705ddcff9738ec4ea838141654f12eeef",
+        "rev": "44b16d11215dce86f253ce0c30949813c0a90765",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
     "codewindow-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1684029376,
-        "narHash": "sha256-aPuGv5w1+++fJBODh+TCfHhgn7f3H0/B+VzqZaN+dSE=",
+        "lastModified": 1686581763,
+        "narHash": "sha256-PtT8tnnKQgd9tVGZq2nXjOyzNx0tgEHVYtJwhsVxNxs=",
         "owner": "gorbit99",
         "repo": "codewindow.nvim",
-        "rev": "1a69ccebbc8b58b900684eddd9df38cfc034e300",
+        "rev": "c6bb650673f0026d6dca3f3bf31b93e486f23b4c",
         "type": "github"
       },
       "original": {
@@ -211,11 +211,11 @@
     "comment-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1685617167,
-        "narHash": "sha256-au/jG2jhRKQwLxCTODNmLcy5aJBFfg5j9wtQvWhby4g=",
+        "lastModified": 1686546603,
+        "narHash": "sha256-XM9yhp+SGxfAOdN/eDunzM0TMoCJhVth3wpFKNCGf3g=",
         "owner": "numToStr",
         "repo": "Comment.nvim",
-        "rev": "c8043290f2d77f61025494d839d88e414608c460",
+        "rev": "176e85eeb63f1a5970d6b88f1725039d85ca0055",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
     "copilot-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1685261869,
-        "narHash": "sha256-jBTS8MeN7Ydf0ZY7JWbrxaGo/GeDoEClfULiJVfN8Wo=",
+        "lastModified": 1688190439,
+        "narHash": "sha256-lD9FdbKKZ6d/BjIfqp0Ust2hqSYNLpCFWxuaKUO9qLs=",
         "owner": "zbirenbaum",
         "repo": "copilot.lua",
-        "rev": "77e3a4907928f0813024e573b882dc879dfc0c6b",
+        "rev": "e48bd7020a98be217d85c006a298656294fd6210",
         "type": "github"
       },
       "original": {
@@ -243,11 +243,11 @@
     "crates-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1684475320,
-        "narHash": "sha256-qsVU22P9TC6wXghH/6VhQHmWcpQmRPUWVViPUSp3m6k=",
+        "lastModified": 1688295570,
+        "narHash": "sha256-ah+fTmzkZn+xuL3sG2RxlCtDiFsRv3SY1iJzYKMIaMg=",
         "owner": "Saecki",
         "repo": "crates.nvim",
-        "rev": "3648f8787656d7572740560331553abdaa8cb982",
+        "rev": "4ce7c51b881e58f1e2f8f437f30e4e583cbac319",
         "type": "github"
       },
       "original": {
@@ -259,11 +259,11 @@
     "dashboard-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1683093735,
-        "narHash": "sha256-ZmP+AEwmWwnWgGoImXSkYp55Q2qQDzaC8O+ZmPR/bjs=",
+        "lastModified": 1686720490,
+        "narHash": "sha256-UDrUQUO9J6mjFBlCMYELuMff/VQCsFca0EFLyDpMsa4=",
         "owner": "glepnir",
         "repo": "dashboard-nvim",
-        "rev": "0af0ad181db271ef8d5a332f4cfcec9118340497",
+        "rev": "ab84915f7cfd7bc7a5bfe7409c3eccf8d09c162a",
         "type": "github"
       },
       "original": {
@@ -275,11 +275,11 @@
     "diffview-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1686306642,
-        "narHash": "sha256-4T6fTNjaLVP1r46kudg4IHw3MFWlw/hCTRVU9Jf8Xpo=",
+        "lastModified": 1688823183,
+        "narHash": "sha256-vIp39TIxLFBvvF9mIvJI0TnNoukNNirc73h7ATZn90M=",
         "owner": "sindrets",
         "repo": "diffview.nvim",
-        "rev": "77cd1e12e5acff62b7be9027325a6c3d9521dcdb",
+        "rev": "b0cc22f5708f6b2b4f873b44fbc5eb93020f4e0c",
         "type": "github"
       },
       "original": {
@@ -308,11 +308,11 @@
     "dracula": {
       "flake": false,
       "locked": {
-        "lastModified": 1685711944,
-        "narHash": "sha256-NJ8BwhxL9v99MzM97P9/8UzhhMZS0kBvCMDq5NXP5ps=",
+        "lastModified": 1688966998,
+        "narHash": "sha256-oNR3Z8psn13/X96Ub+xtvKuNTO3mNFR/55cESD/Jg0A=",
         "owner": "Mofiqul",
         "repo": "dracula.nvim",
-        "rev": "52f6d1c48589479d519c1aaea93dba1dd550a7a4",
+        "rev": "608ebc389514674213a74f1d173c00f85bebc008",
         "type": "github"
       },
       "original": {
@@ -324,11 +324,11 @@
     "dressing-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1685732991,
-        "narHash": "sha256-Tz/yG7HjwRDF4LXTng2laP9k3K+O/a0ttjEaSNcRnZs=",
+        "lastModified": 1687797303,
+        "narHash": "sha256-ZBioRuUITIJnDACguFPZZDulY7OSzGxXL1s/1+qDHKA=",
         "owner": "stevearc",
         "repo": "dressing.nvim",
-        "rev": "f16d7586fcdd8b2e3850d0abb7e46f944125cc25",
+        "rev": "e6eff7a5a950a853c3903d906dbcea03f778db5f",
         "type": "github"
       },
       "original": {
@@ -340,11 +340,11 @@
     "elixir-ls": {
       "flake": false,
       "locked": {
-        "lastModified": 1685248350,
-        "narHash": "sha256-R0OWDAql7l0ghtzK9zygjtQoZsAxmk/+TGOmokfzlDw=",
+        "lastModified": 1689104929,
+        "narHash": "sha256-s9RXMnWIS/clsjxJxa+Mztl7ecQRP0a+J6VFAbkgM5I=",
         "owner": "elixir-lsp",
         "repo": "elixir-ls",
-        "rev": "10ffd298fa9e10232314908eb6b2a8fc40eac3e4",
+        "rev": "7546fb1469577b3be7b6689e57485250bf58c3d3",
         "type": "github"
       },
       "original": {
@@ -356,11 +356,11 @@
     "elixir-tools": {
       "flake": false,
       "locked": {
-        "lastModified": 1686251942,
-        "narHash": "sha256-YZh8Y6Qj47JOe0E6Ib9A80R+6p6dvL/rKeP09+ux9Ak=",
+        "lastModified": 1688528109,
+        "narHash": "sha256-gcKjlNe0TwBT2bouASwphbAdeFcGO50EJmtd3/Zsvts=",
         "owner": "elixir-tools",
         "repo": "elixir-tools.nvim",
-        "rev": "27c488da1548e62d3e0d09afa1be00f1ba7d73bd",
+        "rev": "e0c713f86333faf0484543b4c50d14ce8d1de1d2",
         "type": "github"
       },
       "original": {
@@ -372,11 +372,11 @@
     "fidget-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1679938700,
-        "narHash": "sha256-rmJgfrEr/PYBq0S7j3tzRZvxi7PMMaAo0k528miXOQc=",
+        "lastModified": 1686378278,
+        "narHash": "sha256-ZLe54bRMctXlBo8zH9Qy6HbrkVSlGhPiXg38aAja9C8=",
         "owner": "j-hui",
         "repo": "fidget.nvim",
-        "rev": "0ba1e16d07627532b6cae915cc992ecac249fb97",
+        "rev": "f1c375ba68839eaa4a65efdf2aa078c0da0548fe",
         "type": "github"
       },
       "original": {
@@ -406,11 +406,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1685662779,
-        "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
+        "lastModified": 1688466019,
+        "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
+        "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
         "type": "github"
       },
       "original": {
@@ -424,11 +424,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "lastModified": 1689068808,
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
         "type": "github"
       },
       "original": {
@@ -455,11 +455,11 @@
     "flutter-tools": {
       "flake": false,
       "locked": {
-        "lastModified": 1684054309,
-        "narHash": "sha256-K6ny6GGa34H2wVKpQob1V7C7/KfcgJIpwn76sKZiNpI=",
+        "lastModified": 1688633983,
+        "narHash": "sha256-kSP0Gc+FeQI4LQFqkCCi/gwfvbBFtX5z+p3UBbyGVm4=",
         "owner": "akinsho",
         "repo": "flutter-tools.nvim",
-        "rev": "2b72017f369c5d80bb56bcf4379b3eccd69e2371",
+        "rev": "7850a771c4e773dc49d63081f508d004b416c13e",
         "type": "github"
       },
       "original": {
@@ -471,11 +471,11 @@
     "gesture-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1686363212,
-        "narHash": "sha256-OK4GKdPDBWbJWyD62nBO+OgACvJYNSpPDv/iU08gZCU=",
+        "lastModified": 1687655077,
+        "narHash": "sha256-ps/dAKIga2ZVunwj+KU/Iej4PGZbBvm5ZzcK30EiKMc=",
         "owner": "notomo",
         "repo": "gesture.nvim",
-        "rev": "27a48729535046f0bd9bd9d2770fc6b0924d99ae",
+        "rev": "aa273e7982943ac6ccf6b864f3fd40ad287a9fe2",
         "type": "github"
       },
       "original": {
@@ -487,11 +487,11 @@
     "gitsigns-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1686128643,
-        "narHash": "sha256-DmbtKxU/tyFzIUNzoKvtsqlucdINYCSePzLiV7LLGn4=",
+        "lastModified": 1688994740,
+        "narHash": "sha256-apn9LjLSA+oBV7jTyjXyGEBbI3/gUEn2Q0Wxx7mgEWw=",
         "owner": "lewis6991",
         "repo": "gitsigns.nvim",
-        "rev": "4455bb5364d29ff86639dfd5533d4fe4b48192d4",
+        "rev": "48c3ae8ec74cb83f9570ceb0c5ab8217db7a2220",
         "type": "github"
       },
       "original": {
@@ -551,11 +551,11 @@
     "indent-blankline": {
       "flake": false,
       "locked": {
-        "lastModified": 1685412336,
-        "narHash": "sha256-2AgkwADQetmFAc+cYU2USmTXMngXHo7021KrTVTIkkE=",
+        "lastModified": 1688727830,
+        "narHash": "sha256-efMRkxjbr6o7kSKAEn0Kaw8lsDubRmc1N0Kd1BZ3A7k=",
         "owner": "lukas-reineke",
         "repo": "indent-blankline.nvim",
-        "rev": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01",
+        "rev": "4541d690816cb99a7fc248f1486aa87f3abce91c",
         "type": "github"
       },
       "original": {
@@ -583,11 +583,11 @@
     "leap-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1685704459,
-        "narHash": "sha256-V9malmIjB4U00o0VWCFo3IXr3BVO+RdweFNoor/4a9w=",
+        "lastModified": 1688461226,
+        "narHash": "sha256-9j3tN3sHPb2Zyqlr7JTjOpaYfyBCVokDSr8FkhGNv6A=",
         "owner": "ggandor",
         "repo": "leap.nvim",
-        "rev": "14b5a65190fe69388a8f59c695ed3394a10d6af8",
+        "rev": "8facf2eb6a378fd7691dce8c8a7b2726823e2408",
         "type": "github"
       },
       "original": {
@@ -740,11 +740,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1685532165,
-        "narHash": "sha256-xHH9WbE9uya2B+j5w82HzpZVeErBt03/jtmWVRox0EU=",
+        "lastModified": 1688959909,
+        "narHash": "sha256-vDZuhJ9/iTJnjwUDAWaRThWV1mH9NAY9IGJwztPkbYA=",
         "owner": "oxalica",
         "repo": "nil",
-        "rev": "dcd38b96c91a2d07552f824a6480e00dc7b4948a",
+        "rev": "5751bfe63a5cc8988a9cdebd14999b9e11bba401",
         "type": "github"
       },
       "original": {
@@ -755,11 +755,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1686338508,
-        "narHash": "sha256-F0bZVV5ChaduBQwAdee0o3zazmCufbXxn/teqsVRqXU=",
+        "lastModified": 1689078114,
+        "narHash": "sha256-osG8BrX5RpKJ7wH+vI6auOU+ctvNOblT4XXCgknK47c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "66c418d299cd454bd74644eaad905ec4ba2f81a1",
+        "rev": "b6cc7ff8fee93789bc871a267ab876c3fca042cb",
         "type": "github"
       },
       "original": {
@@ -772,11 +772,11 @@
     "nixpkgs-lib": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1685564631,
-        "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=",
+        "lastModified": 1688049487,
+        "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a",
+        "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9",
         "type": "github"
       },
       "original": {
@@ -854,11 +854,11 @@
     "noice-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1686051440,
-        "narHash": "sha256-eWHnaO0qTTOcDATASBKfKx6x7cGNpfX+xP5EqNX8m/A=",
+        "lastModified": 1688194298,
+        "narHash": "sha256-khzQ8JNf2Q3rzpXTCJXhAEgrcEVN9NQvyEEQNSjlDng=",
         "owner": "folke",
         "repo": "noice.nvim",
-        "rev": "acf47e2b863eb20f177aa1bd5398041513e731e1",
+        "rev": "6c87c1d11c38180fb72bf8f45518a0a3e081afc1",
         "type": "github"
       },
       "original": {
@@ -870,11 +870,11 @@
     "nui-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1686255713,
-        "narHash": "sha256-/ZW760bzrWf0LhDVKhaYt/VuMl4UQM+1iMAwLqDQHCI=",
+        "lastModified": 1687107254,
+        "narHash": "sha256-OFfkkFPkBJoVf9W6CL/AD5E4erPKYTMg069E1cI54DE=",
         "owner": "MunifTanjim",
         "repo": "nui.nvim",
-        "rev": "062e366afcdf2bc1e9d28313a1df4ff14f05cb4e",
+        "rev": "d146966a423e60699b084eeb28489fe3b6427599",
         "type": "github"
       },
       "original": {
@@ -886,11 +886,11 @@
     "null-ls": {
       "flake": false,
       "locked": {
-        "lastModified": 1686055738,
-        "narHash": "sha256-N8TlKUq9fGzlYaGtOVDE1A40AVoE6vQlM9J1P2WA+sk=",
+        "lastModified": 1688652536,
+        "narHash": "sha256-6KJtj9pbvBm6fOVpnyzO2fEVC+cVrw2XtZHOgq9ieIw=",
         "owner": "jose-elias-alvarez",
         "repo": "null-ls.nvim",
-        "rev": "a138b14099e9623832027ea12b4631ddd2a49256",
+        "rev": "db09b6c691def0038c456551e4e2772186449f35",
         "type": "github"
       },
       "original": {
@@ -902,11 +902,11 @@
     "nvim-autopairs": {
       "flake": false,
       "locked": {
-        "lastModified": 1685050619,
-        "narHash": "sha256-maSCppPEOFbkEfTYFKLq3M6Dg+fRjnqbCtsyWO9SILA=",
+        "lastModified": 1687083034,
+        "narHash": "sha256-x+9+KLkvwKQ+J4qCnBLpfN3VTlz+52oJ9p4VV/dHZ1I=",
         "owner": "windwp",
         "repo": "nvim-autopairs",
-        "rev": "59df87a84c80a357ca8d8fe86e451b93ac476ccc",
+        "rev": "e8f7dd7a72de3e7b6626c050a802000e69d53ff0",
         "type": "github"
       },
       "original": {
@@ -1047,11 +1047,11 @@
     "nvim-lightbulb": {
       "flake": false,
       "locked": {
-        "lastModified": 1681594259,
-        "narHash": "sha256-vMFl6Nzc0ZxTa4lQ5FEnE9GkxbPuu5/skufgsR34BSE=",
+        "lastModified": 1689029868,
+        "narHash": "sha256-4AYxSbmJrZBHAYw8YyyjxELqhEOppv05CcwhRYL9Vg0=",
         "owner": "kosayoda",
         "repo": "nvim-lightbulb",
-        "rev": "ca5b44a8efffb5fec1963ccd21f25ec04cc778b7",
+        "rev": "bb9ec720aa998252951627f811e8f39b76789e0a",
         "type": "github"
       },
       "original": {
@@ -1063,11 +1063,11 @@
     "nvim-lspconfig": {
       "flake": false,
       "locked": {
-        "lastModified": 1686358804,
-        "narHash": "sha256-HvaRkuqx7Uk0OTrR8CW4p6lv9h6SMKm7MeiYaeMzlho=",
+        "lastModified": 1688779214,
+        "narHash": "sha256-BgY+WdOlXwj7fMTLyaze9A/4DhtwKl1iyceOzUePoSY=",
         "owner": "neovim",
         "repo": "nvim-lspconfig",
-        "rev": "179803f537807fff5b5961a2b3efd9e7ddac54a2",
+        "rev": "deade69789089c3da15237697156334fb3e943f0",
         "type": "github"
       },
       "original": {
@@ -1111,11 +1111,11 @@
     "nvim-session-manager": {
       "flake": false,
       "locked": {
-        "lastModified": 1684506477,
-        "narHash": "sha256-WuxBjhwdQsgPq7rx2vKhNdpqkx2NU/PEw90F+YC8Q68=",
+        "lastModified": 1687897260,
+        "narHash": "sha256-SNHgsxub3vHlYLefWEOgka7a88fJZwRQY+nC1M1eFGQ=",
         "owner": "Shatur",
         "repo": "neovim-session-manager",
-        "rev": "fd92e73506601a48adb843cdc0a15f2e63513754",
+        "rev": "51827268c5ee56567b7033af9ed547ab704553b9",
         "type": "github"
       },
       "original": {
@@ -1143,11 +1143,11 @@
     "nvim-tree-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1685920257,
-        "narHash": "sha256-STpSTHsCZwMa0waml/grTGx4YiBS75mMG+nbGkPhvXc=",
+        "lastModified": 1688874581,
+        "narHash": "sha256-yRaHJB+UgGYTxoeU1fFYdHoxoxW7OuuL05KQgIxvQus=",
         "owner": "nvim-tree",
         "repo": "nvim-tree.lua",
-        "rev": "f5d970d4506f385b29534252d8c15a782fa53034",
+        "rev": "a708bd2413d467929b5019ec1bce7b1f428438bc",
         "type": "github"
       },
       "original": {
@@ -1159,11 +1159,11 @@
     "nvim-treesitter-context": {
       "flake": false,
       "locked": {
-        "lastModified": 1685690380,
-        "narHash": "sha256-jJ0jMPQuIfNm+Qr2K2mQMlqffCqcQuC/kZm4/Q2CyQc=",
+        "lastModified": 1688045960,
+        "narHash": "sha256-qeu6mfxlybJD0u9fpjoqUxGpSjm6ZnhXb7A3hAFyess=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter-context",
-        "rev": "e2ea37627c0681421ccf4a3cf19d68bb958e1817",
+        "rev": "63f3ffc50b0afc59be1015153d00922498085be8",
         "type": "github"
       },
       "original": {
@@ -1175,11 +1175,11 @@
     "nvim-ts-autotag": {
       "flake": false,
       "locked": {
-        "lastModified": 1682633949,
-        "narHash": "sha256-zv3m7IvDbWOOESZL3+8DcNt9vNT9fSfz2X7EOD6rqHQ=",
+        "lastModified": 1686883732,
+        "narHash": "sha256-4qTtXYA5HyG1sADV0wsiccO/G89qEoYPmlg8tTx7h8g=",
         "owner": "windwp",
         "repo": "nvim-ts-autotag",
-        "rev": "40615e96075c743ef47aaf9de966dc348bec6459",
+        "rev": "6be1192965df35f94b8ea6d323354f7dc7a557e4",
         "type": "github"
       },
       "original": {
@@ -1191,11 +1191,11 @@
     "nvim-web-devicons": {
       "flake": false,
       "locked": {
-        "lastModified": 1685150210,
-        "narHash": "sha256-bryHxQZQ75wQXHLqYVh5zSkgLijdPvVAZPDYnv+JTkI=",
+        "lastModified": 1687651460,
+        "narHash": "sha256-lN8LUgQ0sJDMByFkUmfVy6h2EVPAP3hqrwqE0++XgMQ=",
         "owner": "nvim-tree",
         "repo": "nvim-web-devicons",
-        "rev": "2a125024a137677930efcfdf720f205504c97268",
+        "rev": "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9",
         "type": "github"
       },
       "original": {
@@ -1207,11 +1207,11 @@
     "obsidian-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1686329536,
-        "narHash": "sha256-QeWyhWgG86lz33t46rPaBi+k0e14Co1l2eO3HksadoE=",
+        "lastModified": 1687972440,
+        "narHash": "sha256-dx72z1+tQCnonjPuwpY7pGBEb6Ya5/OEUWq1zck98Hg=",
         "owner": "epwalsh",
         "repo": "obsidian.nvim",
-        "rev": "a132e2fb697c85aff0a984d9f00637af10306a0c",
+        "rev": "4d2e1d0efcd857907ac1553517f88f860adbfb8f",
         "type": "github"
       },
       "original": {
@@ -1223,11 +1223,11 @@
     "onedark": {
       "flake": false,
       "locked": {
-        "lastModified": 1685799706,
-        "narHash": "sha256-GtTWpOeYVfczc8nd36BIL0Z8J77YC3VjONF+419kJpw=",
+        "lastModified": 1686564552,
+        "narHash": "sha256-sFqUrXvKkV4l3hTJUwCy4i3UrY53Z+Z/2h9b/iaj6lQ=",
         "owner": "navarasu",
         "repo": "onedark.nvim",
-        "rev": "8ef51924724d506e515f2d3ac9f959a9eaf38f3d",
+        "rev": "462b45758ea94ff30ad48979268094590a6b7b7e",
         "type": "github"
       },
       "original": {
@@ -1239,11 +1239,11 @@
     "orgmode-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1685983743,
-        "narHash": "sha256-BtS9L2yUM3iSQxZ0Kb1wQ41attdUA/zHck7BjRbEoFw=",
+        "lastModified": 1688477499,
+        "narHash": "sha256-gr5lzBpBXFwszLsw+Abg3lqh3Ld55zUeudmC4pKuekg=",
         "owner": "nvim-orgmode",
         "repo": "orgmode",
-        "rev": "2737ef2be69b92fb58c6fb3861ca0bbb8f5d499e",
+        "rev": "6f73b461b9f887968d0f69ab3aee6b4ceebe3445",
         "type": "github"
       },
       "original": {
@@ -1255,11 +1255,11 @@
     "plenary-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1685508880,
-        "narHash": "sha256-5qtGxspjtCnkuoaE2gDnti58U4r34O1bBvjvUdTgKmU=",
+        "lastModified": 1688638776,
+        "narHash": "sha256-NJEr3YcsoOPo1DUTtJyu2cZjucJw2Ubsd/lvD/VdXuc=",
         "owner": "nvim-lua",
         "repo": "plenary.nvim",
-        "rev": "499e0743cf5e8075cd32af68baa3946a1c76adf1",
+        "rev": "bda256fab0eb66a15e8190937e417e6a14ee5d72",
         "type": "github"
       },
       "original": {
@@ -1444,11 +1444,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1685413459,
-        "narHash": "sha256-+ELexqS2yN0wj1WnmWdF24OfjRBIgTN6Ltcpjvp2dEo=",
+        "lastModified": 1688783586,
+        "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "9b3284e2412f76bd68ff46f8cf1c7af44d7ffac0",
+        "rev": "7a29283cc242c2486fc67f60b431ef708046d176",
         "type": "github"
       },
       "original": {
@@ -1460,11 +1460,11 @@
     "rust-tools": {
       "flake": false,
       "locked": {
-        "lastModified": 1676929960,
-        "narHash": "sha256-Cuk/vdoviB9ibt2rrkNRmNFy4S+6czhbExmIjTJRdZM=",
+        "lastModified": 1689033186,
+        "narHash": "sha256-jtfyDxifchznUupLSao6nmpVqaX1yO0xN+NhqS9fgxg=",
         "owner": "simrat39",
         "repo": "rust-tools.nvim",
-        "rev": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f",
+        "rev": "0cc8adab23117783a0292a0c8a2fbed1005dc645",
         "type": "github"
       },
       "original": {
@@ -1572,11 +1572,11 @@
     "telescope": {
       "flake": false,
       "locked": {
-        "lastModified": 1686329477,
-        "narHash": "sha256-AvAA21UGL8mpnArvIp0h1Cm9ChsIxnCITrbizvlaa8A=",
+        "lastModified": 1688682643,
+        "narHash": "sha256-K1aInC4nOxQSUc9j03wXWkSTHBCsOYj11Ks8iF3MeRA=",
         "owner": "nvim-telescope",
         "repo": "telescope.nvim",
-        "rev": "69e8715786d1ee86249eff326f9d6804ee388502",
+        "rev": "276362a8020c6e94c7a76d49aa00d4923b0c02f3",
         "type": "github"
       },
       "original": {
@@ -1645,11 +1645,11 @@
     "toggleterm-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1685434137,
-        "narHash": "sha256-Qjhod1cmzAYuMl6Z0JlYtOq8CLdmQJ9esCwmynuzkYs=",
+        "lastModified": 1688977697,
+        "narHash": "sha256-s6YKXUt6conaal+zeG5wlsDdY1UNo3U2rernmHRiCzY=",
         "owner": "akinsho",
         "repo": "toggleterm.nvim",
-        "rev": "cf146a267a6a7db62b1e2aff40414b20081048a1",
+        "rev": "83aa231fa414a5dcb72aed97437446a6ca5a81f2",
         "type": "github"
       },
       "original": {
@@ -1661,11 +1661,11 @@
     "tokyonight": {
       "flake": false,
       "locked": {
-        "lastModified": 1685457678,
-        "narHash": "sha256-IMrqcx/f5cauDBxSLP1bjsaFXLBv24XXCPxpyj+Jb/E=",
+        "lastModified": 1688550361,
+        "narHash": "sha256-jZMiuk4H3URUPsFjhyABrIPjqRL0J4dvMKdtlANnOmU=",
         "owner": "folke",
         "repo": "tokyonight.nvim",
-        "rev": "161114bd39b990995e08dbf941f6821afbdcd666",
+        "rev": "284667adfff02b9a0adc65968c553c6096b543b6",
         "type": "github"
       },
       "original": {
@@ -1677,11 +1677,11 @@
     "trouble": {
       "flake": false,
       "locked": {
-        "lastModified": 1686232808,
-        "narHash": "sha256-0aYCAP0714za8CoXPqwWOX8RKn/OdIHxsVWyo2X00fM=",
+        "lastModified": 1687594889,
+        "narHash": "sha256-HvgCL5VTEuvFKLAs0f2zbVnetd5jAsgoYREqLMS+vkg=",
         "owner": "folke",
         "repo": "trouble.nvim",
-        "rev": "2af0dd9767526410c88c628f1cbfcb6cf22dd683",
+        "rev": "d99e2abd10808ef91738ce98a5c767e6a51df449",
         "type": "github"
       },
       "original": {
@@ -1837,11 +1837,11 @@
     "which-key": {
       "flake": false,
       "locked": {
-        "lastModified": 1684766425,
-        "narHash": "sha256-wJo9XAUiru2WCeojL7aZuj0RDhkB5oClIpF/fGnXX6o=",
+        "lastModified": 1687180314,
+        "narHash": "sha256-WNAHN/z3JPIAG/gd992y/0+u4mGbhozd96IJCSpHBwA=",
         "owner": "folke",
         "repo": "which-key.nvim",
-        "rev": "e271c28118998c93a14d189af3395812a1aa646c",
+        "rev": "d871f2b664afd5aed3dc1d1573bef2fb24ce0484",
         "type": "github"
       },
       "original": {
@@ -1857,11 +1857,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1686270445,
-        "narHash": "sha256-8oOtdqr2sFsgCVFMcSaHyR8QluCs3okKVopvG/TCaiU=",
+        "lastModified": 1689077350,
+        "narHash": "sha256-3eBM2IeLFXPBeOdD2fDr9jg1NMQ9ya01o5vzYFfJFxk=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "e76cb85afd54b2747ba10bc25f595d6fe71992fb",
+        "rev": "6127de57c154cdd2e94f1dc5c96dcafd88c6a276",
         "type": "github"
       },
       "original": {

From 4980ccbd46bf9ee58154ffb485fa0e571f699573 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 12 Jul 2023 00:14:54 +0300
Subject: [PATCH 156/162] feat: bump flake inputs

---
 flake.lock | 7 ++++---
 flake.nix  | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1fd378d..69727ee 100644
--- a/flake.lock
+++ b/flake.lock
@@ -372,15 +372,16 @@
     "fidget-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1686378278,
-        "narHash": "sha256-ZLe54bRMctXlBo8zH9Qy6HbrkVSlGhPiXg38aAja9C8=",
+        "lastModified": 1686378433,
+        "narHash": "sha256-N3O/AvsD6Ckd62kDEN4z/K5A3SZNR15DnQeZhH6/Rr0=",
         "owner": "j-hui",
         "repo": "fidget.nvim",
-        "rev": "f1c375ba68839eaa4a65efdf2aa078c0da0548fe",
+        "rev": "90c22e47be057562ee9566bad313ad42d622c1d3",
         "type": "github"
       },
       "original": {
         "owner": "j-hui",
+        "ref": "legacy",
         "repo": "fidget.nvim",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 61aa9c3..67d3825 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,7 +26,7 @@
       flake = {
         lib = {
           inherit (import ./lib/stdlib-extended.nix nixpkgs.lib) nvim;
-          inherit (import ./extra.nix inputs) neovimConfiguration;
+          inherit (import ./configuration.nix inputs) neovimConfiguration;
         };
 
         homeManagerModules = {
@@ -348,7 +348,7 @@
     };
 
     fidget-nvim = {
-      url = "github:j-hui/fidget.nvim";
+      url = "github:j-hui/fidget.nvim?ref=legacy";
       flake = false;
     };
 

From 00f801a23f3a7deac09709e48584d71a902b6f8f Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 12 Jul 2023 00:15:23 +0300
Subject: [PATCH 157/162] feat: rename `extra.nix` -> `configuration.nix`

---
 extra.nix => configuration.nix | 0
 flake/overlays.nix             | 2 +-
 lib/module/default.nix         | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename extra.nix => configuration.nix (100%)

diff --git a/extra.nix b/configuration.nix
similarity index 100%
rename from extra.nix
rename to configuration.nix
diff --git a/flake/overlays.nix b/flake/overlays.nix
index 8a2dfb8..7a0469c 100644
--- a/flake/overlays.nix
+++ b/flake/overlays.nix
@@ -3,7 +3,7 @@
   pkgs,
   ...
 }: let
-  inherit (import ../extra.nix inputs) neovimConfiguration mainConfig;
+  inherit (import ../configuration.nix inputs) neovimConfiguration mainConfig;
 
   buildPkg = pkgs: modules:
     (neovimConfiguration {inherit pkgs modules;})
diff --git a/lib/module/default.nix b/lib/module/default.nix
index 7689aef..7da3e2a 100644
--- a/lib/module/default.nix
+++ b/lib/module/default.nix
@@ -8,13 +8,13 @@ packages: inputs: {
 }:
 with lib; let
   cfg = config.programs.neovim-flake;
-  inherit (import ../../extra.nix inputs) neovimConfiguration;
+  inherit (import ../../configuration.nix inputs) neovimConfiguration;
   set = neovimConfiguration {
     inherit pkgs;
     modules = [cfg.settings];
   };
 in {
-  meta.maintainers = [maintainers.notashelf];
+  meta.maintainers = with maintainers; [NotAShelf];
 
   options.programs.neovim-flake = {
     enable = mkEnableOption "A NeoVim IDE with a focus on configurability and extensibility.";

From 319fb0b56633426a4051bb10e0712a1bb242b3cb Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 12 Jul 2023 20:55:08 +0300
Subject: [PATCH 158/162] feat: add borders to nvim-cmp completion window

---
 modules/completion/nvim-cmp/config.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/modules/completion/nvim-cmp/config.nix b/modules/completion/nvim-cmp/config.nix
index 1cc4fa4..72c9a1a 100644
--- a/modules/completion/nvim-cmp/config.nix
+++ b/modules/completion/nvim-cmp/config.nix
@@ -182,6 +182,8 @@ in {
       '')
     ];
 
+    # TODO: alternative snippet engines to vsnip
+    # https://github.com/hrsh7th/nvim-cmp/blob/main/doc/cmp.txt#L82
     vim.luaConfigRC.completion = mkIf (cfg.type == "nvim-cmp") (dagPlacement ''
       local nvim_cmp_menu_map = function(entry, vim_item)
         -- name for each source
@@ -195,19 +197,30 @@ in {
       ${optionalString lspkindEnabled ''
         lspkind_opts.before = ${cfg.formatting.format}
       ''}
+
       local cmp = require'cmp'
       cmp.setup({
+        window = {
+          -- TODO: at some point, those need to be optional
+          -- but first nvim cmp module needs to be detached from "cfg.autocomplete"
+          completion = cmp.config.window.bordered(),
+          documentation = cmp.config.window.bordered(),
+        },
+
         snippet = {
           expand = function(args)
             vim.fn["vsnip#anonymous"](args.body)
           end,
         },
+
         sources = {
           ${builtSources}
         },
+
         completion = {
           completeopt = 'menu,menuone,noinsert',
         },
+
         formatting = {
           format =
       ${

From 01a1fbdf55f04d9d2922b054848b8d6272f8c49c Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Thu, 13 Jul 2023 23:19:15 +0300
Subject: [PATCH 159/162] dev: default to prettier until prettierd is fixed and
 updated

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

diff --git a/modules/languages/ts.nix b/modules/languages/ts.nix
index 44fc765..8c2efe2 100644
--- a/modules/languages/ts.nix
+++ b/modules/languages/ts.nix
@@ -23,7 +23,7 @@ with builtins; let
   };
 
   # TODO: specify packages
-  defaultFormat = "prettierd";
+  defaultFormat = "prettier";
   formats = {
     prettier = {
       package = pkgs.nodePackages.prettier;

From de84d74144e2bd73bcbd999218da6f25b02b2b40 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Thu, 13 Jul 2023 23:22:16 +0300
Subject: [PATCH 160/162] feat: supress ccls offset encoding messages

---
 modules/ui/notifications/nvim-notify/config.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/ui/notifications/nvim-notify/config.nix b/modules/ui/notifications/nvim-notify/config.nix
index 3c4b573..8eb50d8 100644
--- a/modules/ui/notifications/nvim-notify/config.nix
+++ b/modules/ui/notifications/nvim-notify/config.nix
@@ -23,8 +23,17 @@ in {
             DEBUG = "${cfg.icons.DEBUG}",
             TRACE = "${cfg.icons.TRACE}",
         },
-
       }
+
+      -- required to fix offset_encoding errors
+      local notify = vim.notify
+      vim.notify = function(msg, ...)
+        if msg:match("warning: multiple different client offset_encodings") then
+          return
+        end
+
+        notify(msg, ...)
+      end
     '';
   };
 }

From 896c09b972e95ed276f41fd8f15070922603aec6 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 15 Jul 2023 19:24:09 +0300
Subject: [PATCH 161/162] fix: presence-nvim providing invalid client id

---
 modules/rich-presence/presence-nvim/presence-nvim.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/rich-presence/presence-nvim/presence-nvim.nix b/modules/rich-presence/presence-nvim/presence-nvim.nix
index f2cc90e..b7acf48 100644
--- a/modules/rich-presence/presence-nvim/presence-nvim.nix
+++ b/modules/rich-presence/presence-nvim/presence-nvim.nix
@@ -22,9 +22,10 @@ with builtins; {
 
     client_id = mkOption {
       type = types.str;
-      default = "859194972255989790";
+      default = "79327144129396737";
       description = "Client ID of the application";
     };
+
     auto_update = mkOption {
       type = types.bool;
       default = true;

From ef3a132a09c74dbd923568d1e4ba3c8b98642c18 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 16 Jul 2023 11:40:07 +0300
Subject: [PATCH 162/162] docs: finalize v0.4 release notes

---
 docs/release-notes/rl-0.4.adoc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-0.4.adoc b/docs/release-notes/rl-0.4.adoc
index 16f629c..32e0b1f 100644
--- a/docs/release-notes/rl-0.4.adoc
+++ b/docs/release-notes/rl-0.4.adoc
@@ -65,7 +65,9 @@ https://github.com/notashelf[notashelf]:
 
 * Added a module for enabling Neovim's spellchecker
 
-* Replaced prettier with prettierd - the daemonized version of prettier
+* Added prettierd as an alternative formatter to prettier - currently defaults to prettier
+
+* Fixed presence.nvim inheriting the wrong client id
 
 * Cleaned up documentation