Changed some LSP stuff around, not sure how successful it is. It continues to confound me

nvim/.config/nvim/lazy-lock.json

@@ -18,8 +18,8 @@
   "dracula.nvim": { "branch": "main", "commit": "9fe831e685a76e1a1898a694623b33247c4d036c" },
   "f-string-toggle.nvim": { "branch": "main", "commit": "383ca5c08ed001f7c1632ba752c14e7bb88ce6ed" },
   "feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" },
-  "friendly-snippets": { "branch": "main", "commit": "00e191fea2cfbbdd378243f35b5953296537a116" },
-  "gitsigns.nvim": { "branch": "main", "commit": "44adf808ace6cb65a3353bd61fa585a2d8fe0db3" },
+  "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" },
+  "gitsigns.nvim": { "branch": "main", "commit": "d927caa075df63bf301d92f874efb72fd22fd3b4" },
   "glow.nvim": { "branch": "main", "commit": "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5" },
   "headlines.nvim": { "branch": "master", "commit": "74a083a3c32a08be24f7dfcc6f448ecf47857f46" },
   "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
@@ -29,36 +29,36 @@
   "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" },
-  "mason.nvim": { "branch": "main", "commit": "0942198fb9a998b6ccee36fb8dd7495eb8ba659c" },
+  "mason.nvim": { "branch": "main", "commit": "ee6a7f179ebf8aa9da9d53b1cf1b57d292ea0182" },
   "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" },
   "mini.fuzzy": { "branch": "stable", "commit": "295763d73cbf580c27a4419364c47b09fc82e0f4" },
   "mini.move": { "branch": "main", "commit": "3afd39873eb9171684e554a214c055482444a47d" },
-  "mini.pairs": { "branch": "stable", "commit": "963b800d0524eadd297199207011b98684205ada" },
-  "mini.surround": { "branch": "main", "commit": "eeaf96562947f75afa51a6266e066529369ca7ef" },
+  "mini.pairs": { "branch": "stable", "commit": "dfa9f6e2576bb8853be277d96b735af59d9be7c2" },
+  "mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" },
   "mini.trailspace": { "branch": "main", "commit": "c41ab1035d184ff20c1aebd76639320c055afebe" },
   "mkdnflow.nvim": { "branch": "main", "commit": "a728a3533bb57502fdfd6fdb4e5839fc87430edc" },
   "moonfly": { "branch": "master", "commit": "1e81cbb88a34c41572fde43cd633bd6d60727274" },
-  "neorg": { "branch": "main", "commit": "064f8f65dd32f4fe728e76acfa3e4e153b121147" },
+  "neorg": { "branch": "main", "commit": "20502e50e9087248f6f8ed8d29fae9c849c1c77f" },
   "neorg-templates": { "branch": "main", "commit": "1078ced1f995cc053cdb10b51bd5e5dd5d76f78a" },
   "neoscroll.nvim": { "branch": "master", "commit": "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb" },
   "neovim": { "branch": "main", "commit": "e29002cbee4854a9c8c4b148d8a52fae3176070f" },
-  "nightfox.nvim": { "branch": "main", "commit": "a48f6d9a0273101df76eb25d2f5477baa277f935" },
+  "nightfox.nvim": { "branch": "main", "commit": "e886e39e592e89f316536a6f070365a9d88901c9" },
   "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
   "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" },
-  "nvim": { "branch": "main", "commit": "2e3e5ebcdc24ef0d5b14a0a999dbbe7936512c46" },
+  "nvim": { "branch": "main", "commit": "1c15c5e51a998c9198d63c6d2b75e9d1e4a84541" },
   "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
   "nvim-dap": { "branch": "master", "commit": "31e1ece773e10448dcb616d5144290946a6264b7" },
   "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" },
   "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "a27356f1ef9c11e1f459cc96a3fcac5c265e72d6" },
+  "nvim-lspconfig": { "branch": "master", "commit": "499314f76fa6e8f82f7cfd116578906d61ba2560" },
   "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
-  "nvim-tree.lua": { "branch": "master", "commit": "00741206c2df9c4b538055def19b99790f0c95c8" },
-  "nvim-treesitter": { "branch": "master", "commit": "691d73287a94e8ed82a383df82aabfe77ab4bcaa" },
-  "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" },
+  "nvim-tree.lua": { "branch": "master", "commit": "ec33d4befa74205e09baf8bb4f90be5be754e6ab" },
+  "nvim-treesitter": { "branch": "master", "commit": "95d02cdafe704fa5b86eac81f2eb1de3d8f52330" },
+  "nvim-web-devicons": { "branch": "master", "commit": "bc11ee2498de2310de5776477dd9dce65d03b464" },
   "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
   "sidebar.nvim": { "branch": "main", "commit": "990ce5f562c9125283ccac5473235b1a56fea6dc" },
-  "starry.nvim": { "branch": "master", "commit": "f189b1026ef11ab61185a4bb35baf72106a624de" },
+  "starry.nvim": { "branch": "master", "commit": "1373b0df5177a9c32802188befdba84502ef3073" },
   "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
   "telescope-file-browser.nvim": { "branch": "master", "commit": "ad7b637c72549713b9aaed7c4f9c79c62bcbdff0" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },

nvim/.config/nvim/lua/plugins/nvim-cmp.lua

@@ -36,7 +36,7 @@ return {
 	-- Completion settings
 	completion = {
 	  --completeopt = 'menu,menuone,noselect'
-	  keyword_length = 2
+	  keyword_length = 1
 	},
 
 	-- Key mapping
@@ -76,11 +76,10 @@ return {
 	},
 	sources = {
 	  { name = 'nvim-lsp', keyword_length = 1 },
-	  { name = 'luasnip', keyword_length=2 },
+	  { name = 'luasnip', keyword_length = 1 },
 	  { name = 'path' },
 	  { name = 'nvim_lsp_signature_help' },
-	  { name = 'buffer', keyword_length = 3 },
-	  { name = 'neorg' },
+	  { name = 'buffer', keyword_length = 1 },
 	},
 	formatting = {
 	  fields = {'menu', 'abbr', 'kind'},

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

@@ -1,51 +1,50 @@
 return {
    'neovim/nvim-lspconfig',
    config = function()
-      -- Mappings.
+      -- Setup language servers.
+      local lspconfig = require('lspconfig')
+      lspconfig.pyright.setup {}
+	-- Server-specific settings. See `:help lspconfig-setup`
+	settings = {
+	  ['pyright'] = {},
+	},
+      }
+      -- Global mappings.
       -- See `:help vim.diagnostic.*` for documentation on any of the below functions
-      local opts = { noremap=true, silent=true }
-      vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
-      vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
-      vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
-      vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
+      vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
+      vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
+      vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
+      vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist)
 
-      -- Use an on_attach function to only map the following keys
+      -- Use LspAttach autocommand to only map the following keys
       -- after the language server attaches to the current buffer
-      local on_attach = function(client, bufnr)
-	-- Enable completion triggered by <c-x><c-o>
-	vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
+      vim.api.nvim_create_autocmd('LspAttach', {
+	group = vim.api.nvim_create_augroup('UserLspConfig', {}),
+	callback = function(ev)
+	  -- Enable completion triggered by <c-x><c-o>
+	  vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
 
-	-- Mappings.
-	-- See `:help vim.lsp.*` for documentation on any of the below functions
-	local bufopts = { noremap=true, silent=true, buffer=bufnr }
-	vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
-	vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
-	vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
-	vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
-	vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
-	vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
-	vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
-	vim.keymap.set('n', '<space>wl', function()
-	  print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-	end, bufopts)
-	vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
-	vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
-	vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
-	vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
-	vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
-      end
-
-      local lsp_flags = {
-	-- This is the default in Nvim 0.7+
-	debounce_text_changes = 150,
-      }
-      require('lspconfig')['pyright'].setup{
-	  on_attach = on_attach,
-	  flags = lsp_flags,
-      }
-      require('lspconfig')['tsserver'].setup{
-	  on_attach = on_attach,
-	  flags = lsp_flags,
-      }
+	  -- Buffer local mappings.
+	  -- See `:help vim.lsp.*` for documentation on any of the below functions
+	  local opts = { buffer = ev.buf }
+	  vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
+	  vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
+	  vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
+	  vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
+	  vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
+	  vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
+	  vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
+	  vim.keymap.set('n', '<space>wl', function()
+	    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+	  end, opts)
+	  vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
+	  vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
+	  vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts)
+	  vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
+	  vim.keymap.set('n', '<space>f', function()
+	    vim.lsp.buf.format { async = true }
+	  end, opts)
+	end,
+      })
    end
 }

nvim/.config/nvim/lua/plugins/styler.lua.old

@@ -1,15 +0,0 @@
-[[--return {
-  "folke/styler.nvim",
-  config = function()
-    require("styler").setup({
-      themes = {
-        markdown = { colorscheme = "tokyonight-storm" },
-	python = { colorscheme = "dracula" },
-	html = { colorscheme = "carbonfox" },
-        help = { colorscheme = "catppuccin-mocha", background = "dark" },
-	css = { colorscheme = "carbonfox" },
-      },
-    })
-  end,
-}
---]]