More neovim config tidying

Author: notahat

config/nvim/init.lua

@@ -7,7 +7,6 @@ local colorscheme = "nordfox"
 
 -- These need to happen before plugins have loaded:
 require("options").configure()
-require("signs").configure()
 
 -- Install lazy.nvim from git if it's not already installed.
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"

config/nvim/lazy-lock.json

@@ -19,7 +19,6 @@
   "nightfox.nvim": { "branch": "main", "commit": "df75a6a94910ae47854341d6b5a6fd483192c0eb" },
   "none-ls.nvim": { "branch": "main", "commit": "8691504118b252d64fc5023a104aedd100ab754a" },
   "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" },
-  "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
   "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
   "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" },
   "nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" },

config/nvim/lua/plugins/editing.lua

@@ -1,7 +1,18 @@
 return {
+    -- Close buffers without closing the window that contains them.
+    -- https://github.com/famiu/bufdelete.nvim
     "famiu/bufdelete.nvim",
+
+    -- Handle opening file:line.
+    -- https://github.com/bogado/file-line
     "bogado/file-line",
+
+    -- https://github.com/lewis6991/gitsigns.nvim
     { "lewis6991/gitsigns.nvim", config = true },
-    { "windwp/nvim-autopairs", config = true },
+
+    -- https://github.com/windwp/nvim-autopairs
+    -- { "windwp/nvim-autopairs", config = true },
+
+    -- https://github.com/kylechui/nvim-surround
     { "kylechui/nvim-surround", config = true },
 }

config/nvim/lua/plugins/lsp/lspconfig-config.lua

@@ -19,6 +19,12 @@ return function()
         lspconfig.tsserver.setup({ capabilities = capabilities })
     end
 
+    -- Set the diagnostic signs shown in the gutter to match lualine's.
+    vim.fn.sign_define("DiagnosticSignError", { text = "󰅚 ", texthl = "DiagnosticSignError" })
+    vim.fn.sign_define("DiagnosticSignWarn", { text = "󰀪 ", texthl = "DiagnosticSignWarn" })
+    vim.fn.sign_define("DiagnosticSignInfo", { text = "󰋽 ", texthl = "DiagnosticSignInfo" })
+    vim.fn.sign_define("DiagnosticSignHint", { text = "󰌶", texthl = "DiagnosticSignHint" })
+
     -- Language servers can be configured on a per-project basis using exrc.
     -- See the .nvim.lua file in .dotfiles for an example.
 end

config/nvim/lua/plugins/navigation.lua

@@ -13,9 +13,7 @@ local neo_tree_spec = {
         bind_to_cwd = false,
         default_component_configs = {
             diagnostics = {
-                -- The neo-tree docs say these should be read from the signs we
-                -- define in signs.lua, but it doesn't seem to work so we need to
-                -- set them here.
+                -- Set the diagnostic signs to match lualine's.
                 symbols = { error = "󰅚 ", hint = "󰌶", info = "󰋽 ", warn = "󰀪 " },
             },
             indent = { with_markers = false },

config/nvim/lua/plugins/treesitter.lua

@@ -55,10 +55,7 @@ local treesitter_spec = {
 
 local refactoring_spec = {
     "ThePrimeagen/refactoring.nvim",
-    dependencies = {
-        "nvim-lua/plenary.nvim",
-        treesitter_spec,
-    },
+    dependencies = { "nvim-lua/plenary.nvim", treesitter_spec },
     config = function()
         require("refactoring").setup()
     end,