refactor: ponytail audit

modules/capabilities/neovim/default.nix

@@ -1,7 +1,6 @@
 { config, ... }:
 let
   account = config.facts.account;
-  homeModules = config.flake.modules.homeManager;
 in
 {
   flake.modules.homeManager.neovim =
@@ -214,15 +213,13 @@ in
 
           kulalaCorePath = "${pkgs.kulala-core}/bin/kulala-core";
         };
-
-        binName = "nvim";
       };
     };
 
   flake.modules.homeManager.primary-editor-neovim =
     { pkgs, ... }:
     {
-      imports = [ homeModules.neovim ];
+      imports = [ config.flake.modules.homeManager.neovim ];
 
       home.sessionVariables = {
         EDITOR = "nvim";

modules/capabilities/neovim/lua-config/lua/keymaps.lua

@@ -5,8 +5,7 @@ for _, lhs in ipairs({ "grn", "gra", "grx", "grr", "gri", "grt", "gO" }) do
   vim.keymap.del("n", lhs)
 end
 vim.keymap.del("x", "gra")
-vim.keymap.del("i", "<C-S>")
-vim.keymap.del("s", "<C-S>")
+vim.keymap.del({ "i", "s" }, "<C-S>")
 
 vim.keymap.set("n", "<C-h>", "<C-w><C-h>", { desc = "Focus left window" })
 vim.keymap.set("n", "<C-j>", "<C-w><C-j>", { desc = "Focus lower window" })

modules/capabilities/neovim/lua-config/lua/plugins/completion.lua

@@ -15,7 +15,6 @@ require("lz.n").load({
     after = function()
       require("blink.cmp").setup({
         keymap = {
-          preset = "default",
           ["<C-j>"] = { "select_next", "fallback" },
           ["<C-k>"] = { "select_prev", "fallback" },
           ["<Tab>"] = { "select_and_accept", "fallback" },

modules/capabilities/neovim/lua-config/lua/plugins/editing.lua

@@ -44,7 +44,6 @@ require("lz.n").load({
     after = function()
       require("nvim-treesitter-textobjects").setup({
         select = { lookahead = true },
-        move = { set_jumps = true },
       })
 
       local select = require("nvim-treesitter-textobjects.select")

modules/capabilities/neovim/lua-config/lua/plugins/formatting.lua

@@ -34,8 +34,7 @@ require("lz.n").load({
       },
     },
     after = function()
-      local conform = require("conform")
-      conform.setup({
+      require("conform").setup({
         formatters_by_ft = formatters_by_ft,
         format_on_save = function(bufnr)
           if formatters_by_ft[vim.bo[bufnr].filetype] then

modules/capabilities/neovim/lua-config/lua/plugins/lsp.lua

@@ -16,12 +16,10 @@ require("lz.n").load({
     "nvim-lspconfig",
     event = { "BufReadPre", "BufNewFile" },
     after = function()
-      local attach_group = vim.api.nvim_create_augroup("lux-lsp-attach", { clear = true })
-      local detach_group = vim.api.nvim_create_augroup("lux-lsp-detach", { clear = true })
       local highlight_group = vim.api.nvim_create_augroup("lux-lsp-highlight", { clear = true })
 
       vim.api.nvim_create_autocmd("LspAttach", {
-        group = attach_group,
+        group = vim.api.nvim_create_augroup("lux-lsp-attach", { clear = true }),
         callback = function(args)
           local client = assert(vim.lsp.get_client_by_id(args.data.client_id))
           local bufnr = args.buf
@@ -85,7 +83,7 @@ require("lz.n").load({
       })
 
       vim.api.nvim_create_autocmd("LspDetach", {
-        group = detach_group,
+        group = vim.api.nvim_create_augroup("lux-lsp-detach", { clear = true }),
         callback = function(args)
           local supports_highlights = vim
             .iter(vim.lsp.get_clients({

modules/capabilities/neovim/lua-config/lua/plugins/navigation.lua

@@ -103,21 +103,15 @@ require("lz.n").load({
         actions.smart_send_to_qflist(prompt_bufnr)
         vim.cmd("Trouble qflist open")
       end
+      local picker_mappings = {
+        ["<C-j>"] = actions.move_selection_next,
+        ["<C-k>"] = actions.move_selection_previous,
+        ["<C-q>"] = promote,
+      }
 
       require("telescope").setup({
         defaults = {
-          mappings = {
-            i = {
-              ["<C-j>"] = actions.move_selection_next,
-              ["<C-k>"] = actions.move_selection_previous,
-              ["<C-q>"] = promote,
-            },
-            n = {
-              ["<C-j>"] = actions.move_selection_next,
-              ["<C-k>"] = actions.move_selection_previous,
-              ["<C-q>"] = promote,
-            },
-          },
+          mappings = { i = picker_mappings, n = picker_mappings },
         },
         extensions = {
           ["ui-select"] = require("telescope.themes").get_dropdown(),

modules/capabilities/neovim/lua-config/lua/plugins/ui.lua

@@ -60,29 +60,22 @@ require("lz.n").load({
           change = { text = "│" },
           delete = { text = "_" },
           topdelete = { text = "‾" },
-          changedelete = { text = "~" },
-          untracked = { text = "┆" },
         },
         on_attach = function(bufnr)
           local gs = require("gitsigns")
-          vim.keymap.set("n", "]h", function()
-            if vim.wo.diff then
-              return "]h"
-            end
-            vim.schedule(function()
-              gs.nav_hunk("next")
-            end)
-            return "<Ignore>"
-          end, { buffer = bufnr, desc = "Next git hunk", expr = true })
-          vim.keymap.set("n", "[h", function()
-            if vim.wo.diff then
-              return "[h"
-            end
-            vim.schedule(function()
-              gs.nav_hunk("prev")
-            end)
-            return "<Ignore>"
-          end, { buffer = bufnr, desc = "Previous git hunk", expr = true })
+          local map_hunk = function(lhs, direction, desc)
+            vim.keymap.set("n", lhs, function()
+              if vim.wo.diff then
+                return lhs
+              end
+              vim.schedule(function()
+                gs.nav_hunk(direction)
+              end)
+              return "<Ignore>"
+            end, { buffer = bufnr, desc = desc, expr = true })
+          end
+          map_hunk("]h", "next", "Next git hunk")
+          map_hunk("[h", "prev", "Previous git hunk")
         end,
       })
     end,