Move more modules from lua to nix

home/features/neovim/config/ftplugin/hkf.lua

@@ -1 +0,0 @@
-vim.api.nvim_buf_set_option(0, "commentstring", "-- %s")

home/features/neovim/config/ftplugin/markdown.lua

@@ -1 +0,0 @@
-require("my.helpers.wrapMovement").enable()

home/features/neovim/config/ftplugin/nix.lua

@@ -1,9 +0,0 @@
--- Use _<leader>lg_ to fetchgit stuff
-vim.keymap.set("n", "<leader>lg", function()
-  require("my.tempest").withSavedCursor(function()
-    vim.cmd(":%!update-nix-fetchgit")
-  end)
-end, { buffer = true, desc = "Update all fetchgit calls" })
-
--- Idk why this isn't here by default
-vim.api.nvim_buf_set_option(0, "commentstring", "# %s")

home/features/neovim/config/ftplugin/tex.lua

@@ -1,7 +1,6 @@
 local A = require("my.abbreviations")
 local scrap = require("scrap")
 
-require("my.helpers.wrapMovement").enable()
 require("my.abbreviations.math").setup()
 
 vim.opt.conceallevel = 0

home/features/neovim/config/ftplugin/typst.lua

@@ -1,3 +1,2 @@
-require("my.helpers.wrapMovement").enable()
 require("my.abbreviations.math").setup()
 require("my.abbreviations.unicode").setup()

home/features/neovim/config/lazy-lock.json

@@ -14,6 +14,7 @@
   "conform": { "branch": "master", "commit": "48bc9996ebfe90e7766f46338360f75fd6ecb174" },
   "crates": { "branch": "main", "commit": "b8ea20fda2e1029fbbb1bae7a9eab35c84037ca0" },
   "discord-rich-presence": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
+  "dressing": { "branch": "master", "commit": "94b0d24483d56f3777ee0c8dc51675f21709318c" },
   "edit-code-block": { "branch": "main", "commit": "5e4e31012eafa113216cb5894f696682833f8e7f" },
   "fidget": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
   "flash": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
@@ -37,6 +38,7 @@
   "mini.comment": { "branch": "main", "commit": "3d9c8009615857e982f09bc5357fc95f2a2175f3" },
   "mini.files": { "branch": "main", "commit": "173d73f5d0b2a9abbb2d6533a3770fdbbd0c4dcc" },
   "mini.operators": { "branch": "main", "commit": "7a97e2528a4c274e9da8953d3ba22f493c360a9f" },
+  "mini.pairs": { "branch": "main", "commit": "552062017ff207e1f35f7028bfb3f27c7421d22d" },
   "mini.statusline": { "branch": "main", "commit": "950d9029c7ed901b67c839e74478f784b7432665" },
   "mini.surround": { "branch": "main", "commit": "af8129efcabe95fc08a233e9f91569829bed031f" },
   "neoconf": { "branch": "main", "commit": "64437787dba70fce50dad7bfbb97d184c5bc340f" },
@@ -46,7 +48,6 @@
   "nui": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" },
   "nui.nvim": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" },
   "null-ls": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
-  "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" },
   "nvim-lspconfig": { "branch": "master", "commit": "511609ae0311abfcfaed3c398429a147e895ce2c" },
   "nvim-tree": { "branch": "master", "commit": "7d1760f892951dd6a118dae1d7a1d8df5f029edf" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" },

home/features/neovim/config/lua/my/neovide.lua

@@ -1,14 +0,0 @@
-local M = {}
-
-function M.setup()
-  local default_length = 0.04
-  -- vim.g.neovide_floating_blur_amount_x = 10.0
-  -- vim.g.neovide_floating_blur_amount_y = 10.0
-  vim.g.neovide_transparency = require("nix.theme").opacity.applications
-  -- vim.g.transparency = 0.6
-  -- vim.g.pumblend = 0
-  vim.g.neovide_cursor_animation_length = default_length
-  vim.g.neovide_cursor_animate_in_insert_mode = false
-end
-
-return M

home/features/neovim/config/lua/my/plugins/init.lua

@@ -1,36 +0,0 @@
-local runtime = require("my.tempest")
-
-if runtime.whitelist("neovide") then
-  require("my.neovide").setup()
-end
-
-return {
-  {
-    -- Better ui for inputs/selects
-    "stevearc/dressing.nvim",
-    config = true,
-    -- https://github.com/folke/dot/blob/master/config/nvim/lua/config/plugins/init.lua
-    init = function()
-      ---@diagnostic disable-next-line: duplicate-set-field
-      vim.ui.select = function(...)
-        require("lazy").load({ plugins = { "dressing.nvim" } })
-        return vim.ui.select(...)
-      end
-      ---@diagnostic disable-next-line: duplicate-set-field
-      vim.ui.input = function(...)
-        require("lazy").load({ plugins = { "dressing.nvim" } })
-        return vim.ui.input(...)
-      end
-    end,
-    cond = runtime.blacklist("vscode"),
-    enabled = false,
-  },
-
-  {
-    "windwp/nvim-autopairs",
-    event = "InsertEnter",
-    config = function()
-      require("nvim-autopairs").setup()
-    end,
-  },
-}

home/features/neovim/config/lua/my/plugins/lspconfig.lua

@@ -4,7 +4,7 @@ local lspconfig = {
   "neovim/nvim-lspconfig",
   event = "BufReadPre",
   dependencies = {
-    "folke/neoconf.nvim",
+    "neoconf",
     {
       "folke/neodev.nvim",
       config = true,
@@ -26,59 +26,19 @@ local M = {
   },
 }
 
-function M.on_attach(client, bufnr)
+function M.on_attach(_, _) end
+function M.legacy_on_attach(_, bufnr)
   -- {{{ Keymap helpers
   local opts = function(desc)
     return { silent = true, desc = desc, buffer = bufnr }
   end
-
-  local nmap = function(from, to, desc)
-    vim.keymap.set("n", from, to, opts(desc))
-  end
-  -- }}}
-  -- {{{ Go to declaration / references / implementation
-  nmap("gd", vim.lsp.buf.definition, "[G]o to [d]efinition")
-  nmap("<leader>gi", vim.lsp.buf.implementation, "[G]o to [i]mplementation")
-  nmap("<leader>gr", vim.lsp.buf.references, "[G]o to [r]eferences")
-  -- }}}
-  -- {{{ Hover
-  -- Note: diagnostics are already covered in keymaps.lua
-  if client.supports_method("textDocument/hover") then
-    nmap("K", vim.lsp.buf.hover, "Hover")
-  end
-  nmap("L", vim.lsp.buf.signature_help, "Signature help")
   -- }}}
   -- {{{ Code actions
-  nmap("<leader>c", vim.lsp.buf.code_action, "[C]ode actions")
-  nmap("<leader>li", "<cmd>LspInfo<cr>", "[L]sp [i]nfo")
-
   local expropts = opts("[R]e[n]ame")
   expropts.expr = true
   vim.keymap.set("n", "<leader>rn", function()
     return ":IncRename " .. vim.fn.expand("<cword>")
   end, expropts)
-
-  vim.keymap.set(
-    "v",
-    "<leader>c",
-    ":'<,'> lua vim.lsp.buf.range_code_action()",
-    opts("[C]ode actions")
-  )
-  -- }}}
-  -- {{{ Workspace stuff
-  nmap(
-    "<leader>wa",
-    vim.lsp.buf.add_workspace_folder,
-    "[W]orkspace [A]dd Folder"
-  )
-  nmap(
-    "<leader>wr",
-    vim.lsp.buf.remove_workspace_folder,
-    "[W]orkspace [R]emove Folder"
-  )
-  nmap("<leader>wl", function()
-    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-  end, "[W]orkspace [L]ist Folders")
   -- }}}
 end
 
@@ -156,7 +116,7 @@ local servers = {
   -- }}}
   -- {{{ Nix
   rnix = {},
-  nil_ls = {},
+  -- nil_ls = {},
   nixd = {},
   -- }}}
   ---@diagnostic disable-next-line: missing-fields
@@ -184,22 +144,10 @@ M.capabilities = function()
 
   return c
 end
--- }}}
--- {{{ Nice diagnostic icons
--- See https://github.com/folke/dot/blob/master/config/nvim/lua/config/plugins/lsp/diagnostics.lua
-local function diagnostics_icons()
-  local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " }
-
-  for type, icon in pairs(signs) do
-    local hl = "DiagnosticSign" .. type
-    vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
-  end
-end
-
 -- }}}
 -- {{{ Main config function
 function lspconfig.config()
-  diagnostics_icons()
+  -- diagnostics_icons()
   -- -- {{{ Change on-hover borders
   vim.lsp.handlers["textDocument/hover"] =
     vim.lsp.with(vim.lsp.handlers.hover, { border = "single" })
@@ -210,23 +158,22 @@ function lspconfig.config()
   local capabilities = M.capabilities()
   -- Setup basic language servers
   for lsp, details in pairs(servers) do
-    if details.on_attach == nil then
-      -- Default setting for on_attach
-      details.on_attach = M.on_attach
-    end
-
     require("lspconfig")[lsp].setup({
       on_attach = details.on_attach,
       settings = details.settings, -- Specific per-language settings
-      flags = {
-        debounce_text_changes = 150, -- This will be the default in neovim 0.7+
-      },
       cmd = details.cmd,
       capabilities = capabilities,
     })
   end
-end
 
+  vim.api.nvim_create_autocmd("LspAttach", {
+    group = vim.api.nvim_create_augroup("UserLspConfig", {}),
+    callback = function(ev)
+      local client = vim.lsp.get_client_by_id(ev.data.client_id)
+      M.legacy_on_attach(client, ev.buf)
+    end,
+  })
+end
 --}}}
 
 return M

home/features/neovim/config/lua/my/plugins/venn.lua

@@ -49,32 +49,31 @@ function M.config()
       on_enter = function()
         vim.opt.virtualedit = "all"
         vim.g.inside_venn = true
-        vim.opt.cmdheight = 1
       end,
       on_exit = function()
         vim.opt.virtualedit = ""
-        vim.g.inside_venn = false
-        vim.opt.cmdheight = 0
       end,
       desc = "[V]enn mode",
     },
     mode = "n",
     body = "<leader>V",
     heads = {
-      { "H", "<C-v>h:VBox<cr>", { silent = true, desc = "test description" } },
+      { "H", "<C-v>h<esc><cmd>silent VBox<cr>", { silent = true } },
-      { "J", "<C-v>j:VBox<cr>", { silent = true, desc = "test description" } },
+      { "J", "<C-v>j<esc><cmd>silent VBox<cr>", { silent = true } },
-      { "K", "<C-v>k:VBox<cr>", { silent = true, desc = "test description" } },
+      { "K", "<C-v>k<esc><cmd>silent VBox<cr>", { silent = true } },
-      { "L", "<C-v>l:VBox<cr>", { silent = true, desc = "test description" } },
+      { "L", "<C-v>l<esc><cmd>silent VBox<cr>", { silent = true } },
       { "f", "<cmd>VBox<cr>", { mode = "v" } },
       { "<Esc>", nil, { exit = true } },
     },
   })
+
+  -- vim.keymap.set("n", "w", "<C-v>h:VBox<cr>", { silent = true })
 end
 
 function M.init()
-  require("which-key").register({
+  -- require("which-key").register({
-    ["<leader>V"] = { name = "[V]enn mode" },
+  --   ["<leader>V"] = { name = "[V]enn mode" },
-  })
+  -- })
 end
 
 return M

home/features/neovim/config/lua/my/tempest.lua

@@ -100,7 +100,7 @@ function M.create_autocmd(opts)
 
   vim.api.nvim_create_autocmd(opts.event, {
     group = vim.api.nvim_create_augroup(opts.group, {}),
-    pattern = opts.pattern,
+    pattern = H.with_default("*", opts.pattern),
     callback = callback,
   })
 end
@@ -118,6 +118,7 @@ local function recursive_assign(source, destination)
 end
 
 function M.configure(opts, context)
+  -- {{{ Construct opts & context
   if type(opts) == "function" then
     opts = opts(context)
   end
@@ -130,11 +131,20 @@ function M.configure(opts, context)
   if type(opts.mkContext) == "function" then
     context = opts.mkContext(context)
   end
+  -- }}}
+
+  if
+    opts.cond == false
+    or type(opts.cond) == "function" and opts.cond(context) == false
+  then
+    return
+  end
 
   if type(opts.vim) == "table" then
     recursive_assign(opts.vim, vim)
   end
 
+  -- {{{ Keybinds
   if type(opts.keys) == "function" then
     opts.keys = opts.keys(context)
   end
@@ -151,7 +161,8 @@ function M.configure(opts, context)
       M.set_keymap(keymap, context)
     end
   end
-
+  -- }}}
+  -- {{{ Autocmds
   if type(opts.autocmds) == "function" then
     opts.autocmds = opts.autocmds(context)
   end
@@ -160,7 +171,7 @@ function M.configure(opts, context)
     local autocmds = opts.autocmds
 
     -- Detect single autocmd passed instead of array
-    if autocmds.pattern ~= nil then
+    if autocmds.event ~= nil then
       autocmds = { autocmds }
     end
 
@@ -168,7 +179,8 @@ function M.configure(opts, context)
       M.create_autocmd(autocmd)
     end
   end
-
+  -- }}}
+  -- {{{ .setup calls
   if type(opts.setup) == "table" then
     for key, arg in pairs(opts.setup) do
       require(key).setup(arg)
@@ -187,10 +199,16 @@ function M.configure(opts, context)
       module.setup(context.opts)
     end
   end
-
+  -- }}}
+  -- {{{ Callbacks
   if type(opts.callback) == "function" then
     opts.callback(context)
   end
+
+  if type(opts.callback) == "table" then
+    M.configure(opts.callback, context)
+  end
+  -- }}}
 end
 
 function M.configureMany(specs, context)

home/features/neovim/default.nix

@@ -6,11 +6,11 @@ let
       inherit lib korora;
     }
     {
-      languageServerModule = "my.plugins.lspconfig";
       tempestModule = "my.tempest";
     };
 
-  generated = nlib.generateConfig (lib.fix (self: {
+  generated = nlib.generateConfig
+    (lib.fix (self: with nlib; {
       # {{{ Pre-plugin config
       pre = {
         # {{{ General options
@@ -79,18 +79,13 @@ let
         "1:misc-keybinds" = {
           # {{{ Global keybinds 
           keys =
-          let
             # {{{ Keybind helpers 
-            nmap = mapping: action: desc:
+            let dmap = mapping: action: desc: {
-              { inherit mapping action desc; };
-            unmap = mapping:
-              { inherit mapping; action = "<nop>"; };
-            dmap = mapping: action: desc: {
               inherit mapping desc;
-              action = nlib.lua "vim.diagnostic.${action}";
+              action = lua "vim.diagnostic.${action}";
             };
-            # }}}
             in
+            # }}}
             [
               # {{{ Free up q and Q
               (nmap "<c-q>" "q" "Record macro")
@@ -103,19 +98,10 @@ let
               # See [my slambda config](../../../hosts/nixos/common/optional/services/slambda.nix) for details.
               #
               # Exit insert mode using *jk*
-            {
+              (keymap "iv" "<f10>" "<esc>" "Exit insert mode")
-              mode = "iv";
+
-              mapping = "<f10>";
-              action = "<esc>";
-              desc = "Exit insert mode";
-            }
               # Use global clipboard using *cp*
-            {
+              (keymap "nv" "<f11>" ''"+'' "Use global clipboard")
-              mode = "nv";
-              mapping = "<f11>";
-              action = ''"+'';
-              desc = "Use global clipboard";
-            }
               # Save using *ji*
               (nmap "<f12>" "<cmd>silent write<cr>" "Save current file")
               # }}}
@@ -123,7 +109,7 @@ let
               {
                 mode = "i";
                 mapping = "<c-cr>";
-              action = nlib.thunk /* lua */ ''
+                action = thunk /* lua */ ''
                   vim.paste({ "", "" }, -1)
                 '';
                 desc = "Insert newline without continuing the current comment";
@@ -141,11 +127,7 @@ let
               (dmap "]d" "goto_next" "Goto next [d]iagnostic")
               (dmap "J" "open_float" "Open current diagnostic")
               (dmap "<leader>D" "setloclist" "[D]iagnostic loclist")
-            {
+              (nmap "qj" "J" "join lines")
-              mapping = "qj";
-              action = "J";
-              desc = "join lines";
-            }
               # }}}
               # {{{ Other misc keybinds 
               (nmap "<Leader>a" "<C-^>" "[A]lternate file")
@@ -153,22 +135,31 @@ let
               (nmap "Q" ":wqa<cr>" "Save all files and [q]uit")
               (nmap "<leader>rw" ":%s/<C-r><C-w>/" "[R]eplace [w]ord in file")
               (nmap "<leader>sw"
-              (nlib.lua ''require("my.helpers.wrapMovement").toggle'')
+                (lua ''require("my.helpers.wrapMovement").toggle'')
                 "toggle word [w]rap")
               # }}}
             ];
           # }}}
+          # {{{ Autocmds
+          autocmds = [
             # {{{ Exit certain buffers with qq 
-        autocmds = {
+            {
               event = "FileType";
               pattern = [ "help" ];
               group = "BasicBufferQuitting";
-          action.keys = {
+              action.keys =
-            mapping = "qq";
+                nmap "qq" "<cmd>close<cr>" "[q]uit current buffer";
-            action = "<cmd>close<cr>";
+            }
-            desc = "[q]uit current buffer";
+            # }}}
-          };
+            # {{{ Enable wrap movemenets by default in certain filetypes
-        };
+            {
+              event = "FileType";
+              pattern = [ "markdown" "typst" "tex" ];
+              group = "EnableWrapMovement";
+              action = lua ''require("my.helpers.wrapMovement").enable'';
+            }
+            # }}}
+          ];
           # }}}
         };
         # }}}
@@ -186,6 +177,75 @@ let
           }
         ];
         # }}}
+        # {{{ Lsp on-attach
+        "3:lsp-on-attach".autocmds = {
+          event = "LspAttach";
+          group = "UserLspConfig";
+          action =
+            let nmap = mapping: action: desc:
+              nlib.nmap mapping
+                (lua "vim.lsp.buf.${action}")
+                desc;
+            in
+            {
+              mkContext = event: {
+                bufnr = lua "${event}.buf";
+                client = lua /* lua */
+                  "vim.lsp.get_client_by_id(${event}.data.client_id)";
+              };
+              keys = [
+                (nlib.nmap "<leader>li" "<cmd>LspInfo<cr>" "[L]sp [i]nfo")
+                (nmap "gd" "definition" "[G]o to [d]efinition")
+                (nmap "<leader>gi" "implementation" "[G]o to [i]mplementation")
+                (nmap "<leader>gr" "references" "[G]o to [r]eferences")
+                (nmap "L" "signature_help" "Signature help")
+                (nmap "<leader>c" "code_action" "[C]ode actions")
+                (keymap "v" "<leader>c" ":'<,'> lua vim.lsp.buf.range_code_action()" "[C]ode actions")
+                (nmap "<leader>wa" "add_workspace_folder" "[W]orkspace [A]dd Folder")
+                (nmap "<leader>wr" "remove_workspace_folder" "[W]orkspace [R]emove Folder")
+                (nlib.nmap "<leader>wl"
+                  (thunk /* lua */ ''
+                    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+                  '') "[W]orkspace [L]ist Folders")
+              ];
+              callback = {
+                cond = ctx: lua ''
+                  return ${ctx}.client.supports_method("textDocument/hover")
+                '';
+                keys = nmap "K" "hover" "Hover";
+              };
+            };
+        };
+        # }}}
+        # {{{ Neovide config
+        "4:configure-neovide" = {
+          cond = whitelist "neovide";
+          vim.g = {
+            neovide_transparency = lua ''require("my.helpers.theme").theme.opacity.applications'';
+            neovide_cursor_animation_length = 0.04;
+            neovide_cursor_animate_in_insert_mode = false;
+          };
+        };
+        # }}}
+        # {{{ Language specific settings
+        "5:language-specific-settings".autocmds = [{
+          event = "FileType";
+          group = "UserNixSettings";
+          pattern = "*.nix";
+          action = {
+            vim.opt.commentstring = "# %s";
+            keys = {
+              mapping = "<leader>lg";
+              action = thunk /* lua */ ''
+                D.tempest.withSavedCursor(function()
+                  vim.cmd(":%!${lib.getExe pkgs.update-nix-fetchgit}")
+                end)
+              '';
+              desc = "Update all fetchgit calls";
+            };
+          };
+        }];
+        # }}}
       };
       # }}}
       # {{{ Plugins
@@ -218,12 +278,10 @@ let
         nvim-tree = {
           package = "kyazdani42/nvim-tree.lua";
 
-        cond = nlib.blacklist [ "vscode" "firenvim" ];
+          cond = blacklist [ "vscode" "firenvim" ];
           config = true;
 
-        keys.mapping = "<C-n>";
+          keys = nmap "<C-n>" "Toggle [n]vim-tree" "<cmd>NvimTreeToggle<cr>";
-        keys.desc = "Toggle [n]vim-tree";
-        keys.action = "<cmd>NvimTreeToggle<cr>";
         };
         # }}}
         # {{{ mini.statusline
@@ -232,16 +290,16 @@ let
           name = "mini.statusline";
           dependencies.lua = [ self.lazy.web-devicons.package ];
 
-        cond = nlib.blacklist [ "vscode" "firenvim" ];
+          cond = blacklist [ "vscode" "firenvim" ];
           lazy = false;
 
-        opts.content.inactive = nlib.thunk /* lua */ ''
+          opts.content.inactive = thunk /* lua */ ''
             require("mini.statusline").combine_groups({
               { hl = "MiniStatuslineFilename", strings = { vim.fn.expand("%:t") } },
             })
           '';
 
-        opts.content.active = nlib.thunk /* lua */ ''
+          opts.content.active = thunk /* lua */ ''
             local st = require("mini.statusline");
             local mode, mode_hl = st.section_mode({ trunc_width = 120 })
             local git = st.section_git({ trunc_width = 75 })
@@ -264,11 +322,11 @@ let
           name = "mini.files";
           dependencies.lua = [ self.lazy.web-devicons.package ];
 
-        cond = nlib.blacklist [ "vscode" "firenvim" ];
+          cond = blacklist [ "vscode" "firenvim" ];
           keys = {
             mapping = "<c-s-f>";
             desc = "[S]earch [F]iles";
-          action = nlib.thunk /* lua */ ''
+            action = thunk /* lua */ ''
               local files = require("mini.files")
               if not files.close() then
                 files.open(vim.api.nvim_buf_get_name(0))
@@ -285,7 +343,7 @@ let
         winbar = {
           package = "fgheng/winbar.nvim";
 
-        cond = nlib.blacklist [ "vscode" "firenvim" ];
+          cond = blacklist [ "vscode" "firenvim" ];
           event = "BufReadPost";
 
           opts.enabled = true;
@@ -299,7 +357,7 @@ let
             let goto = key: index: {
               desc = "Goto harpoon file ${toString index}";
               mapping = "<c-s>${key}";
-            action = nlib.thunk
+              action = thunk
                 /* lua */ ''require("harpoon.ui").nav_file(${toString index})'';
             };
             in
@@ -307,13 +365,13 @@ let
               {
                 desc = "Add file to [h]arpoon";
                 mapping = "<leader>H";
-              action = nlib.thunk
+                action = thunk
                   /* lua */ ''require("harpoon.mark").add_file()'';
               }
               {
                 desc = "Toggle harpoon quickmenu";
                 mapping = "<c-a>";
-              action = nlib.thunk
+                action = thunk
                   /* lua */ ''require("harpoon.ui").toggle_quick_menu()'';
               }
               (goto "q" 1)
@@ -333,13 +391,9 @@ let
           package = "TimUntersberger/neogit";
           dependencies.lua = [ self.lazy.plenary.package ];
 
-        cond = nlib.blacklist [ "vscode" "firenvim" ];
+          cond = blacklist [ "vscode" "firenvim" ];
           cmd = "Neogit"; # We sometimes spawn this directly from fish using a keybind
-        keys = {
+          keys = nmap "<c-g>" "<cmd>Neogit<cr>" "Open neo[g]it";
-          mapping = "<c-g>";
-          action = "<cmd>Neogit<cr>";
-          desc = "Open neo[g]it";
-        };
 
           opts = true; # Here so the tempest runtime will call .setup
           config.autocmds = {
@@ -354,7 +408,7 @@ let
         telescope = {
           package = "nvim-telescope/telescope.nvim";
           version = "0.1.x";
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
 
           # {{{ Dependencies
           dependencies = {
@@ -372,22 +426,22 @@ let
           # {{{ Keymaps
           keys =
             let
-            keymap = mapping: action: desc: {
+              nmap = mapping: action: desc: {
                 inherit mapping desc;
                 action = "<cmd>Telescope ${action} theme=ivy<cr>";
               };
 
               findFilesByExtension = mapping: extension: tag:
-              keymap
+                nmap
                   "<leader>f${mapping}"
                   "find_files find_command=rg,--files,--glob=**/*.${extension}"
                   "Find ${tag} files";
             in
             [
-            (keymap "<c-p>" "find_files" "File finder [p]alette")
+              (nmap "<c-p>" "find_files" "File finder [p]alette")
-            (keymap "<leader>d" "diagnostics" "[D]iagnostics")
+              (nmap "<leader>d" "diagnostics" "[D]iagnostics")
-            (keymap "<c-f>" "live_grep" "[F]ind in project")
+              (nmap "<c-f>" "live_grep" "[F]ind in project")
-            (keymap "<leader>t" "builtin" "[T]elescope pickers")
+              (nmap "<leader>t" "builtin" "[T]elescope pickers")
               # {{{ Files by extension 
               (findFilesByExtension "tx" "tex" "[t]ex")
               (findFilesByExtension "ts" "ts" "[t]ypescript")
@@ -410,7 +464,7 @@ let
           };
           # }}}
           # {{{ Load fzf extension
-        config.callback = nlib.thunk /* lua */ ''
+          config.callback = thunk /* lua */ ''
             require("telescope").load_extension("fzf")
           '';
           # }}}
@@ -425,6 +479,26 @@ let
           # }}}
         };
         # }}}
+        # {{{ dressing
+        dressing = {
+          package = "stevearc/dressing.nvim";
+
+          cond = blacklist "vscode";
+          event = "BufReadPre";
+
+          config = true;
+          init = thunk /* lua */ ''
+            vim.ui.select = function(...)
+              require("lazy").load({ plugins = { "dressing.nvim" } })
+              return vim.ui.select(...)
+            end
+            vim.ui.input = function(...)
+              require("lazy").load({ plugins = { "dressing.nvim" } })
+              return vim.ui.input(...)
+            end
+          '';
+        };
+        # }}}
         # }}}
         # {{{ visual
         # The line between `ui` and `visual` is a bit rought. I currenlty mostly judge
@@ -435,7 +509,7 @@ let
           main = "ibl";
           config = true;
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           event = "BufReadPost";
         };
         # }}}
@@ -450,12 +524,7 @@ let
           opts.commands.Norm.cmd = "norm";
           opts.commands.G.cmd = "g";
 
-        keys = {
+          keys = keymap "v" "N" ":Norm " "Map lines in [n]ormal mode";
-          mode = "v";
-          mapping = "N";
-          action = ":Norm ";
-          desc = "Map lines in [n]ormal mode";
-        };
         };
         # }}}
         # {{{ fidget
@@ -463,7 +532,7 @@ let
           package = "j-hui/fidget.nvim";
           tag = "legacy";
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           event = "BufReadPre";
           config = true;
         };
@@ -475,7 +544,7 @@ let
           dependencies.lua = [ "nvim-treesitter/nvim-treesitter-textobjects" ];
           dependencies.nix = [ pkgs.tree-sitter ];
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           event = "BufReadPost";
 
           #{{{ Highlighting
@@ -533,7 +602,7 @@ let
           package = "haringsrob/nvim_context_vt";
           dependencies.lua = [ "treesitter" ];
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           event = "BufReadPost";
         };
 
@@ -542,30 +611,31 @@ let
           package = "nvim-treesitter/nvim-treesitter-context";
           dependencies.lua = [ "treesitter" ];
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           event = "BufReadPost";
           opts.enable = true;
         };
         # }}}
         # }}}
-      # {{{ editing {{{ text navigation
+        # {{{ editing 
+        # {{{ text navigation
         # {{{ flash
         flash = {
           package = "folke/flash.nvim";
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           keys =
-          let keybind = mode: mapping: action: desc: {
+            let nmap = mode: mapping: action: desc: {
               inherit mapping desc mode;
-            action = nlib.thunk /* lua */ ''require("flash").${action}()'';
+              action = thunk /* lua */ ''require("flash").${action}()'';
             };
             in
             [
-            (keybind "nxo" "s" "jump" "Flash")
+              (nmap "nxo" "s" "jump" "Flash")
-            (keybind "nxo" "S" "treesitter" "Flash Treesitter")
+              (nmap "nxo" "S" "treesitter" "Flash Treesitter")
-            (keybind "o" "r" "remote" "Remote Flash")
+              (nmap "o" "r" "remote" "Remote Flash")
-            (keybind "ox" "R" "treesitter_search" "Treesitter Search")
+              (nmap "ox" "R" "treesitter_search" "Treesitter Search")
-            (keybind "c" "<C-S>" "toggle" "Toggle Flash Search")
+              (nmap "c" "<C-S>" "toggle" "Toggle Flash Search")
             ];
 
           # Disable stuff like f/t/F/T
@@ -576,7 +646,7 @@ let
         ftft = {
           package = "gukz/ftFT.nvim";
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           keys = [ "f" "F" "t" "T" ];
           config = true;
         };
@@ -586,7 +656,7 @@ let
         clipboard-image = {
           package = "postfen/clipboard-image.nvim";
 
-        cond = nlib.blacklist "firenvim";
+          cond = blacklist "firenvim";
           cmd = "PasteImg";
 
           keys = {
@@ -595,7 +665,7 @@ let
             desc = "[P]aste image from clipboard";
           };
 
-        opts.default.img_name = nlib.import ./plugins/clipboard-image.lua "img_name";
+          opts.default.img_name = importFrom ./plugins/clipboard-image.lua "img_name";
           opts.tex = {
             img_dir = [ "%:p:h" "img" ];
             affix = "\\includegraphics[width=\\textwidth]{%s}";
@@ -610,7 +680,7 @@ let
         lastplace = {
           package = "ethanholz/nvim-lastplace";
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           event = "BufReadPre";
 
           opts.lastplace_ignore_buftype = [ "quickfix" "nofile" "help" ];
@@ -620,24 +690,23 @@ let
         undotree = {
           package = "mbbill/undotree";
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           cmd = "UndotreeToggle";
-        keys = {
+          keys = nmap
-          mapping = "<leader>u";
+            "<leader>u"
-          action = "<cmd>UndoTreeToggle<cr>";
+            "<cmd>UndoTreeToggle<cr>"
-          desc = "[U]ndo tree";
+            "[U]ndo tree";
-        };
         };
         # }}}
         # {{{ ssr (structured search & replace)
         ssr = {
           package = "cshuaimin/ssr.nvim";
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           keys = {
             mode = "nx";
             mapping = "<leader>rt";
-          action = nlib.thunk /* lua */ ''require("ssr").open()'';
+            action = thunk /* lua */ ''require("ssr").open()'';
             desc = "[r]eplace [t]emplate";
           };
 
@@ -650,7 +719,7 @@ let
           dependencies.lua = [ "treesitter" ];
           main = "ecb";
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           config = true;
           keys = {
             mapping = "<leader>e";
@@ -735,6 +804,16 @@ let
             ];
         };
         # }}}
+        # {{{ mini.pairs
+        mini-pairs = {
+          package = "echasnovski/mini.pairs";
+          name = "mini.pairs";
+
+          config = true;
+          # We could specify all the generated bindings, but I don't think it's worth it
+          event = [ "InsertEnter" "CmdlineEnter" ];
+        };
+        # }}}
         # {{{ luasnip
         # snippeting engine
         luasnip =
@@ -744,21 +823,21 @@ let
             package = "L3MON4D3/LuaSnip";
             version = "v2";
 
-          cond = nlib.blacklist "vscode";
+            cond = blacklist "vscode";
-          config = nlib.thunk reload;
+            config = thunk reload;
 
             # {{{ Keybinds
             keys = [
               {
                 mapping = "<leader>rs";
-              action = nlib.thunk reload;
+                action = thunk reload;
                 desc = "[R]eload [s]nippets";
               }
               {
                 mode = "i";
                 expr = true;
                 mapping = "<tab>";
-              action = nlib.thunk /* lua */ ''
+                action = thunk /* lua */ ''
                   local luasnip = require("luasnip")
 
                   if not luasnip.jumpable(1) then
@@ -776,7 +855,7 @@ let
               {
                 mode = "i";
                 mapping = "<s-tab>";
-              action = nlib.thunk /* lua */ ''
+                action = thunk /* lua */ ''
                   require("luasnip").jump(-1)
                 '';
                 desc = "Jump to previous snippet tabstop";
@@ -791,7 +870,7 @@ let
         conform = {
           package = "stevearc/conform.nvim";
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           event = "BufReadPost";
 
           opts.format_on_save.lsp_fallback = true;
@@ -816,6 +895,8 @@ let
 
           cmd = "Neoconf";
 
+          # Provide autocomplete for every language server
+          opts.plugins.jsonls.configure_servers_only = false;
           opts.import = {
             vscode = true; # local .vscode/settings.json
             coc = false; # global/local coc-settings.json
@@ -828,13 +909,12 @@ let
           package = "jose-elias-alvarez/null-ls.nvim";
           dependencies.lua = [ "neovim/nvim-lspconfig" ];
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           event = "BufReadPre";
 
-        opts = nlib.thunk /* lua */ ''
+          opts = thunk /* lua */ ''
             local p = require("null-ls")
             return {
-            on_attach = require("my.plugins.lspconfig").on_attach, 
               sources = {
                 p.builtins.diagnostics.ruff
               }
@@ -846,11 +926,11 @@ let
         gitsigns = {
           package = "lewis6991/gitsigns.nvim";
 
-        cond = nlib.blacklist [ "vscode" "firenvim" ];
+          cond = blacklist [ "vscode" "firenvim" ];
           event = "BufReadPost";
 
-        opts.on_attach = nlib.tempest {
+          opts.on_attach = tempest {
-          mkContext = nlib.lua /* lua */
+            mkContext = lua /* lua */
               "function(bufnr) return { bufnr = bufnr } end";
             keys =
               let
@@ -867,7 +947,7 @@ let
                 # {{{ exprmap helper
                 exprmap = mapping: action: desc: {
                   inherit mapping desc;
-                action = nlib.thunk /* lua */ ''
+                  action = thunk /* lua */ ''
                     if vim.wo.diff then
                       return "${mapping}"
                     end
@@ -897,14 +977,14 @@ let
                 (nmap "d" "diffthis" "[s]tage hunk")
                 {
                   mapping = prefix "D";
-                action = nlib.thunk ''
+                  action = thunk ''
                     ${gs}.diffthis("~")
                   '';
                   desc = "[d]iff file (?)";
                 }
                 {
                   mapping = prefix "b";
-                action = nlib.thunk ''
+                  action = thunk ''
                     ${gs}.blame_line({ full = true })
                   '';
                   desc = "[b]lame line";
@@ -918,7 +998,7 @@ let
                 {
                   mode = "v";
                   mapping = prefix "s";
-                action = nlib.thunk /* lua */ ''
+                  action = thunk /* lua */ ''
                     ${gs}.stage_hunk({ vim.fn.line("."), vim.fn.line("v") })
                   '';
                   desc = "stage visual hunk";
@@ -926,7 +1006,7 @@ let
                 {
                   mode = "v";
                   mapping = prefix "r";
-                action = nlib.thunk /* lua */ ''
+                  action = thunk /* lua */ ''
                     ${gs}.reset_hunk({ vim.fn.line("."), vim.fn.line("v") })
                   '';
                   desc = "reset visual hunk";
@@ -953,9 +1033,9 @@ let
             self.lazy.luasnip.package
           ];
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           event = [ "InsertEnter" "CmdlineEnter" ];
-        config = nlib.import ./plugins/cmp.lua "config";
+          config = importFrom ./plugins/cmp.lua "config";
         };
         # }}}
         # }}}
@@ -966,20 +1046,17 @@ let
           dependencies.lua = [ self.lazy.plenary.package ];
           version = "^2";
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           ft = [ "haskell" "lhaskell" "cabal" "cabalproject" ];
 
           config.vim.g.haskell_tools = {
-          hls = {
+            hls.settings.haskell = {
-            on_attach = nlib.lua /* lua */ ''require("my.plugins.lspconfig").on_attach'';
-            settings.haskell = {
               formattingProvider = "fourmolu";
 
               # This seems to work better with custom preludes
               # See this issue https://github.com/fourmolu/fourmolu/issues/357
               plugin.fourmolu.config.external = true;
             };
-          };
 
             # I think this wasn't showing certain docs as I expected (?)
             tools.hover.enable = false;
@@ -992,10 +1069,10 @@ let
           package = "simrat39/rust-tools.nvim";
           dependencies.nix = [ pkgs.rust-analyzer pkgs.rustfmt ];
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           ft = "rust";
 
-        opts.server.on_attach = nlib.customLanguageServerOnAttach {
+          opts.server.on_attach = tempestBufnr {
             keys = {
               mapping = "<leader>lc";
               action = "<cmd>RustOpenCargo<cr>";
@@ -1009,7 +1086,7 @@ let
           package = "saecki/crates.nvim";
           dependencies.lua = [ self.lazy.plenary.package ];
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           event = "BufReadPost Cargo.toml";
 
           # {{{ Set up null_ls source
@@ -1025,7 +1102,7 @@ let
               event = "InsertEnter";
               group = "CargoCmpSource";
               pattern = "Cargo.toml";
-            action = nlib.thunk /* lua */ ''
+              action = thunk /* lua */ ''
                 require("cmp").setup.buffer({ sources = { { name = "crates" } } })
               '';
             }
@@ -1036,7 +1113,7 @@ let
               group = "CargoKeybinds";
               pattern = "Cargo.toml";
               # # {{{ Register which-key info
-            # action.callback = nlib.contextThunk /* lua */ ''
+              # action.callback = contextThunk /* lua */ ''
               #  require("which-key").register({
               #    ["<leader>lc"] = {
               #      name = "[l]ocal [c]rates",
@@ -1049,9 +1126,9 @@ let
               action.keys = _:
                 let
                   # {{{ Keymap helpers 
-                keymap = mapping: action: desc: {
+                  nmap = mapping: action: desc: {
                     inherit mapping desc;
-                  action = nlib.lua /* lua */ ''require("crates").${action}'';
+                    action = lua /* lua */ ''require("crates").${action}'';
                   };
 
                   keyroot = "<leader>lc";
@@ -1059,18 +1136,18 @@ let
                 in
                 # {{{ Keybinds
                 [
-                (keymap "${keyroot}t" "toggle" "[c]rates [t]oggle")
+                  (nmap "${keyroot}t" "toggle" "[c]rates [t]oggle")
-                (keymap "${keyroot}r" "reload" "[c]rates [r]efresh")
+                  (nmap "${keyroot}r" "reload" "[c]rates [r]efresh")
 
-                (keymap "${keyroot}H" "open_homepage" "[c]rate [H]omephage")
+                  (nmap "${keyroot}H" "open_homepage" "[c]rate [H]omephage")
-                (keymap "${keyroot}R" "open_repository" "[c]rate [R]epository")
+                  (nmap "${keyroot}R" "open_repository" "[c]rate [R]epository")
-                (keymap "${keyroot}D" "open_documentation" "[c]rate [D]ocumentation")
+                  (nmap "${keyroot}D" "open_documentation" "[c]rate [D]ocumentation")
-                (keymap "${keyroot}C" "open_crates_io" "[c]rate [C]rates.io")
+                  (nmap "${keyroot}C" "open_crates_io" "[c]rate [C]rates.io")
 
-                (keymap "${keyroot}v" "show_versions_popup" "[c]rate [v]ersions")
+                  (nmap "${keyroot}v" "show_versions_popup" "[c]rate [v]ersions")
-                (keymap "${keyroot}f" "show_features_popup" "[c]rate [f]eatures")
+                  (nmap "${keyroot}f" "show_features_popup" "[c]rate [f]eatures")
-                (keymap "${keyroot}d" "show_dependencies_popup" "[c]rate [d]eps")
+                  (nmap "${keyroot}d" "show_dependencies_popup" "[c]rate [d]eps")
-                (keymap "K" "show_popup" "[c]rate popup")
+                  (nmap "K" "show_popup" "[c]rate popup")
                 ];
               # }}}
             }
@@ -1088,7 +1165,7 @@ let
             "neovim/nvim-lspconfig"
           ];
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           ft = "lean";
 
           opts = {
@@ -1097,10 +1174,8 @@ let
               cmp = true;
             };
 
-          lsp = {
+            lsp.capabilites =
-            on_attach = nlib.lua /* lua */ ''require("my.plugins.lspconfig").on_attach'';
+              lua /* lua */ ''require("my.plugins.lspconfig").capabilities'';
-            capabilites = nlib.lua /* lua */ ''require("my.plugins.lspconfig").capabilities'';
-          };
 
             lsp3 = false; # We don't want the lean 3 language server!
             mappings = true;
@@ -1116,18 +1191,18 @@ let
             "neovim/nvim-lspconfig"
           ];
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           ft = [ "idris2" "lidris2" "ipkg" ];
 
           opts = {
             client.hover.use_split = true;
-          serve.on_attach = nlib.customLanguageServerOnAttach {
+            serve.on_attach = tempestBufnr {
               # {{{ Keymaps
               keys =
                 let keymap = mapping: action: desc: {
                   inherit desc;
                   mapping = "<leader>i${mapping}";
-                action = nlib.lua /* lua */ ''require("idris2.code_action").${action}'';
+                  action = lua /* lua */ ''require("idris2.code_action").${action}'';
                 };
                 in
                 [
@@ -1148,7 +1223,7 @@ let
         github-actions = {
           package = "yasuhiroki/github-actions-yaml.vim";
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           ft = [ "yml" "yaml" ];
         };
         # }}}
@@ -1157,7 +1232,7 @@ let
           package = "kaarmu/typst.vim";
           dependencies.nix = [ pkgs.typst-lsp pkgs.typst-fmt ];
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           ft = "typst";
         };
         # }}}
@@ -1165,7 +1240,7 @@ let
         hyprland = {
           package = "theRealCarneiro/hyprland-vim-syntax";
 
-        cond = nlib.blacklist "vscode";
+          cond = blacklist "vscode";
           ft = "hypr";
 
           config.autocmds = {
@@ -1184,7 +1259,7 @@ let
           package = "wakatime/vim-wakatime";
           dependencies.nix = [ pkgs.wakatime ];
 
-        cond = nlib.blacklist [ "vscode" "firenvim" ];
+          cond = blacklist [ "vscode" "firenvim" ];
           event = "BufReadPost";
         };
         # }}}
@@ -1193,7 +1268,7 @@ let
           package = "andweeb/presence.nvim";
           main = "presence";
 
-        cond = nlib.blacklist [ "vscode" "firenvim" ];
+          cond = blacklist [ "vscode" "firenvim" ];
           event = "BufReadPost";
           config = true;
         };
@@ -1207,7 +1282,7 @@ let
             package = "ruifm/gitlinker.nvim";
             dependencies.lua = [ self.lazy.plenary.package ];
 
-          cond = nlib.blacklist [ "vscode" "firenvim" ];
+            cond = blacklist [ "vscode" "firenvim" ];
             opts.mappings = mapping;
             keys = mapping;
           };
@@ -1229,8 +1304,8 @@ let
             dependencies.lua = [ self.lazy.plenary.package ];
 
             cond = [
-            (nlib.blacklist [ "vscode" "firenvim" ])
+              (blacklist [ "vscode" "firenvim" ])
-            (nlib.lua /* lua */ "vim.loop.cwd() == ${nlib.encode vault}")
+              (lua /* lua */ "vim.loop.cwd() == ${encode vault}")
             ];
             event = "VeryLazy";
 
@@ -1290,7 +1365,6 @@ let
 
     # Others
     fd # file finder
-    update-nix-fetchgit # Useful for nix stuff
 
     # Latex setup
     # texlive.combined.scheme-full # Latex stuff
@@ -1305,15 +1379,19 @@ let
 
   extraRuntimePaths = [ generatedConfig ];
 
-  extraRuntimeJoinedPaths = pkgs.symlinkJoin {
+  extraRuntimeJoinedPaths = pkgs.symlinkJoin
+    {
       name = "nixified-neovim-lua-modules";
       paths = extraRuntimePaths;
     };
 
   extraRuntime =
-    let snippets = config.satellite.dev.path "home/features/neovim/snippets";
+    let snippets = config.satellite.dev.path
+      "home/features/neovim/snippets";
     in
-    lib.concatStringsSep "," [ extraRuntimeJoinedPaths snippets ];
+    lib.concatStringsSep
+      ","
+      [ extraRuntimeJoinedPaths snippets ];
   # }}}
   # {{{ Client wrapper
   # Wraps a neovim client, providing the dependencies
@@ -1346,7 +1424,8 @@ let
     };
   # }}}
   # {{{ Clients
-  neovim = wrapClient {
+  neovim = wrapClient
+    {
       base =
         if config.satellite.toggles.neovim-nightly.enable
         then pkgs.neovim-nightly
@@ -1354,13 +1433,15 @@ let
       name = "nvim";
     };
 
-  neovide = wrapClient {
+  neovide = wrapClient
+    {
       base = pkgs.neovide;
       name = "neovide";
       extraArgs = "--set NEOVIDE_MULTIGRID true";
     };
 
-  firenvim = wrapClient {
+  firenvim = wrapClient
+    {
       base = pkgs.neovim;
       name = "firenvim";
       binName = "nvim";

modules/common/korora-neovim.nix

@@ -110,11 +110,12 @@ let
     tempestConfig = lazyType "lazy tempest config" (_: struct "tempest config"
       {
         vim = types.luaValue;
-        callback = k.union [ k.function types.luaLiteral ];
+        callback = k.union [ types.luaLiteral types.tempestConfig ];
         setup = k.attrsOf types.luaValue;
         keys = types.luaEagerOrLazy (types.oneOrMany types.tempestKey);
         autocmds = types.luaEagerOrLazy (types.oneOrMany types.tempestAutocmd);
-        mkContext = types.luaLiteral;
+        mkContext = types.luaValue;
+        cond = types.oneOrMany types.luaLiteral;
       }
       [ ]);
     # }}}
@@ -136,15 +137,14 @@ let
     let err = type.verify value; in
     lib.assertMsg (err == null) err;
 
-  mkLib = { tempestModule, languageServerModule }:
+  mkLib = { tempestModule }:
     assert hasType k.string tempestModule;
-    assert hasType k.string languageServerModule;
     rec {
       inherit (e) encode;
       # {{{ Common generation helpers 
       lua = value: assert hasType k.string value;
         { inherit value; __luaEncoderTag = "lua"; };
-      import = path: tag:
+      importFrom = path: tag:
         assert lib.isPath path;
         assert hasType k.string tag;
         lua "dofile(${encode (toString path)}).${tag}";
@@ -157,16 +157,18 @@ let
           ${context}
         )
       '';
-      customLanguageServerOnAttach = given:
+      tempestBufnr = given: context: lua ''
-        assert hasType types.tempestConfig given;
+        D.tempest.configure(
-        lua /* lua */ ''
+          ${encode given},
-          function(client, bufnr)
+          { bufnr = ${context}}
-            D.tempest.configure(${encode given}, 
+        )
-              { client = client; bufnr = bufnr; })
-
-            D.language_server.on_attach(client, bufnr)
-          end
       '';
+      keymap = mode: mapping: action: desc:
+        { inherit mode mapping action desc; };
+      nmap = mapping: action: desc:
+        { inherit mapping action desc; };
+      unmap = mapping:
+        { inherit mapping; action = "<nop>"; };
       blacklist = given:
         assert hasType (types.oneOrMany types.neovimEnv) given;
         lua /* lua */  ''
@@ -210,7 +212,6 @@ let
             local M = {}
             local D = {
               tempest = require(${encode tempestModule}),
-              langauge_server = require(${encode languageServerModule})
             }
 
             -- {{{ Pre-plugin config