plugin/neogit: Define keymaps with lazy only

lazy-lock.json

@@ -1,44 +1,44 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "de1a287c9cb525ae52bc846e8f6207e5ef1da5ac" },
+  "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" },
   "catppuccin": { "branch": "main", "commit": "d97387aea8264f484bb5d5e74f2182a06c83e0d8" },
   "cloak.nvim": { "branch": "main", "commit": "6e5bcd50bebc5cdb7cd3a00eb3d97ab7c4cc3b94" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "crates.nvim": { "branch": "main", "commit": "d556c00d60c9421c913ee54ff690df2a34f6264e" },
-  "dressing.nvim": { "branch": "master", "commit": "572314728cb1ce012e825fd66331f52c94acac12" },
+  "dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" },
   "formatter.nvim": { "branch": "master", "commit": "ad246d34ce7a32f752071ed81b09b94e6b127fad" },
-  "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" },
+  "gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" },
   "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" },
-  "lazy.nvim": { "branch": "main", "commit": "0de782a6b0ffba599dbd332a4019d852564bf28c" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
+  "lazy.nvim": { "branch": "main", "commit": "8f19915175395680808de529e4220da8dafc0759" },
   "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "f0cd12f7a8a310c58cecebddb6b219ffad1cfd0f" },
   "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
-  "neoconf.nvim": { "branch": "main", "commit": "d321ba056f06e079da99924b948a45dfbacdfba9" },
+  "neoconf.nvim": { "branch": "main", "commit": "9092129e9a42ae26375001bd2e6118f8d57c7f2a" },
   "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
-  "neogit": { "branch": "master", "commit": "b93316d15c590377f50ca61e70e9129e4aa9b848" },
-  "noice.nvim": { "branch": "main", "commit": "9f6f6ba74f8bfbf7e43d6302cf86b070362f6203" },
+  "neogit": { "branch": "master", "commit": "daebc4bc94bdcfa69d8d75c731878bff758e16fa" },
+  "noice.nvim": { "branch": "main", "commit": "f119045f38792ad5311e5f9be7a879e4c1a95fe0" },
   "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" },
   "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
   "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
   "nvim-dap": { "branch": "master", "commit": "debd7c2f80eaf20c5f5df25db8d8c1b9b18f4421" },
   "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
-  "nvim-lspconfig": { "branch": "master", "commit": "9bda20fb967075355f253911bc066a8b5a03c77e" },
+  "nvim-lspconfig": { "branch": "master", "commit": "b972e7154bc94ab4ecdbb38c8edbccac36f83996" },
   "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
-  "nvim-treesitter": { "branch": "master", "commit": "7c9c5bed8340031f8a6dad47a58a26eaf15b9a56" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "55e29081e73d2e4b2d62fb4dc3eebe21bf66a1e2" },
+  "nvim-treesitter": { "branch": "master", "commit": "6d56c5f404d3b116bab167bc03993cfb0a83f8aa" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
-  "nvim-ufo": { "branch": "main", "commit": "4b4077850d1b3af09f4957b67144943cf3da401a" },
+  "nvim-ufo": { "branch": "main", "commit": "65dda6360879f6ffe0278163b9192a573a0d2a08" },
   "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" },
-  "oil.nvim": { "branch": "master", "commit": "06a19f77f1a1da37b675635e6f9c5b5d50bcaacd" },
-  "plenary.nvim": { "branch": "master", "commit": "b5c8de02a44ffeabff678090edd6a132ff8ab77d" },
+  "oil.nvim": { "branch": "master", "commit": "2cb39e838e9dcd8b374f09a3a87a2e5ec9d372f6" },
+  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" },
   "rainbow_csv.nvim": { "branch": "main", "commit": "5033e3abd4fb0a0ee07232530a032296535704b4" },
-  "resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" },
+  "resession.nvim": { "branch": "master", "commit": "1458d3c652d361d02a4f7fb556436d096041dd58" },
   "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" },
-  "telescope.nvim": { "branch": "0.1.x", "commit": "d829aa64059001ee7b2c8c8aa9c4e6df0b17d893" },
+  "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
   "trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" },
   "vim-wakatime": { "branch": "master", "commit": "3cb40867cb5a3120f9bef76eff88edc7f1dc1a23" },
   "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }

lua/valeth/plugins/colorschemes.lua

@@ -0,0 +1,39 @@
+local ayu_spec = {
+    "valeth/ayu-nvim",
+    branch = "fold-column-fg",
+    enabled = false,
+    lazy = false,
+    priority = 1000,
+    config = function()
+        vim.g.ayu_mirage = true
+        vim.cmd.colorscheme("ayu")
+    end
+}
+
+local catppuccin_spec = {
+    "catppuccin/nvim",
+    name = "catppuccin",
+    enabled = true,
+    lazy = false,
+    priority = 1000,
+    config = function()
+        require("catppuccin").setup({
+            transparent_background = true,
+            custom_highlights = function(colors)
+                return {
+                    Folded = { bg = colors.none },
+                    UfoFoldedEllipsis = { fg = colors.blue, bg = colors.none },
+                }
+            end,
+            integrations = {
+                notify = true,
+            }
+        })
+
+        vim.cmd.colorscheme("catppuccin")
+    end
+}
+
+return {
+    ayu_spec, catppuccin_spec
+}

lua/valeth/plugins/crates.lua

@@ -9,7 +9,7 @@ spec.dependencies = {
 }
 
 spec.config = function()
-    require("crates").setup()
+    require("crates").setup({})
 
     local cmp = require("cmp")
 

lua/valeth/plugins/fancy.lua

@@ -1,50 +0,0 @@
-return {
-    {
-        "valeth/ayu-nvim",
-        branch = "fold-column-fg",
-        enabled = false,
-        lazy = false,
-        priority = 1000,
-        config = function()
-            vim.g.ayu_mirage = true
-            vim.cmd.colorscheme("ayu")
-        end
-    },
-
-    {
-        "catppuccin/nvim",
-        name = "catppuccin",
-        enabled = true,
-        lazy = false,
-        priority = 1000,
-        config = function()
-            require("catppuccin").setup({
-                transparent_background = true,
-                custom_highlights = function(colors)
-                    return {
-                        Folded = { bg = colors.none },
-                        UfoFoldedEllipsis = { fg = colors.blue, bg = colors.none },
-                    }
-                end,
-                integrations = {
-                    notify = true,
-                }
-            })
-
-            vim.cmd.colorscheme("catppuccin")
-        end
-    },
-
-    {
-        "lukas-reineke/indent-blankline.nvim",
-        main = "ibl",
-        opts = {
-            scope = {
-                show_start = false,
-            }
-        },
-        dependencies = {
-            "nvim-treesitter/nvim-treesitter",
-        }
-    },
-}

lua/valeth/plugins/formatting.lua

@@ -19,7 +19,7 @@ end
 
 local function format_file()
     local bufnr = vim.api.nvim_get_current_buf()
-    local lsp_client = vim.lsp.get_active_clients({ bufnr = bufnr })
+    local lsp_client = vim.lsp.get_clients({ bufnr = bufnr })
 
     if #lsp_client ~= 0 then
         vim.lsp.buf.format({ async = false, timeout_ms = 5000 })

lua/valeth/plugins/indent-blankline.lua

@@ -0,0 +1,15 @@
+local spec = {
+    "lukas-reineke/indent-blankline.nvim",
+    dependencies = {
+        "nvim-treesitter/nvim-treesitter",
+    },
+    main = "ibl",
+}
+
+spec.opts = {
+    scope = {
+        show_start = false,
+    }
+}
+
+return spec

lua/valeth/plugins/lsp.lua

@@ -46,6 +46,8 @@ local function lua_ls_setup(lsp_config)
 end
 
 local function toggle_inlay_hints()
+    -- the docs suggest this, so this should be fine
+    ---@diagnostic disable-next-line: missing-parameter
     local to_enable = not vim.lsp.inlay_hint.is_enabled()
     vim.lsp.inlay_hint.enable(to_enable)
     local status = to_enable and "enabled" or "disabled"

lua/valeth/plugins/neogit.lua

@@ -7,25 +7,10 @@ spec.dependencies = {
 }
 
 spec.keys = {
-    "<Leader>vs",
-    "<Leader>vc",
+    { "<Leader>vs", "<cmd>Neogit<CR>" },
+    { "<Leader>vc", "<cmd>Neogit commit<CR>" },
 }
 
-spec.config = function()
-    local neogit = require("neogit")
-
-    local function git_status()
-        neogit.open()
-    end
-
-    local function git_commit()
-        neogit.open({ "commit" })
-    end
-
-    vim.keymap.set("n", "<Leader>vs", git_status)
-    vim.keymap.set("n", "<Leader>vc", git_commit)
-
-    neogit.setup({})
-end
+spec.config = true
 
 return spec

lua/valeth/plugins/resession.lua

@@ -36,7 +36,7 @@ spec.config = function()
         end
     })
 
-    resession.setup()
+    resession.setup({})
 end
 
 return spec

lua/valeth/plugins/treesitter.lua

@@ -8,7 +8,7 @@ spec.dependencies = {
 }
 
 spec.config = function()
-    require("nvim-treesitter.configs").setup {
+    require("nvim-treesitter.configs").setup({
         ensure_installed = {
             "rust",
             "lua",
@@ -27,7 +27,7 @@ spec.config = function()
         },
 
         endwise = { enable = true }
-    }
+    })
 
     require("treesitter-context").setup()