From 53b281848b98c7c3de0d174be80794582549a79f Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Tue, 16 Apr 2024 18:54:21 +0300
Subject: [PATCH 01/15] refac: use nixpkgs lib instead

---
 flake.nix                 |  2 +-
 lib.nix                   | 60 +--------------------------------------
 neovim.nix                | 16 ++++++++---
 plugins/lsp/default.nix   | 17 ++++++-----
 plugins/theme/default.nix |  6 ++--
 plugins/ux/default.nix    |  4 +--
 6 files changed, 29 insertions(+), 76 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4ef9530..b4338b8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -208,7 +208,7 @@
           buildPlugin = name: vimUtils.buildVimPlugin {
             name = name;
             src = getAttr name inputs;
-            patches = lib.optional
+            patches = lib.optionals
               (pathExists ./patches/${name})
               (map
                 (patchName: ./patches/${name}/${patchName})
diff --git a/lib.nix b/lib.nix
index fd5b3c1..84c46d9 100644
--- a/lib.nix
+++ b/lib.nix
@@ -1,65 +1,7 @@
 { lib, substituteAll, ... }:
 
 let
-  inherit (builtins) length elemAt isList isString hasAttr getAttr;
-
-  ###########################################################################
-  # Helpers
-
-  # Source: https://github.com/NixOS/nixpkgs/blob/d61bc96d16ca288c69b798b8e31eca64050098e3/lib/lists.nix
-  foldr = op: nul: list:
-    let
-      len = length list;
-      fold' = n:
-        if n == len
-        then nul
-        else op (elemAt list n) (fold' (n + 1));
-    in
-    fold' 0;
-
-  concatMap = op: list:
-    let
-      concat = (a: b: op a + b);
-    in
-    foldr concat "" list;
-
-  ############################################################################
-  # Configs
-
-  optional = cond: val:
-    let
-      def =
-        if isList val then [ ]
-        else if isString val then ""
-        else null;
-    in
-    if cond then val else def;
-
-  getAttrOpt = a: s:
-    if hasAttr a s then getAttr a s else null;
-
-  #############################################################################
-  # Lua
-
-  mkLuaHeredoc = content: ''
-    lua << EOF
-    ${content}
-    EOF
-  '';
-
-  mkLuaRc = contents: concatMap mkLuaHeredoc contents;
-
-  ############################################################################
-  # Configs
-
   readSubFile = src: params: builtins.readFile
     (substituteAll (params // { inherit src; }));
-
 in
-{
-  inherit (lib) importJSON attrByPath;
-  inherit foldr concatMap;
-  inherit optional getAttrOpt;
-  inherit mkLuaHeredoc mkLuaRc;
-  inherit readSubFile substituteAll;
-}
+lib // { inherit readSubFile substituteAll; }
diff --git a/neovim.nix b/neovim.nix
index 5e56e69..f6a516c 100644
--- a/neovim.nix
+++ b/neovim.nix
@@ -35,7 +35,7 @@ let
   plugins = mergeAttrs plugins';
   inherit (builtins) catAttrs readFile;
 
-  myLib = import ./lib.nix { inherit lib substituteAll; } // {
+  extLib = import ./lib.nix { inherit lib substituteAll; } // {
     inherit (nix2lua.lib) toLua LuaNil;
   };
 
@@ -43,7 +43,7 @@ let
   pluginParams = neovimPlugins // {
     inherit tree-sitter plugins enableDevIcons enableTabby enableOrgMode;
     themeCfg = theme;
-    lib = myLib;
+    lib = extLib;
   };
 
   callPlugin = plugin: callPackage plugin pluginParams;
@@ -67,6 +67,14 @@ let
   basicConfigs = map readFile [ ./config/basic.lua ];
   pluginConfigs = catAttrs "luaConfig" pluginsSettings;
   allConfigs = basicConfigs ++ pluginConfigs ++ [ extraLuaConfig ];
+
+  mkLuaHeredoc = content: ''
+    lua << EOF
+    ${content}
+    EOF
+  '';
+
+  mkLuaRc = lib.concatMapStrings mkLuaHeredoc;
 in
 (wrapNeovim neovim-unwrapped {
   inherit viAlias;
@@ -77,13 +85,13 @@ in
   withRuby = false;
 
   configure = {
-    customRC = extraConfig + myLib.mkLuaRc allConfigs;
+    customRC = extraConfig + mkLuaRc allConfigs;
 
     packages.myVimPackages = { start = allPlugins; };
   };
 }).overrideAttrs (oldAttrs: {
   passthru = oldAttrs.passthru // {
     nix2lua = nix2lua.lib;
-    inherit plugins;
+    inherit plugins allConfigs;
   };
 })
diff --git a/plugins/lsp/default.nix b/plugins/lsp/default.nix
index eae556d..dcb6562 100644
--- a/plugins/lsp/default.nix
+++ b/plugins/lsp/default.nix
@@ -18,14 +18,17 @@ let
     max_lines = 100;
   };
   tabbymlSettings = lib.toLua (lib.attrByPath [ "tabbyml" "settings" ] tabbymlDefaultSettings plugins);
-  tabbymlLuaConfig = lib.optional tabbymlEnable
+  tabbymlLuaConfig = lib.optionalString tabbymlEnable
     (lib.readSubFile ./cmp-tabby.lua { inherit tabbymlSettings; });
 
-  cmpSources = lib.toLua ([
-    { name = "nvim_lsp"; }
-    { name = "luasnip"; }
-    { name = "orgmode"; }
-  ] ++ lib.optional tabbymlEnable [{ name = "cmp_tabby"; }]);
+  cmpSources = lib.toLua (
+    [
+      { name = "nvim_lsp"; }
+      { name = "luasnip"; }
+      { name = "orgmode"; }
+    ]
+    ++ lib.optional tabbymlEnable { name = "cmp_tabby"; }
+  );
   cmpLuaConfig = lib.readSubFile ./nvim-cmp.lua { inherit cmpSources; };
 
   lspconfigLuaConfig = lib.readSubFile ./lspconfig.lua
@@ -37,7 +40,7 @@ let
     nvim-cmp # Autocompletion
     cmp-nvim-lsp # LSP source for nvim-cmp
     cmp-luasnip # Snippets source for nvim-cmp
-  ] ++ lib.optional tabbymlEnable [ cmp-tabby ];
+  ] ++ lib.optional tabbymlEnable cmp-tabby;
 
   lspConfigServers = lib.toLua (lib.attrByPath [ "lspConfig" "servers" ] [ ] plugins);
   lspSagaSettings = lib.toLua (lib.attrByPath [ "lspSaga" "settings" ] { } plugins);
diff --git a/plugins/theme/default.nix b/plugins/theme/default.nix
index 54283b7..0c4f85b 100644
--- a/plugins/theme/default.nix
+++ b/plugins/theme/default.nix
@@ -27,10 +27,10 @@ in
 {
   luaConfig = themeConfig
     + (readFile (lib.substituteAll { src = ./lualine.lua; inherit lualineSettings; }))
-    + (lib.optional enableTabby (readFile ./tabby-nvim.lua));
+    + (lib.optionalString enableTabby (readFile ./tabby-nvim.lua));
 
   plugins = [ theme ]
     ++ lualinePlugins
-    ++ (lib.optional enableDevIcons [ nvim-web-devicons ])
-    ++ (lib.optional enableTabby [ tabby-nvim ]);
+    ++ (lib.optional enableDevIcons nvim-web-devicons)
+    ++ (lib.optional enableTabby tabby-nvim);
 }
diff --git a/plugins/ux/default.nix b/plugins/ux/default.nix
index b7d398a..7e590c7 100644
--- a/plugins/ux/default.nix
+++ b/plugins/ux/default.nix
@@ -15,7 +15,7 @@ let
 
   orgmodeEnable = lib.attrByPath [ "orgmode" "enable" ] enableOrgMode plugins;
   orgmodeSettings = lib.toLua (lib.attrByPath [ "orgmode" "settings" ] { } plugins);
-  orgmodeLuaConfig = lib.optional orgmodeEnable
+  orgmodeLuaConfig = lib.optionalString orgmodeEnable
     (lib.readSubFile ./nvim-orgmode.lua { inherit orgmodeSettings; });
 
   colorizerFiletypes = lib.toLua (lib.attrByPath [ "colorizer" "filetypes" ] lib.LuaNil plugins);
@@ -28,5 +28,5 @@ in
   luaConfig = hopLuaConfig + orgmodeLuaConfig + colorizerLuaConfig;
 
   plugins = [ hop-nvim nvim-colorizer ]
-    ++ lib.optional orgmodeEnable [ nvim-orgmode org-bullets-nvim ];
+    ++ lib.optionals orgmodeEnable [ nvim-orgmode org-bullets-nvim ];
 }
-- 
2.46.1


From d3e0b8c0d997c9184426bc9b9ddd74a2dc39a206 Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Wed, 17 Apr 2024 12:25:30 +0300
Subject: [PATCH 02/15] use standard behaviour to run apps from packages

---
 flake.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index b4338b8..fe369bf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -310,17 +310,10 @@
           full = fullNeovim;
           minimal = minimalNeovim;
         };
-
-        mkApp = drv: {
-          type = "app";
-          program = "${drv}/bin/nvim";
-        };
       in
       {
         inherit packages;
 
-        apps = mapAttrs (name: mkApp) packages;
-
         devShells.default = pkgs.mkShell {
           packages = [
             pkgs.stylua # lua formatter
-- 
2.46.1


From 3eb6c9b8d8348807a9573375d6afea21583b4671 Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Wed, 17 Apr 2024 19:35:34 +0300
Subject: [PATCH 03/15] add nvim-tree-lua module

---
 flake.lock                |  8 ++--
 flake.nix                 | 61 +++++++++++++++++------------
 modules/nvim-tree-lua.nix | 55 ++++++++++++++++++++++++++
 neovim.nix                | 82 ++++++++++++++++++---------------------
 4 files changed, 132 insertions(+), 74 deletions(-)
 create mode 100644 modules/nvim-tree-lua.nix

diff --git a/flake.lock b/flake.lock
index d0f7e68..4e3d4e3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -197,11 +197,11 @@
     },
     "nix2lua": {
       "locked": {
-        "lastModified": 1709128456,
-        "narHash": "sha256-tRduS+XFI6VceWPQzjkuvlyn/Oe5NsQUS/wyEC69dvk=",
+        "lastModified": 1713368896,
+        "narHash": "sha256-ivvxVxSpuri8rYP3FVdcxSRrabejAz6iAQvXqdzEGLc=",
         "ref": "refs/heads/main",
-        "rev": "f152767145e61fea96eddb1b550ab3f25701e0ad",
-        "revCount": 18,
+        "rev": "98eaf7a9c2a7e608387debeca8f403885fbec0e4",
+        "revCount": 29,
         "type": "git",
         "url": "https://git.pleshevski.ru/mynix/nix2lua"
       },
diff --git a/flake.nix b/flake.nix
index fe369bf..357c290 100644
--- a/flake.nix
+++ b/flake.nix
@@ -243,32 +243,42 @@
 
         minimalNeovim = mkNeovim pkgs;
 
-        recommendedNeovim = (minimalNeovim.override {
-          enableDevIcons = true;
-          enableTabby = false;
+        recommendedNeovim = minimalNeovim.override {
+          modules = {
+            nvim-tree-lua = {
+              configs = {
+                renderer = {
+                  group_empty = true;
+                  full_name = true;
+                };
 
-          plugins = with minimalNeovim.nix2lua; {
-            nvimTree.settings = {
-              renderer = {
-                group_empty = true;
-                full_name = true;
-              };
-            };
-            lualine.settings = {
-              options.ignore_focus = [ "NvimTree" ];
-              sections = {
-                lualine_a = [
-                  [ "filename" (mkNamedField "path" 1) ]
-                ];
-                lualine_b = [ "branch" "diff" "diagnostics" ];
-                lualine_c = [ "lsp_progress" ];
-                lualine_x = [ "filesize" "filetype" ];
-                lualine_y = [ "progress" ];
-                lualine_z = [ "location" "mode" ];
               };
+              keymaps = [
+                { mode = "n"; bind = "<leader>nt"; command = "<CMD>NvimTreeToggle<CR>"; }
+                { mode = "n"; bind = "<leader>nf"; command = "<CMD>NvimTreeFindFile<CR>"; }
+              ];
             };
           };
-        });
+
+          plugins = with minimalNeovim.nix2lua; {
+            lualine-nvim = pipe [
+              (require "lualine")
+              (call "setup" [{
+                options.ignore_focus = [ "NvimTree" ];
+                sections = {
+                  lualine_a = [
+                    [ "filename" (namedField "path" 1) ]
+                  ];
+                  lualine_b = [ "branch" "diff" "diagnostics" ];
+                  lualine_c = [ "lsp_progress" ];
+                  lualine_x = [ "filesize" "filetype" ];
+                  lualine_y = [ "progress" ];
+                  lualine_z = [ "location" "mode" ];
+                };
+              }])
+            ];
+          };
+        };
 
         fullNeovim = recommendedNeovim.override {
           plugins = recommendedNeovim.plugins // (with minimalNeovim.nix2lua; {
@@ -305,10 +315,11 @@
         };
 
         packages = {
-          default = recommendedNeovim;
-          recommended = recommendedNeovim;
-          full = fullNeovim;
+          # default = recommendedNeovim;
+          # full = fullNeovim;
           minimal = minimalNeovim;
+
+          recommended = recommendedNeovim;
         };
       in
       {
diff --git a/modules/nvim-tree-lua.nix b/modules/nvim-tree-lua.nix
new file mode 100644
index 0000000..96ddbde
--- /dev/null
+++ b/modules/nvim-tree-lua.nix
@@ -0,0 +1,55 @@
+{ nix2lua }:
+
+{ configs ? { }
+, keymaps ? [
+    { mode = "n"; bind = "<leader>nt"; command = "<CMD>NvimTreeToggle<CR>"; }
+    { mode = "n"; bind = "<leader>nf"; command = "<CMD>NvimTreeFindFile<CR>"; }
+  ]
+}:
+
+with nix2lua.lib;
+let
+  vimKeymapSet = { mode, bind, command }: call "vim.keymap.set" [ mode bind command ];
+
+  isEmptyVar = name: eq "" (var name);
+in
+{
+  nvim-tree-lua = (
+    [
+      (pipe [ (require "nvim-tree") (call "setup" [ configs ]) ])
+
+      (local (func "open_nvim_tree" [ "data" ] [
+        # buffer is a [No Name]
+        (local (set "isNoNameBuffer"
+          (and
+            (isEmptyVar "data.file")
+            (isEmptyVar "vim.bo[data.buf].buftype")
+          )
+        ))
+
+        # buffer is a directory
+        (local (set "isDirectory"
+          (eq 1 (var "vim.fn.isdirectory(data.file)"))
+        ))
+
+        (if' (not (and (var "isNoNameBuffer") (var "isDirectory"))) [
+          return_void
+        ])
+
+        # change to the directory
+        (if' (var "isDirectory") [
+          (call "vim.cmd.cd" [ (var "data.file") ])
+        ])
+
+        # open the tree
+        (pipe [ (require "nvim-tree.api") (call "tree.open" [ ]) ])
+      ]))
+
+      (call "vim.api.nvim_create_autocmd" [
+        [ "VimEnter" ]
+        { callback = var "open_nvim_tree"; }
+      ])
+    ]
+    ++ (map vimKeymapSet keymaps)
+  );
+}
diff --git a/neovim.nix b/neovim.nix
index f6a516c..8a39831 100644
--- a/neovim.nix
+++ b/neovim.nix
@@ -1,24 +1,19 @@
-{ enableDevIcons ? false
-, enableTabby ? false
-, enableOrgMode ? false
-, viAlias ? false
+{ viAlias ? false
 , vimAlias ? false
 , extraConfig ? ""
 , extraLuaConfig ? ""
-, extraPlugins ? [ ]
-, theme ? { }
-, plugins ? { }
 , wrapNeovim
 , neovim-unwrapped
 , tree-sitter
 , neovimPlugins
 , lib
 , nix2lua
-, substituteAll
-, callPackage
+, plugins ? { }
+, modules ? { }
 , ...
 }:
 
+
 let
   plugins' = plugins;
 
@@ -33,48 +28,45 @@ let
 in
 let
   plugins = mergeAttrs plugins';
-  inherit (builtins) catAttrs readFile;
 
-  extLib = import ./lib.nix { inherit lib substituteAll; } // {
-    inherit (nix2lua.lib) toLua LuaNil;
-  };
+  importModule = moduleName: import (./modules + "/${moduleName}.nix") { inherit nix2lua; };
+
+  allModules = mergeAttrs (lib.mapAttrsToList importModule modules);
+
+  pluginsWithModules = mergeAttrs [ allModules plugins ];
 
 
-  pluginParams = neovimPlugins // {
-    inherit tree-sitter plugins enableDevIcons enableTabby enableOrgMode;
-    themeCfg = theme;
-    lib = extLib;
-  };
+  /*
+    Type: getPluginByName :: string -> derivation
+  */
+  getPluginByName = lib.flip lib.getAttr neovimPlugins;
+  allPlugins = map getPluginByName (lib.attrNames pluginsWithModules);
 
-  callPlugin = plugin: callPackage plugin pluginParams;
-  callPlugins = list: map callPlugin list;
+  /*
+    Type: mkPluginLuaConfig :: string -> a -> string
+  */
+  mkPluginLuaConfig = name: cfg:
+    with nix2lua.lib;
+    "-- Plugin: ${builtins.trace "Plugin: ${name}" name}\n"
+    + (if lib.isString cfg then cfg
+    else if lib.isAttrs cfg then toLua cfg
+    else if lib.isList cfg then toLua (concatLines cfg)
+    else abort "[neovim] mkPluginLuaConfig: unsupported type");
+  pluginLuaConfigs = lib.mapAttrsToList mkPluginLuaConfig pluginsWithModules;
 
-  pluginsSettings = callPlugins [
-    ./plugins/config
-    ./plugins/syntax
-    ./plugins/git
-    ./plugins/explorer
-    ./plugins/theme
-    ./plugins/lsp
-    ./plugins/formatter
-    ./plugins/ux
-  ];
+  basicLuaConfigs = map builtins.readFile [ ./config/basic.lua ];
 
-  basePlugins = [ neovimPlugins.plenary-nvim ];
-  customPlugins = catAttrs "plugins" pluginsSettings;
-  allPlugins = basePlugins ++ customPlugins ++ extraPlugins;
+  allLuaConfigs = basicLuaConfigs ++ pluginLuaConfigs;
 
-  basicConfigs = map readFile [ ./config/basic.lua ];
-  pluginConfigs = catAttrs "luaConfig" pluginsSettings;
-  allConfigs = basicConfigs ++ pluginConfigs ++ [ extraLuaConfig ];
+  /*
+    Type: mkLuaHeredoc :: string -> string
+  */
+  mkLuaHeredoc = content: lib.concatLines [ "lua << EOF" content "EOF" ];
 
-  mkLuaHeredoc = content: ''
-    lua << EOF
-    ${content}
-    EOF
-  '';
-
-  mkLuaRc = lib.concatMapStrings mkLuaHeredoc;
+  /*
+    Type: mkLuaRc :: [string] -> string
+  */
+  mkLuaRc = list: lib.concatLines (map mkLuaHeredoc list);
 in
 (wrapNeovim neovim-unwrapped {
   inherit viAlias;
@@ -85,13 +77,13 @@ in
   withRuby = false;
 
   configure = {
-    customRC = extraConfig + mkLuaRc allConfigs;
+    customRC = extraConfig + mkLuaRc allLuaConfigs;
 
     packages.myVimPackages = { start = allPlugins; };
   };
 }).overrideAttrs (oldAttrs: {
   passthru = oldAttrs.passthru // {
     nix2lua = nix2lua.lib;
-    inherit plugins allConfigs;
+    inherit plugins;
   };
 })
-- 
2.46.1


From e352894cd0d73eca5b587a7be3d931fd5521de4f Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Thu, 18 Apr 2024 00:04:06 +0300
Subject: [PATCH 04/15] modules: add catppuccin theme

---
 flake.lock             | 36 ++++++++++++++++++------------------
 flake.nix              | 21 +++++++++------------
 modules/catppuccin.nix | 13 +++++++++++++
 neovim.nix             |  2 +-
 4 files changed, 41 insertions(+), 31 deletions(-)
 create mode 100644 modules/catppuccin.nix

diff --git a/flake.lock b/flake.lock
index 4e3d4e3..5ba5042 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "catppuccin": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1713105352,
+        "narHash": "sha256-yTVou/WArEWygBBs2NFPI9Dm9iSGfwVftKFbOAGl8tk=",
+        "owner": "catppuccin",
+        "repo": "nvim",
+        "rev": "a1439ad7c584efb3d0ce14ccb835967f030450fe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nvim",
+        "type": "github"
+      }
+    },
     "cmp-luasnip": {
       "flake": false,
       "locked": {
@@ -373,6 +389,7 @@
     },
     "root": {
       "inputs": {
+        "catppuccin": "catppuccin",
         "cmp-luasnip": "cmp-luasnip",
         "cmp-nvim-lsp": "cmp-nvim-lsp",
         "cmp-tabby": "cmp-tabby",
@@ -398,8 +415,7 @@
         "plenary-nvim": "plenary-nvim",
         "tabby-nvim": "tabby-nvim",
         "telescope-live-grep-args-nvim": "telescope-live-grep-args-nvim",
-        "telescope-nvim": "telescope-nvim",
-        "theme": "theme"
+        "telescope-nvim": "telescope-nvim"
       }
     },
     "systems": {
@@ -464,22 +480,6 @@
         "repo": "telescope.nvim",
         "type": "github"
       }
-    },
-    "theme": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1695478950,
-        "narHash": "sha256-SV5DTVwcVv6YIb7TGNYwq6rtIG5pFKubK07snXhV7z8=",
-        "owner": "catppuccin",
-        "repo": "nvim",
-        "rev": "3d9a5ed556e289bce6c1fb0af89ec838360641b2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "nvim",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 357c290..20d1c2d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -126,7 +126,7 @@
     };
 
     # https://github.com/catppuccin/nvim
-    theme = {
+    catppuccin = {
       url = "github:catppuccin/nvim";
       flake = false;
     };
@@ -191,7 +191,7 @@
         "lualine-nvim"
         "lualine-lsp-progress"
         "nvim-web-devicons"
-        "theme"
+        "catppuccin"
         # ux
         "hop-nvim"
         "nvim-orgmode"
@@ -238,20 +238,17 @@
     } //
     flake-utils.lib.eachDefaultSystem (system:
       let
-        inherit (builtins) mapAttrs;
         pkgs = import nixpkgs { inherit system; };
 
         minimalNeovim = mkNeovim pkgs;
 
-        recommendedNeovim = minimalNeovim.override {
+        recommendedNeovim = minimalNeovim.override (prev: {
           modules = {
+            catppuccin = { };
             nvim-tree-lua = {
-              configs = {
-                renderer = {
-                  group_empty = true;
-                  full_name = true;
-                };
-
+              configs.renderer = {
+                group_empty = true;
+                full_name = true;
               };
               keymaps = [
                 { mode = "n"; bind = "<leader>nt"; command = "<CMD>NvimTreeToggle<CR>"; }
@@ -260,7 +257,7 @@
             };
           };
 
-          plugins = with minimalNeovim.nix2lua; {
+          plugins = with prev.nix2lua.lib; {
             lualine-nvim = pipe [
               (require "lualine")
               (call "setup" [{
@@ -278,7 +275,7 @@
               }])
             ];
           };
-        };
+        });
 
         fullNeovim = recommendedNeovim.override {
           plugins = recommendedNeovim.plugins // (with minimalNeovim.nix2lua; {
diff --git a/modules/catppuccin.nix b/modules/catppuccin.nix
new file mode 100644
index 0000000..96c87c8
--- /dev/null
+++ b/modules/catppuccin.nix
@@ -0,0 +1,13 @@
+{ nix2lua }:
+
+
+{ flavour ? "frappe" }:
+
+with nix2lua.lib;
+{
+  catppuccin = [
+    (set "vim.g.catppuccin_flavour" flavour)
+    (pipe [ (require "catppuccin") (call "setup" [ ]) ])
+    (call "vim.cmd" [ "colorscheme catppuccin" ])
+  ];
+}
diff --git a/neovim.nix b/neovim.nix
index 8a39831..04d59d2 100644
--- a/neovim.nix
+++ b/neovim.nix
@@ -84,6 +84,6 @@ in
 }).overrideAttrs (oldAttrs: {
   passthru = oldAttrs.passthru // {
     nix2lua = nix2lua.lib;
-    inherit plugins;
+    inherit plugins modules;
   };
 })
-- 
2.46.1


From 9f11473eca84b6a0264aeabbf320fbd276b2f969 Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Thu, 18 Apr 2024 01:20:31 +0300
Subject: [PATCH 05/15] modules: add nvim-treesitter

---
 flake.nix                   |   1 +
 modules/catppuccin.nix      |   2 +-
 modules/nvim-tree-lua.nix   |   2 +-
 modules/nvim-treesitter.nix | 208 ++++++++++++++++++++++++++++++++++++
 neovim.nix                  |  22 ++--
 5 files changed, 225 insertions(+), 10 deletions(-)
 create mode 100644 modules/nvim-treesitter.nix

diff --git a/flake.nix b/flake.nix
index 20d1c2d..81ecc14 100644
--- a/flake.nix
+++ b/flake.nix
@@ -255,6 +255,7 @@
                 { mode = "n"; bind = "<leader>nf"; command = "<CMD>NvimTreeFindFile<CR>"; }
               ];
             };
+            nvim-treesitter = { };
           };
 
           plugins = with prev.nix2lua.lib; {
diff --git a/modules/catppuccin.nix b/modules/catppuccin.nix
index 96c87c8..ca92b2a 100644
--- a/modules/catppuccin.nix
+++ b/modules/catppuccin.nix
@@ -1,4 +1,4 @@
-{ nix2lua }:
+{ nix2lua, ... }:
 
 
 { flavour ? "frappe" }:
diff --git a/modules/nvim-tree-lua.nix b/modules/nvim-tree-lua.nix
index 96ddbde..a72956b 100644
--- a/modules/nvim-tree-lua.nix
+++ b/modules/nvim-tree-lua.nix
@@ -1,4 +1,4 @@
-{ nix2lua }:
+{ nix2lua, ... }:
 
 { configs ? { }
 , keymaps ? [
diff --git a/modules/nvim-treesitter.nix b/modules/nvim-treesitter.nix
new file mode 100644
index 0000000..3eabc8c
--- /dev/null
+++ b/modules/nvim-treesitter.nix
@@ -0,0 +1,208 @@
+{ nix2lua, pkgs }:
+
+let
+  defaultGrammars = g: [
+    # g.agda
+    # g.arduino
+    # g.astro
+    g.awk
+    g.bash
+    # g.beancount
+    # g.bibtex
+    # g.blueprint
+    # g.c
+    # g.c_sharp
+    # g.clojure
+    g.cmake
+    g.comment
+    # g.commonlisp
+    # g.cooklang
+    # g.cpp
+    # g.css
+    # g.cuda
+    # g.d
+    # g.d2
+    # g.dart
+    # g.devicetree
+    g.diff
+    # g.dockerfile
+    # g.dot
+    # g.eex
+    # g.elixir
+    # g.elm
+    # g.elvish
+    g.embedded_template
+    # g.erlang
+    # g.fennel
+    # g.fish
+    # g.foam
+    # g.fortran
+    # g.fusion
+    # g.gdscript
+    g.git_rebase
+    g.gitattributes
+    g.gitignore
+    # g.gleam
+    # g.glimmer
+    # g.glsl
+    # g.go
+    # g.godot_resource
+    # g.gomod
+    # g.gowork
+    # g.graphql
+    # g.hack
+    # g.haskell
+    # g.hcl
+    # g.heex
+    # g.hjson
+    # g.hlsl
+    # g.hocon
+    # g.html
+    g.http
+    # g.java
+    # g.javascript
+    g.jq
+    g.jsdoc
+    g.json
+    # g.json5
+    # g.jsonc
+    # g.jsonnet
+    # g.julia
+    # g.kotlin
+    # g.lalrpop
+    # g.latex
+    # g.ledger
+    # g.llvm
+    # g.lua
+    # g.m68k
+    g.make
+    g.markdown
+    g.markdown_inline
+    # g.menhir
+    # g.meson
+    # g.nickel
+    # g.ninja
+    g.nix
+    # g.norg
+    # g.ocaml
+    # g.ocaml_interface
+    # g.ocamllex
+    # g.org
+    # g.pascal
+    # g.perl
+    # g.php
+    # g.phpdoc
+    # g.pioasm
+    # g.prisma
+    # g.proto
+    # g.pug
+    # g.python
+    # g.ql
+    # g.qmljs
+    g.query
+    # g.r
+    # g.racket
+    # g.rasi
+    g.regex
+    # g.rego
+    # g.rnoweb
+    # g.rst
+    # g.ruby
+    # g.rust
+    # g.scala
+    g.scheme
+    # g.scss
+    # g.slint
+    # g.solidity
+    # g.sparql
+    # g.sql
+    # g.supercollider
+    # g.surface
+    # g.svelte
+    # g.swift
+    # g.sxhkdrc
+    # g.teal
+    # g.tiger
+    # g.tlaplus
+    g.todotxt
+    # g.toml
+    # g.tsx
+    # g.turtle
+    # g.twig
+    # g.typescript
+    # g.v
+    # g.vala
+    # g.verilog
+    # g.vhs
+    # g.vim
+    # g.vue
+    # g.wgsl
+    g.yaml
+    # g.yang
+    # g.zig
+  ];
+in
+
+{ allGrammars ? false
+, withGrammars ? defaultGrammars
+}:
+
+with nix2lua.lib;
+
+
+let
+  extraGrammars = {
+    tree-sitter-d2 = {
+      language = "d2";
+      version = "2023-06-21";
+      src = pkgs.fetchFromGitea {
+        domain = "git.pleshevski.ru";
+        owner = "pleshevskiy";
+        repo = "tree-sitter-d2";
+        rev = "8a9d50043d58eedf1e375b0e2059e43efd856902";
+        sha256 = "sha256-ZhVjxo7Xi7DaHN3qabUcykflY74bUqPcOA410fA3zRk=";
+      };
+    };
+  };
+
+  tree-sitter = pkgs.tree-sitter.override { inherit extraGrammars; };
+  customGrammars = tree-sitter.withPlugins (g: [ g.tree-sitter-d2 ]);
+
+  nvimTreesitterWithGrammars =
+    if allGrammars then pkgs.vimPlugins.nvim-treesitter.withAllGrammars
+    else pkgs.vimPlugins.nvim-treesitter.withPlugins withGrammars;
+
+  finalNvimTreesitter = nvimTreesitterWithGrammars.overrideAttrs (oldAttrs: {
+    passthru.dependencies = oldAttrs.passthru.dependencies ++ [
+      (pkgs.runCommand "nvim-treesitter-d2-grammar" { } ''
+        mkdir -p $out/parser
+        ln -s ${customGrammars}/d2.so $out/parser/d2.so
+      '')
+    ];
+    postPatch = ''
+      ln -s ${extraGrammars.tree-sitter-d2.src}/queries queries/d2
+    '';
+  });
+in
+{
+  override' = {
+    nvim-treesitter = finalNvimTreesitter;
+  };
+
+  nvim-treesitter = [
+    (local (set "parser_config"
+      (pipe [ (require "nvim-treesitter.parsers") (call "get_parser_configs" [ ]) ])
+    ))
+    (set "parser_config.d2" { })
+
+    (pipe [
+      (require "nvim-treesitter.configs")
+      (call "setup" [{
+        ensure_installed = { };
+        sync_install = false;
+        highlight.enable = true;
+        indent.enable = true;
+      }])
+    ])
+  ];
+}
diff --git a/neovim.nix b/neovim.nix
index 04d59d2..97b6ec7 100644
--- a/neovim.nix
+++ b/neovim.nix
@@ -4,8 +4,8 @@
 , extraLuaConfig ? ""
 , wrapNeovim
 , neovim-unwrapped
-, tree-sitter
 , neovimPlugins
+, pkgs
 , lib
 , nix2lua
 , plugins ? { }
@@ -16,6 +16,7 @@
 
 let
   plugins' = plugins;
+  modules' = modules;
 
   mergeAttrs = v:
     if builtins.isList v then
@@ -28,18 +29,23 @@ let
 in
 let
   plugins = mergeAttrs plugins';
+  modules = mergeAttrs modules';
 
-  importModule = moduleName: import (./modules + "/${moduleName}.nix") { inherit nix2lua; };
-
+  importModule = moduleName: import (./modules + "/${moduleName}.nix") { inherit nix2lua pkgs; };
   allModules = mergeAttrs (lib.mapAttrsToList importModule modules);
 
-  pluginsWithModules = mergeAttrs [ allModules plugins ];
+  # Type: excludeOverride :: AttrSet -> AttrSet
+  excludeOverride = lib.filterAttrs (n: v: n != "override'");
+  # Type: pluginsWithModules :: AttrSet
+  pluginsWithModules = mergeAttrs [ (excludeOverride allModules) plugins ];
 
+  overridedNeovimPlugins =
+    if allModules ? override' then neovimPlugins // allModules.override'
+    else neovimPlugins;
 
-  /*
-    Type: getPluginByName :: string -> derivation
-  */
-  getPluginByName = lib.flip lib.getAttr neovimPlugins;
+  # Type: getPluginByName :: string -> derivation
+  getPluginByName = lib.flip lib.getAttr overridedNeovimPlugins;
+  # Type: allPlugins :: AttrSet -> [derivation]
   allPlugins = map getPluginByName (lib.attrNames pluginsWithModules);
 
   /*
-- 
2.46.1


From 2b92614d0e674b9fafa3d38fc9c02b4a101853f8 Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Thu, 18 Apr 2024 01:26:40 +0300
Subject: [PATCH 06/15] modules: enable devicons in nvim-tree

---
 modules/nvim-tree-lua.nix | 2 ++
 neovim.nix                | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/nvim-tree-lua.nix b/modules/nvim-tree-lua.nix
index a72956b..be93a1e 100644
--- a/modules/nvim-tree-lua.nix
+++ b/modules/nvim-tree-lua.nix
@@ -14,6 +14,8 @@ let
   isEmptyVar = name: eq "" (var name);
 in
 {
+  nvim-web-devicons = true;
+
   nvim-tree-lua = (
     [
       (pipe [ (require "nvim-tree") (call "setup" [ configs ]) ])
diff --git a/neovim.nix b/neovim.nix
index 97b6ec7..e28868b 100644
--- a/neovim.nix
+++ b/neovim.nix
@@ -55,9 +55,10 @@ let
     with nix2lua.lib;
     "-- Plugin: ${builtins.trace "Plugin: ${name}" name}\n"
     + (if lib.isString cfg then cfg
-    else if lib.isAttrs cfg then toLua cfg
+    else if lib.isAttrs cfg && cfg ? _type then toLua cfg
     else if lib.isList cfg then toLua (concatLines cfg)
-    else abort "[neovim] mkPluginLuaConfig: unsupported type");
+    else if lib.isBool cfg then "" # Just skip lua config. Only enable the plugin.
+    else abort "[neovim] mkPluginLuaConfig: '${name}' has unsupported type '${builtins.typeOf cfg}'");
   pluginLuaConfigs = lib.mapAttrsToList mkPluginLuaConfig pluginsWithModules;
 
   basicLuaConfigs = map builtins.readFile [ ./config/basic.lua ];
-- 
2.46.1


From 1d31c3d1d2220af508ae394e90fb2600d9a95b84 Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Sat, 20 Apr 2024 23:05:33 +0300
Subject: [PATCH 07/15] modules: add git module

---
 flake.lock                  | 14 +++++-----
 flake.nix                   | 50 +++++-----------------------------
 lib.nix                     |  7 -----
 lib/vim.nix                 | 34 ++++++++++++++++++++++++
 modules/catppuccin.nix      |  4 +--
 modules/git.nix             | 53 +++++++++++++++++++++++++++++++++++++
 modules/nvim-tree-lua.nix   | 31 +++++++++-------------
 modules/nvim-treesitter.nix | 12 ++++-----
 neovim.nix                  | 13 ++++++---
 9 files changed, 131 insertions(+), 87 deletions(-)
 delete mode 100644 lib.nix
 create mode 100644 lib/vim.nix
 create mode 100644 modules/git.nix

diff --git a/flake.lock b/flake.lock
index 5ba5042..8cbb30c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -101,11 +101,11 @@
     "gitsigns-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1695571272,
-        "narHash": "sha256-VJCtDnPSo5RgSC+czSIOvqGhpUT0dzvCzbLtup+Ctyo=",
+        "lastModified": 1713620636,
+        "narHash": "sha256-UK3DyvrQ0kLm9wrMQ6tLDoDunoThbY/Yfjn+eCZpuMw=",
         "owner": "lewis6991",
         "repo": "gitsigns.nvim",
-        "rev": "bdeba1cec3faddd89146690c10b9a87949c0ee66",
+        "rev": "035da036e68e509ed158414416c827d022d914bd",
         "type": "github"
       },
       "original": {
@@ -213,11 +213,11 @@
     },
     "nix2lua": {
       "locked": {
-        "lastModified": 1713368896,
-        "narHash": "sha256-ivvxVxSpuri8rYP3FVdcxSRrabejAz6iAQvXqdzEGLc=",
+        "lastModified": 1713641247,
+        "narHash": "sha256-UDAxwO1vSkaPtmby04xjiHq5dxd03IBD3lkpFKYlV7Q=",
         "ref": "refs/heads/main",
-        "rev": "98eaf7a9c2a7e608387debeca8f403885fbec0e4",
-        "revCount": 29,
+        "rev": "8c4f3ca834ef7c07c9e3be3e006d7395c69a176c",
+        "revCount": 36,
         "type": "git",
         "url": "https://git.pleshevski.ru/mynix/nix2lua"
       },
diff --git a/flake.nix b/flake.nix
index 81ecc14..2be899f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -242,7 +242,7 @@
 
         minimalNeovim = mkNeovim pkgs;
 
-        recommendedNeovim = minimalNeovim.override (prev: {
+        allNeovim = minimalNeovim.override (prev: {
           modules = {
             catppuccin = { };
             nvim-tree-lua = {
@@ -256,16 +256,17 @@
               ];
             };
             nvim-treesitter = { };
+            git = { };
           };
 
           plugins = with prev.nix2lua.lib; {
-            lualine-nvim = pipe [
+            lualine-nvim = pipe1
               (require "lualine")
-              (call "setup" [{
+              (call "setup" {
                 options.ignore_focus = [ "NvimTree" ];
                 sections = {
                   lualine_a = [
-                    [ "filename" (namedField "path" 1) ]
+                    [ "filename" (nf "path" 1) ]
                   ];
                   lualine_b = [ "branch" "diff" "diagnostics" ];
                   lualine_c = [ "lsp_progress" ];
@@ -273,51 +274,14 @@
                   lualine_y = [ "progress" ];
                   lualine_z = [ "location" "mode" ];
                 };
-              }])
-            ];
+              });
           };
         });
 
-        fullNeovim = recommendedNeovim.override {
-          plugins = recommendedNeovim.plugins // (with minimalNeovim.nix2lua; {
-            lspSaga.settings = {
-              border_style = "rounded";
-              symbol_in_winbar.enable = false;
-              code_action_lightbulb.enable = false;
-              code_action_keys = { quit = "<Esc>"; };
-              definition_action_keys = { quit = "<Esc>"; };
-              rename_action_quit = "<C-c>";
-            };
-            lspConfig = {
-              servers = {
-                nil_ls = { };
-                tsserver = { };
-                eslint = { };
-                denols = {
-                  root_dir = mkLuaRaw "root_pattern(\"deno.json\", \"deno.jsonc\")";
-                };
-                rust_analyzer = {
-                  settings.rust-analyzer = {
-                    "server.path" = "rust-analyzer";
-                    "updates.prompt" = false;
-                    "updates.checkOnStartup" = false;
-                    "checkOnSave.enable" = true;
-                    "checkOnSave.command" = "clippy";
-                    "cargo.autoreload" = true;
-                  };
-                };
-              };
-            };
-            tabbyml.enable = true;
-          });
-        };
-
         packages = {
-          # default = recommendedNeovim;
-          # full = fullNeovim;
           minimal = minimalNeovim;
 
-          recommended = recommendedNeovim;
+          all = allNeovim;
         };
       in
       {
diff --git a/lib.nix b/lib.nix
deleted file mode 100644
index 84c46d9..0000000
--- a/lib.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ lib, substituteAll, ... }:
-
-let
-  readSubFile = src: params: builtins.readFile
-    (substituteAll (params // { inherit src; }));
-in
-lib // { inherit readSubFile substituteAll; }
diff --git a/lib/vim.nix b/lib/vim.nix
new file mode 100644
index 0000000..973c8ca
--- /dev/null
+++ b/lib/vim.nix
@@ -0,0 +1,34 @@
+{ nix2lua }:
+
+with nix2lua.lib;
+{
+  fn.isdirectory = file: call1 "vim.fn.isdirectory" (var file);
+
+  cmd.cd = file: call1 "vim.cmd.cd" (var file);
+
+  keymap.set = { mode, bind, command, opts ? { } }:
+    call "vim.keymap.set" [ mode bind command opts ];
+
+  /*
+    Parameters:
+    - {event} (string|array) Event(s) that will trigger the handler (callback or command).
+    - {opts} Options dict:
+      - group (string|integer) optional: autocommand group name or id to match against.
+      - pattern (string|array) optional: pattern(s) to match literally autocmd-pattern.
+      - buffer (integer) optional: buffer number for buffer-local autocommands autocmd-buflocal. Cannot be used with {pattern}.
+      - desc (string) optional: description (for documentation and troubleshooting).
+      - callback (function|string) optional: Lua function (or Vimscript function name, if string) called when the event(s) is triggered. Lua callback can return a truthy value (not false or nil) to delete the autocommand. Receives a table argument with these keys:
+      - id: (number) autocommand id
+      - event: (string) name of the triggered event autocmd-events
+      - group: (number|nil) autocommand group id, if any
+      - match: (string) expanded value of <amatch>
+      - buf: (number) expanded value of <abuf>
+      - file: (string) expanded value of <afile>
+      - data: (any) arbitrary data passed from nvim_exec_autocmds()
+      - command (string) optional: Vim command to execute on event. Cannot be used with {callback}
+      - once (boolean) optional: defaults to false. Run the autocommand only once autocmd-once.
+      - nested (boolean) optional: defaults to false. Run nested autocommands autocmd-nested.
+   */
+  api.nvim_create_autocmd = event: opts:
+    call "vim.api.nvim_create_autocmd" [ event opts ];
+}
diff --git a/modules/catppuccin.nix b/modules/catppuccin.nix
index ca92b2a..2ada413 100644
--- a/modules/catppuccin.nix
+++ b/modules/catppuccin.nix
@@ -7,7 +7,7 @@ with nix2lua.lib;
 {
   catppuccin = [
     (set "vim.g.catppuccin_flavour" flavour)
-    (pipe [ (require "catppuccin") (call "setup" [ ]) ])
-    (call "vim.cmd" [ "colorscheme catppuccin" ])
+    (pipe1 (require "catppuccin") (call0 "setup"))
+    (call "vim.cmd" "colorscheme catppuccin")
   ];
 }
diff --git a/modules/git.nix b/modules/git.nix
new file mode 100644
index 0000000..e5e1876
--- /dev/null
+++ b/modules/git.nix
@@ -0,0 +1,53 @@
+{ nix2lua, vim, lib, ... }:
+
+with nix2lua.lib;
+
+{ configs ? { }
+, keymaps ? [
+    { mode = "n"; bind = "]h"; command = raw "next_hunk"; }
+    { mode = "n"; bind = "[h"; command = raw "prev_hunk"; }
+    { mode = "n"; bind = "<leader>gs"; command = raw "gs.stage_hunk"; }
+    { mode = "n"; bind = "<leader>gr"; command = raw "gs.reset_hunk"; }
+    { mode = "n"; bind = "<leader>gu"; command = raw "gs.undo_stage_hunk"; }
+    { mode = "n"; bind = "<leader>gp"; command = raw "gs.preview_hunk"; }
+    { mode = "n"; bind = "<leader>gb"; command = lambda0 (call "gs.blame_line" { full = true; }); }
+    { mode = "n"; bind = "<leader>gd"; command = raw "gs.diffthis"; }
+    { mode = "n"; bind = "<leader>gD"; command = lambda0 (call "gs.diffthis" "~"); }
+    { mode = "n"; bind = "<leader>gtb"; command = raw "gs.toggle_current_line_blame"; }
+    { mode = "n"; bind = "<leader>gtd"; command = raw "gs.toggle_deleted"; }
+  ]
+}:
+
+let
+  bufferedKeymaps = map (args: lib.recursiveUpdate args { opts.buffer = var "bufnr"; }) keymaps;
+in
+{
+  gitsigns-nvim = [
+    (local (func "on_attach" [ "bufnr" ] (
+      [
+        (local (set "gs" (var "package.loaded.gitsigns")))
+
+        (local (func0 "next_hunk"
+          (ifelse (var "vim.wo.diff")
+            (call1 "vim.cmd.normal" [ "]h" (nf "bang" true) ])
+            (call1 "gs.nav_hunk" "next")
+          )
+        ))
+        (local (func0 "prev_hunk"
+          (ifelse (var "vim.wo.diff")
+            (call1 "vim.cmd.normal" [ "[h" (nf "bang" true) ])
+            (call1 "gs.nav_hunk" "prev"))
+        ))
+      ]
+      ++ map vim.keymap.set bufferedKeymaps
+    )))
+
+    (pipe1
+      (require "gitsigns")
+      (call "setup" (configs // {
+        on_attach = var "on_attach";
+      }))
+    )
+  ];
+
+}
diff --git a/modules/nvim-tree-lua.nix b/modules/nvim-tree-lua.nix
index be93a1e..108ea90 100644
--- a/modules/nvim-tree-lua.nix
+++ b/modules/nvim-tree-lua.nix
@@ -1,4 +1,4 @@
-{ nix2lua, ... }:
+{ nix2lua, vim, ... }:
 
 { configs ? { }
 , keymaps ? [
@@ -8,17 +8,13 @@
 }:
 
 with nix2lua.lib;
-let
-  vimKeymapSet = { mode, bind, command }: call "vim.keymap.set" [ mode bind command ];
-
-  isEmptyVar = name: eq "" (var name);
-in
+let isEmptyVar = name: eq "" (var name); in
 {
   nvim-web-devicons = true;
 
   nvim-tree-lua = (
     [
-      (pipe [ (require "nvim-tree") (call "setup" [ configs ]) ])
+      (pipe1 (require "nvim-tree") (call "setup" configs))
 
       (local (func "open_nvim_tree" [ "data" ] [
         # buffer is a [No Name]
@@ -31,27 +27,24 @@ in
 
         # buffer is a directory
         (local (set "isDirectory"
-          (eq 1 (var "vim.fn.isdirectory(data.file)"))
+          (eq 1 (vim.fn.isdirectory "data.file"))
         ))
 
-        (if' (not (and (var "isNoNameBuffer") (var "isDirectory"))) [
+        (if' (not (and (var "isNoNameBuffer") (var "isDirectory")))
           return_void
-        ])
+        )
 
         # change to the directory
-        (if' (var "isDirectory") [
-          (call "vim.cmd.cd" [ (var "data.file") ])
-        ])
+        (if' (var "isDirectory")
+          (vim.cmd.cd "data.file")
+        )
 
         # open the tree
-        (pipe [ (require "nvim-tree.api") (call "tree.open" [ ]) ])
+        (pipe1 (require "nvim-tree.api") (call0 "tree.open"))
       ]))
 
-      (call "vim.api.nvim_create_autocmd" [
-        [ "VimEnter" ]
-        { callback = var "open_nvim_tree"; }
-      ])
+      (vim.api.nvim_create_autocmd [ "VimEnter" ] { callback = var "open_nvim_tree"; })
     ]
-    ++ (map vimKeymapSet keymaps)
+    ++ (map vim.keymap.set keymaps)
   );
 }
diff --git a/modules/nvim-treesitter.nix b/modules/nvim-treesitter.nix
index 3eabc8c..ba94498 100644
--- a/modules/nvim-treesitter.nix
+++ b/modules/nvim-treesitter.nix
@@ -1,4 +1,4 @@
-{ nix2lua, pkgs }:
+{ nix2lua, pkgs, ... }:
 
 let
   defaultGrammars = g: [
@@ -191,18 +191,18 @@ in
 
   nvim-treesitter = [
     (local (set "parser_config"
-      (pipe [ (require "nvim-treesitter.parsers") (call "get_parser_configs" [ ]) ])
+      (pipe1 (require "nvim-treesitter.parsers") (call0 "get_parser_configs"))
     ))
     (set "parser_config.d2" { })
 
-    (pipe [
+    (pipe1
       (require "nvim-treesitter.configs")
-      (call "setup" [{
+      (call "setup" {
         ensure_installed = { };
         sync_install = false;
         highlight.enable = true;
         indent.enable = true;
-      }])
-    ])
+      })
+    )
   ];
 }
diff --git a/neovim.nix b/neovim.nix
index e28868b..c014134 100644
--- a/neovim.nix
+++ b/neovim.nix
@@ -31,7 +31,10 @@ let
   plugins = mergeAttrs plugins';
   modules = mergeAttrs modules';
 
-  importModule = moduleName: import (./modules + "/${moduleName}.nix") { inherit nix2lua pkgs; };
+  vim = import ./lib/vim.nix { inherit nix2lua; };
+
+  importModule = moduleName:
+    import (./modules + "/${moduleName}.nix") { inherit nix2lua pkgs vim lib; };
   allModules = mergeAttrs (lib.mapAttrsToList importModule modules);
 
   # Type: excludeOverride :: AttrSet -> AttrSet
@@ -56,7 +59,7 @@ let
     "-- Plugin: ${builtins.trace "Plugin: ${name}" name}\n"
     + (if lib.isString cfg then cfg
     else if lib.isAttrs cfg && cfg ? _type then toLua cfg
-    else if lib.isList cfg then toLua (concatLines cfg)
+    else if lib.isList cfg then toLua (spaceBetween cfg)
     else if lib.isBool cfg then "" # Just skip lua config. Only enable the plugin.
     else abort "[neovim] mkPluginLuaConfig: '${name}' has unsupported type '${builtins.typeOf cfg}'");
   pluginLuaConfigs = lib.mapAttrsToList mkPluginLuaConfig pluginsWithModules;
@@ -68,7 +71,11 @@ let
   /*
     Type: mkLuaHeredoc :: string -> string
   */
-  mkLuaHeredoc = content: lib.concatLines [ "lua << EOF" content "EOF" ];
+  mkLuaHeredoc = content: ''
+    lua << EOF
+    ${content}
+    EOF
+  '';
 
   /*
     Type: mkLuaRc :: [string] -> string
-- 
2.46.1


From 6030f1df18aee8828bfd7df35a1daaad9581a0db Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Sun, 21 Apr 2024 00:22:39 +0300
Subject: [PATCH 08/15] modules: add neoformat

---
 flake.lock                             |  8 +++----
 flake.nix                              |  7 ++----
 lib/vim.nix                            |  2 ++
 modules/{git.nix => gitsigns-nvim.nix} |  0
 modules/neoformat.nix                  | 32 ++++++++++++++++++++++++++
 5 files changed, 40 insertions(+), 9 deletions(-)
 rename modules/{git.nix => gitsigns-nvim.nix} (100%)
 create mode 100644 modules/neoformat.nix

diff --git a/flake.lock b/flake.lock
index 8cbb30c..b83ba03 100644
--- a/flake.lock
+++ b/flake.lock
@@ -213,11 +213,11 @@
     },
     "nix2lua": {
       "locked": {
-        "lastModified": 1713641247,
-        "narHash": "sha256-UDAxwO1vSkaPtmby04xjiHq5dxd03IBD3lkpFKYlV7Q=",
+        "lastModified": 1713645801,
+        "narHash": "sha256-pev5YkdskHDS4OpGdYb5F/44hKrFmqzCwNGs0vSzqM8=",
         "ref": "refs/heads/main",
-        "rev": "8c4f3ca834ef7c07c9e3be3e006d7395c69a176c",
-        "revCount": 36,
+        "rev": "3c08fa87d14704db1c1648b2486ed49e721dfe18",
+        "revCount": 37,
         "type": "git",
         "url": "https://git.pleshevski.ru/mynix/nix2lua"
       },
diff --git a/flake.nix b/flake.nix
index 2be899f..80dd7bf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -250,13 +250,10 @@
                 group_empty = true;
                 full_name = true;
               };
-              keymaps = [
-                { mode = "n"; bind = "<leader>nt"; command = "<CMD>NvimTreeToggle<CR>"; }
-                { mode = "n"; bind = "<leader>nf"; command = "<CMD>NvimTreeFindFile<CR>"; }
-              ];
             };
             nvim-treesitter = { };
-            git = { };
+            gitsigns-nvim = { };
+            neoformat = { };
           };
 
           plugins = with prev.nix2lua.lib; {
diff --git a/lib/vim.nix b/lib/vim.nix
index 973c8ca..75610a9 100644
--- a/lib/vim.nix
+++ b/lib/vim.nix
@@ -2,8 +2,10 @@
 
 with nix2lua.lib;
 {
+  g = varName: expr: set "vim.g.${varName}" expr;
   fn.isdirectory = file: call1 "vim.fn.isdirectory" (var file);
 
+  cmd' = expr: call1 "vim.cmd" expr;
   cmd.cd = file: call1 "vim.cmd.cd" (var file);
 
   keymap.set = { mode, bind, command, opts ? { } }:
diff --git a/modules/git.nix b/modules/gitsigns-nvim.nix
similarity index 100%
rename from modules/git.nix
rename to modules/gitsigns-nvim.nix
diff --git a/modules/neoformat.nix b/modules/neoformat.nix
new file mode 100644
index 0000000..d38a5d6
--- /dev/null
+++ b/modules/neoformat.nix
@@ -0,0 +1,32 @@
+{ vim, ... }:
+
+{ configs ? {
+    neoformat_enabled_markdown = [ "denofmt" ];
+    neoformat_rust_rustfmt = {
+      exe = "rustfmt";
+      args = [ "--edition 2021" ];
+      stdin = 1;
+    };
+  }
+}:
+
+let inherit (builtins) concatLists attrValues mapAttrs; in
+{
+  neoformat = concatLists [
+    [
+      (vim.g "neoformat_try_node_exe" 1)
+      (vim.g "neoformat_only_msg_on_error" 1)
+    ]
+
+    (attrValues (mapAttrs vim.g configs))
+
+    [
+      (vim.cmd' ''
+        aug fmt
+          au!
+          au BufWritePre * try | undojoin | Neoformat | catch /E790/ | Neoformat | endtry
+        aug END
+      '')
+    ]
+  ];
+}
-- 
2.46.1


From 8933762c5c8e778750a9c90aabfd2258547e3f9a Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Sun, 21 Apr 2024 00:24:47 +0300
Subject: [PATCH 09/15] modules/neoformat: add possibility to overwrite base
 configs

---
 modules/neoformat.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/neoformat.nix b/modules/neoformat.nix
index d38a5d6..b18b198 100644
--- a/modules/neoformat.nix
+++ b/modules/neoformat.nix
@@ -11,14 +11,16 @@
 }:
 
 let inherit (builtins) concatLists attrValues mapAttrs; in
+let
+  baseConfigs = {
+    neoformat_try_node_exe = 1;
+    neoformat_only_msg_on_error = 1;
+  };
+in
+
 {
   neoformat = concatLists [
-    [
-      (vim.g "neoformat_try_node_exe" 1)
-      (vim.g "neoformat_only_msg_on_error" 1)
-    ]
-
-    (attrValues (mapAttrs vim.g configs))
+    (attrValues (mapAttrs vim.g (baseConfigs // configs)))
 
     [
       (vim.cmd' ''
-- 
2.46.1


From 782c3800237f31c644a1198d62aedf7a0dd5e903 Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Sun, 21 Apr 2024 00:29:44 +0300
Subject: [PATCH 10/15] modules/catppuccin: update configs

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

diff --git a/modules/catppuccin.nix b/modules/catppuccin.nix
index 2ada413..35ab80d 100644
--- a/modules/catppuccin.nix
+++ b/modules/catppuccin.nix
@@ -1,4 +1,4 @@
-{ nix2lua, ... }:
+{ nix2lua, vim, ... }:
 
 
 { flavour ? "frappe" }:
@@ -6,8 +6,8 @@
 with nix2lua.lib;
 {
   catppuccin = [
-    (set "vim.g.catppuccin_flavour" flavour)
+    (vim.g "catppuccin_flavour" flavour)
     (pipe1 (require "catppuccin") (call0 "setup"))
-    (call "vim.cmd" "colorscheme catppuccin")
+    (vim.cmd' "colorscheme catppuccin")
   ];
 }
-- 
2.46.1


From 439437402d299991a7087c20c4a3287201cd0309 Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Sun, 21 Apr 2024 11:46:13 +0300
Subject: [PATCH 11/15] modules: add hop-nvim

---
 flake.nix                 |  4 ++
 modules/gitsigns-nvim.nix | 15 +++++--
 modules/hop-nvim.nix      | 92 +++++++++++++++++++++++++++++++++++++++
 modules/nvim-tree-lua.nix | 13 ++++--
 4 files changed, 116 insertions(+), 8 deletions(-)
 create mode 100644 modules/hop-nvim.nix

diff --git a/flake.nix b/flake.nix
index 80dd7bf..f40e4fe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -254,6 +254,7 @@
             nvim-treesitter = { };
             gitsigns-nvim = { };
             neoformat = { };
+            hop-nvim = { };
           };
 
           plugins = with prev.nix2lua.lib; {
@@ -272,6 +273,9 @@
                   lualine_z = [ "location" "mode" ];
                 };
               });
+            nvim-colorizer = pipe1
+              (require "colorizer")
+              (call0 "setup");
           };
         });
 
diff --git a/modules/gitsigns-nvim.nix b/modules/gitsigns-nvim.nix
index e5e1876..2c27106 100644
--- a/modules/gitsigns-nvim.nix
+++ b/modules/gitsigns-nvim.nix
@@ -2,8 +2,8 @@
 
 with nix2lua.lib;
 
-{ configs ? { }
-, keymaps ? [
+let
+  defaultKeymaps = [
     { mode = "n"; bind = "]h"; command = raw "next_hunk"; }
     { mode = "n"; bind = "[h"; command = raw "prev_hunk"; }
     { mode = "n"; bind = "<leader>gs"; command = raw "gs.stage_hunk"; }
@@ -15,11 +15,18 @@ with nix2lua.lib;
     { mode = "n"; bind = "<leader>gD"; command = lambda0 (call "gs.diffthis" "~"); }
     { mode = "n"; bind = "<leader>gtb"; command = raw "gs.toggle_current_line_blame"; }
     { mode = "n"; bind = "<leader>gtd"; command = raw "gs.toggle_deleted"; }
-  ]
+  ];
+in
+
+{ configs ? { }
+, keymaps ? defaultKeymaps
+, extraKeymaps ? [ ]
 }:
 
 let
-  bufferedKeymaps = map (args: lib.recursiveUpdate args { opts.buffer = var "bufnr"; }) keymaps;
+  bufferedKeymaps = map
+    (args: lib.recursiveUpdate args { opts.buffer = var "bufnr"; })
+    (keymaps ++ extraKeymaps);
 in
 {
   gitsigns-nvim = [
diff --git a/modules/hop-nvim.nix b/modules/hop-nvim.nix
new file mode 100644
index 0000000..5a657d4
--- /dev/null
+++ b/modules/hop-nvim.nix
@@ -0,0 +1,92 @@
+{ nix2lua, vim, ... }:
+
+with nix2lua.lib;
+
+let
+  hintDirAfter = var "hint.HintDirection.AFTER_CURSOR";
+  hintDirBefore = var "hint.HintDirection.BEFORE_CURSOR";
+
+  defaultKeymaps = [
+    { mode = ""; bind = "<leader>hc"; command = "<CMD>HopChar1<CR>"; }
+    {
+      mode = "";
+      bind = "<leader>hf";
+      command = lambda0 (call "hop.hint_char1" {
+        direction = hintDirAfter;
+        current_line_only = true;
+      });
+    }
+    {
+      mode = "";
+      bind = "<leader>hF";
+      command = lambda0 (call "hop.hint_char1" {
+        direction = hintDirBefore;
+        current_line_only = true;
+      });
+    }
+    {
+      mode = "";
+      bind = "<leader>hbc";
+      command = lambda0 (call "hop.hint_char1" { direction = hintDirAfter; });
+    }
+    {
+      mode = "";
+      bind = "<leader>htc";
+      command = lambda0 (call "hop.hint_char1" { direction = hintDirBefore; });
+    }
+    {
+      mode = "";
+      bind = "<leader>hw";
+      command = "<Cmd>HopWord<CR>";
+    }
+    {
+      mode = "";
+      bind = "<leader>hbw";
+      command = lambda0 (call "hop.hint_words" { direction = hintDirAfter; });
+    }
+    {
+      mode = "";
+      bind = "<leader>htw";
+      command = lambda0 (call "hop.hint_words" { direction = hintDirBefore; });
+    }
+    {
+      mode = "";
+      bind = "<leader>hp";
+      command = "<CMD>HopPattern<CR>";
+    }
+    {
+      mode = "";
+      bind = "<leader>hbp";
+      command = lambda0 (call "hop.hint_patterns" { direction = hintDirAfter; });
+    }
+    {
+      mode = "";
+      bind = "<leader>htp";
+      command = lambda0 (call "hop.hint_patterns" { direction = hintDirBefore; });
+    }
+    {
+      mode = "";
+      bind = "<leader>hbv";
+      command = lambda0 (call "hop.hint_vertical" { direction = hintDirAfter; });
+    }
+    {
+      mode = "";
+      bind = "<leader>htv";
+      command = lambda0 (call "hop.hint_vertical" { direction = hintDirBefore; });
+    }
+  ];
+in
+
+{ configs ? { }
+, keymaps ? defaultKeymaps
+, extraKeymaps ? [ ]
+}:
+
+{
+  hop-nvim = [
+    (local (set "hop" (require "hop")))
+    (pipe1 (var "hop") (call "setup" configs))
+
+    (local (set "hint" (require "hop.hint")))
+  ] ++ map vim.keymap.set (keymaps ++ extraKeymaps);
+}
diff --git a/modules/nvim-tree-lua.nix b/modules/nvim-tree-lua.nix
index 108ea90..9ea511f 100644
--- a/modules/nvim-tree-lua.nix
+++ b/modules/nvim-tree-lua.nix
@@ -1,10 +1,15 @@
 { nix2lua, vim, ... }:
 
-{ configs ? { }
-, keymaps ? [
+let
+  defaultKeymaps = [
     { mode = "n"; bind = "<leader>nt"; command = "<CMD>NvimTreeToggle<CR>"; }
     { mode = "n"; bind = "<leader>nf"; command = "<CMD>NvimTreeFindFile<CR>"; }
-  ]
+  ];
+in
+
+{ configs ? { }
+, keymaps ? defaultKeymaps
+, extraKeymaps ? [ ]
 }:
 
 with nix2lua.lib;
@@ -45,6 +50,6 @@ let isEmptyVar = name: eq "" (var name); in
 
       (vim.api.nvim_create_autocmd [ "VimEnter" ] { callback = var "open_nvim_tree"; })
     ]
-    ++ (map vim.keymap.set keymaps)
+    ++ map vim.keymap.set (keymaps ++ extraKeymaps)
   );
 }
-- 
2.46.1


From eeca046ef27b99a23aaa0aea41e1c32d6c7cfeab Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Sun, 21 Apr 2024 12:20:06 +0300
Subject: [PATCH 12/15] modules: add telescope-nvim

---
 flake.nix                  |  1 +
 modules/telescope-nvim.nix | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 modules/telescope-nvim.nix

diff --git a/flake.nix b/flake.nix
index f40e4fe..e859b60 100644
--- a/flake.nix
+++ b/flake.nix
@@ -255,6 +255,7 @@
             gitsigns-nvim = { };
             neoformat = { };
             hop-nvim = { };
+            telescope-nvim = { };
           };
 
           plugins = with prev.nix2lua.lib; {
diff --git a/modules/telescope-nvim.nix b/modules/telescope-nvim.nix
new file mode 100644
index 0000000..a85af5a
--- /dev/null
+++ b/modules/telescope-nvim.nix
@@ -0,0 +1,34 @@
+{ nix2lua, vim, ... }:
+
+with nix2lua.lib;
+
+let
+  defaultKeymaps = [
+    { mode = "n"; bind = "<leader>ff"; command = "<Cmd>Telescope find_files hidden=true<CR>"; }
+    { mode = "n"; bind = "<leader>fb"; command = "<Cmd>Telescope buffers<CR>"; }
+    { mode = "n"; bind = "<leader>fh"; command = "<Cmd>Telescope help_tags<CR>"; }
+
+    { mode = "n"; bind = "<leader>fg"; command = lambda0 (call0 "telescope.extensions.live_grep_args.live_grep_args"); }
+  ];
+in
+
+
+{ configs ? { }
+, keymaps ? defaultKeymaps
+, extraKeymaps ? [ ]
+  # TODO: add possibility to configure extensions
+}:
+
+{
+  # telescope requirements
+  plenary-nvim = true;
+
+  # telescope extension
+  telescope-live-grep-args-nvim = true;
+
+  telescope-nvim = [
+    (local (set "telescope" (require "telescope")))
+    (pipe1 (var "telescope") (call "setup" configs))
+    (pipe1 (var "telescope") (call "load_extension" "live_grep_args"))
+  ] ++ map vim.keymap.set (keymaps ++ extraKeymaps);
+}
-- 
2.46.1


From 36b2d8ce057ab5cd02ebd95c7fa377d49ccde5a4 Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Sun, 21 Apr 2024 12:26:10 +0300
Subject: [PATCH 13/15] add editorconfig-nvim to 'all' package

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

diff --git a/flake.nix b/flake.nix
index e859b60..b82ef68 100644
--- a/flake.nix
+++ b/flake.nix
@@ -259,6 +259,7 @@
           };
 
           plugins = with prev.nix2lua.lib; {
+            editorconfig-nvim = true;
             lualine-nvim = pipe1
               (require "lualine")
               (call "setup" {
-- 
2.46.1


From d888dcb9baf1a3967a60045c16fb887de4288391 Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Sun, 21 Apr 2024 16:00:19 +0300
Subject: [PATCH 14/15] modules: add nvim-cmp

---
 flake.nix            |  2 ++
 lib/vim.nix          |  3 +++
 modules/nvim-cmp.nix | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 modules/nvim-cmp.nix

diff --git a/flake.nix b/flake.nix
index b82ef68..bd64768 100644
--- a/flake.nix
+++ b/flake.nix
@@ -256,10 +256,12 @@
             neoformat = { };
             hop-nvim = { };
             telescope-nvim = { };
+            nvim-cmp = { };
           };
 
           plugins = with prev.nix2lua.lib; {
             editorconfig-nvim = true;
+            lualine-lsp-progress = true;
             lualine-nvim = pipe1
               (require "lualine")
               (call "setup" {
diff --git a/lib/vim.nix b/lib/vim.nix
index 75610a9..5af12e4 100644
--- a/lib/vim.nix
+++ b/lib/vim.nix
@@ -3,6 +3,9 @@
 with nix2lua.lib;
 {
   g = varName: expr: set "vim.g.${varName}" expr;
+  opt = varName: expr: set "vim.opt.${varName}" expr;
+
+  fn' = fnName: args: call "vim.fn[\"${fnName}\"]" args;
   fn.isdirectory = file: call1 "vim.fn.isdirectory" (var file);
 
   cmd' = expr: call1 "vim.cmd" expr;
diff --git a/modules/nvim-cmp.nix b/modules/nvim-cmp.nix
new file mode 100644
index 0000000..781d452
--- /dev/null
+++ b/modules/nvim-cmp.nix
@@ -0,0 +1,41 @@
+{ nix2lua, vim, ... }:
+
+with nix2lua.lib;
+
+let
+  defaultCmpKeymaps = {
+    "<C-b>" = call "cmp.mapping.scroll_docs" (- 4);
+    "<C-d>" = call "cmp.mapping.scroll_docs" 4;
+    "<C-Space>" = call0 "cmp.mapping.complete";
+    "<C-e>" = call0 "cmp.mapping.abort";
+    "<CR>" = call "cmp.mapping.confirm" { select = true; };
+  };
+in
+
+{ cmpKeymaps ? defaultCmpKeymaps
+, extraCmpKeymaps ? { }
+, cmpSources ? { }
+}:
+
+{
+  luasnip = true;
+  cmp-luasnip = true;
+
+  nvim-cmp = [
+    (vim.opt "completeopt" [ "menu" "menuone" "noselect" ])
+
+    (local (set "cmp" (require "cmp")))
+
+    (pipe1
+      (var "cmp")
+      (call "setup" {
+        snippet.exand = lambda [ "args" ]
+          (pipe1 (require "luasnip") (call "lsp_expand" (var "args")));
+
+        mapping = call "cmp.mapping.preset.insert" (cmpKeymaps // extraCmpKeymaps);
+
+        sources = call "cmp.config.sources" cmpSources;
+      })
+    )
+  ];
+}
-- 
2.46.1


From 27fed7b39e821e4940398bd1edcb3be06ce70a4d Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Mon, 22 Apr 2024 10:53:56 +0300
Subject: [PATCH 15/15] modules: add lspconfig

---
 flake.lock            |  7 +++--
 flake.nix             |  5 +++-
 lib/vim.nix           |  3 +++
 modules/lspconfig.nix | 61 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 modules/lspconfig.nix

diff --git a/flake.lock b/flake.lock
index b83ba03..e86ce64 100644
--- a/flake.lock
+++ b/flake.lock
@@ -133,17 +133,16 @@
     "lspsaga-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1665291018,
-        "narHash": "sha256-jkoEP5jeIZDAK/27gpNTXtW10/Ev9nB5RqUahPhja2Y=",
+        "lastModified": 1713695968,
+        "narHash": "sha256-DBfYJqVJ2zgHY3OI0ZirRn7kr34d5Gj9hi0K+UvuUdg=",
         "owner": "glepnir",
         "repo": "lspsaga.nvim",
-        "rev": "f33bc99d0ed3ed691a58b3339decf4e1933c3f9e",
+        "rev": "f20985499cd8ff0fbbfe8e7c770428ef764fc3be",
         "type": "github"
       },
       "original": {
         "owner": "glepnir",
         "repo": "lspsaga.nvim",
-        "rev": "f33bc99d0ed3ed691a58b3339decf4e1933c3f9e",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index bd64768..36ba702 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,7 +71,7 @@
 
     # https://github.com/glepnir/lspsaga.nvim
     lspsaga-nvim = {
-      url = "github:glepnir/lspsaga.nvim?rev=f33bc99d0ed3ed691a58b3339decf4e1933c3f9e";
+      url = "github:glepnir/lspsaga.nvim";
       flake = false;
     };
 
@@ -257,6 +257,9 @@
             hop-nvim = { };
             telescope-nvim = { };
             nvim-cmp = { };
+            lspconfig.languageServerConfigs = {
+              nil_ls = { };
+            };
           };
 
           plugins = with prev.nix2lua.lib; {
diff --git a/lib/vim.nix b/lib/vim.nix
index 5af12e4..4a9e421 100644
--- a/lib/vim.nix
+++ b/lib/vim.nix
@@ -36,4 +36,7 @@ with nix2lua.lib;
    */
   api.nvim_create_autocmd = event: opts:
     call "vim.api.nvim_create_autocmd" [ event opts ];
+
+  api.nvim_create_augroup = name: opts:
+    call "vim.api.nvim_create_augroup" [ name opts ];
 }
diff --git a/modules/lspconfig.nix b/modules/lspconfig.nix
new file mode 100644
index 0000000..13af09e
--- /dev/null
+++ b/modules/lspconfig.nix
@@ -0,0 +1,61 @@
+{ nix2lua, vim, lib, ... }:
+
+with nix2lua.lib;
+
+let
+  defaultDiagnosticKeymaps = [
+    { mode = "n"; bind = "<space>e"; command = raw "vim.diagnostic.open_float"; }
+    { mode = "n"; bind = "[d"; command = raw "vim.diagnostic.goto_prev"; }
+    { mode = "n"; bind = "]d"; command = raw "vim.diagnostic.goto_next"; }
+    { mode = "n"; bind = "<space>q"; command = raw "vim.diagnostic.setloclist"; }
+  ];
+
+  defaultKeymaps = [
+    { mode = "n"; bind = "gD"; command = raw "vim.lsp.buf.declaration"; }
+    { mode = "n"; bind = "gd"; command = raw "vim.lsp.buf.definition"; }
+    { mode = "n"; bind = "K"; command = raw "vim.lsp.buf.hover"; }
+    { mode = "n"; bind = "gi"; command = raw "vim.lsp.buf.implementation"; }
+    { mode = "n"; bind = "gr"; command = raw "vim.lsp.buf.references"; }
+    { mode = "n"; bind = "gy"; command = raw "vim.lsp.buf.type_definition"; }
+    { mode = "n"; bind = "<C-k>"; command = raw "vim.lsp.buf.signature_help"; }
+    { mode = "n"; bind = "<localleader>n"; command = raw "vim.lsp.buf.rename"; }
+    { mode = [ "n" "v" ]; bind = "<localleader>a"; command = raw "vim.lsp.buf.code_action"; }
+  ];
+
+in
+
+{ languageServerConfigs ? { }
+, diagnosticKeymaps ? defaultDiagnosticKeymaps
+, keymaps ? defaultKeymaps
+}:
+
+{
+  # dependencies
+  nvim-lspconfig = lib.flatten [
+    (local (set "lspconfig" (require "lspconfig")))
+
+    (lib.flip lib.mapAttrsToList languageServerConfigs (ls: lsConfigs:
+      pipe [
+        (var "lspconfig")
+        (var ls)
+        (call "setup"
+          (if builtins.isAttrs lsConfigs then lsConfigs
+          else { }))
+      ]
+    ))
+
+    (map vim.keymap.set diagnosticKeymaps)
+
+    (vim.api.nvim_create_autocmd "LspAttach" {
+      group = vim.api.nvim_create_augroup "UserLspConfig" { };
+      callback = lambda [ "ev" ]
+        (lib.flatten [
+
+          (local (set "opts" { buffer = pipe1 (var "ev") (var "buf"); }))
+
+          (lib.flip map keymaps (keymap:
+            vim.keymap.set (keymap // { opts = var "opts"; })))
+        ]);
+    })
+  ];
+}
-- 
2.46.1