Update config: tsserver -> ts_ls, add nvim-nio as dap-ui dep

- Make lua aware of vim runtime
- enable prettier for json, html, css, yaml, markdown
- gitsigns was not enabled

.luarc.json

@@ -0,0 +1,19 @@
+{
+    "workspace.library": [
+        "/Users/fschmidt/.config/nvim",
+        "/Users/fschmidt/.local/share/nvim/lazy/lazy.nvim",
+        "/Users/fschmidt/.local/share/nvim/lazy/cmp-nvim-lsp",
+        "/Users/fschmidt/.local/share/nvim/lazy/nvim-lspconfig",
+        "/Users/fschmidt/.local/share/nvim/lazy/mason.nvim",
+        "/Users/fschmidt/.local/share/nvim/lazy/mason-lspconfig.nvim",
+        "/Users/fschmidt/.local/share/nvim/lazy/nvim-web-devicons",
+        "/Users/fschmidt/.local/share/nvim/lazy/nvim-tree.lua",
+        "/Users/fschmidt/.local/share/nvim/lazy/null-ls.nvim",
+        "/Users/fschmidt/.local/share/nvim/lazy/lualine.nvim",
+        "/usr/local/Cellar/neovim/0.8.3/share/nvim/runtime",
+        "/usr/local/Cellar/neovim/0.8.3/lib/nvim",
+        "/Users/fschmidt/.local/state/nvim/lazy/readme",
+        "/Users/fschmidt/.local/share/nvim/lazy/cmp-nvim-lsp/after",
+        "${3rd}/luassert/library"
+    ]
+}

init.lua

@@ -17,7 +17,7 @@ require("maps").init()
 require("commands")
 
 vim.opt.backup = false
-vim.opt.undodir = '/Users/fschmidt/.cache/nvim/undodir'
+vim.opt.undodir = os.getenv("HOME") .. '/.cache/nvim/undodir'
 vim.opt.swapfile = false
 vim.opt.undofile = true
 vim.opt.smartcase = true

lazy-lock.json

@@ -1,31 +1,37 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "f7c845749aba6096f041a73a26ba64f3817bab99" },
+  "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
-  "bufferline.nvim": { "branch": "main", "commit": "52d6acabb79c8c0942f8873a0ca7848eb2159267" },
+  "bufferline.nvim": { "branch": "main", "commit": "5c528bee3dd797d5bd6bae5f229411939b25b203" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" },
+  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
-  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
+  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
-  "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" },
+  "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
+  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "dashboard-nvim": { "branch": "master", "commit": "398ba8d9390c13c87a964cbca756319531fffdb7" },
+  "dashboard-nvim": { "branch": "master", "commit": "d2c5a4d1341f5ca1ed2ecb4ecfcff2bc8ea18b14" },
-  "fidget.nvim": { "branch": "main", "commit": "688b4fec4517650e29c3e63cfbb6e498b3112ba1" },
+  "fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" },
-  "gitsigns.nvim": { "branch": "main", "commit": "f388995990aba04cfdc7c3ab870c33e280601109" },
+  "gitsigns.nvim": { "branch": "main", "commit": "7c27a30450130cd59c4994a6755e3c5d74d83e76" },
-  "kanagawa.nvim": { "branch": "master", "commit": "4c8d48726621a7f3998c7ed35b2c2535abc22def" },
+  "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" },
-  "lazy.nvim": { "branch": "main", "commit": "8077428e63feb0f3bf795d53b23ba1695b28ab0e" },
+  "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
-  "lspkind-nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" },
+  "lspkind-nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" },
-  "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" },
+  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "3f9c0ea157e88b08e2d11ec65002eeb6e421f0da" },
+  "lunar.nvim": { "branch": "master", "commit": "08bbc93b96ad698d22fc2aa01805786bcedc34b9" },
-  "mason.nvim": { "branch": "main", "commit": "63cff223169324a2e633954ac580c7c327182a97" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
-  "nvim-autopairs": { "branch": "master", "commit": "6a5faeabdbcc86cfbf1561ae430a451a72126e81" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "nvim-cmp": { "branch": "main", "commit": "7a3b1e76f74934b12fda82158237c6ad8bfd3d40" },
+  "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
-  "nvim-lspconfig": { "branch": "master", "commit": "62856b20751b748841b0f3ec5a10b1e2f6a6dbc9" },
+  "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" },
-  "nvim-tree.lua": { "branch": "master", "commit": "9c97e6449b0b0269bd44e1fd4857184dfa57bb4c" },
+  "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" },
-  "nvim-treesitter": { "branch": "master", "commit": "b4d8b7e5a374b800838a13aa6829ac4d542c6f1c" },
+  "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
-  "nvim-web-devicons": { "branch": "master", "commit": "4709a504d2cd2680fb511675e64ef2790d491d36" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "52638640ae309cacdaff785fdbb854437bd1ee5c" },
-  "playground": { "branch": "master", "commit": "4044b53c4d4fcd7a78eae20b8627f78ce7dc6f56" },
+  "nvim-lspconfig": { "branch": "master", "commit": "54617a18f4cf46f0c2f6d024fa6feb7515fe036d" },
-  "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" },
+  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
-  "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
+  "nvim-tree.lua": { "branch": "master", "commit": "120ba58254835d412bbc91cffe847e9be835fadd" },
-  "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" },
+  "nvim-treesitter": { "branch": "master", "commit": "f9e9370a6f710148f4a3f3f4f23d5349c85c2888" },
-  "vimwiki": { "branch": "dev", "commit": "fea8bee382b2051b0137fd2cacf0862823ee69b3" }
+  "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
-}
+  "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" },
+  "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+  "trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" },
+  "vimwiki": { "branch": "dev", "commit": "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8" }
+}

lua/commands.lua

@@ -5,6 +5,8 @@ vim.cmd 'autocmd! User GoyoLeave Limelight!'
 
 vim.cmd 'autocmd BufRead,BufNewFile *.wiki,*.md,*.tex set wrap'
 
+vim.cmd 'au BufRead,BufNewFile *.kdl set filetype=kdl'
+
 vim.cmd [[autocmd BufWritePre * lua vim.lsp.buf.format()]]
 
 vim.cmd 'command W :execute \':silent w !sudo tee % > /dev/null\' | :edit!'

lua/plugins/dap.lua

@@ -0,0 +1,17 @@
+return {
+	{
+		'mfussenegger/nvim-dap',
+		dependencies = { 'nvim-lua/plenary.nvim' }
+	},
+	{
+		'rcarriga/nvim-dap-ui',
+		config = function()
+			require("dapui").setup()
+		end,
+		dependencies = { 'mfussenegger/nvim-dap', 'nvim-neotest/nvim-nio' }
+	},
+	{
+		'theHamsta/nvim-dap-virtual-text',
+		config = true
+	}
+}

lua/plugins/lsp.lua

@@ -8,6 +8,8 @@ local lsp_attach = function(client, buf)
 	vim.api.nvim_buf_set_option(buf, "omnifunc", "v:lua.vim.lsp.omnifunc")
 	vim.api.nvim_buf_set_option(buf, "tagfunc", "v:lua.vim.lsp.tagfunc")
 
+	vim.lsp.inlay_hint.enable(buf, true)
+
 	local bufopts = { noremap = true, silent = true, buffer = buf }
 	vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
 	vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
@@ -20,6 +22,14 @@ local lsp_attach = function(client, buf)
 	vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
 end
 
+local mason_path = vim.fn.glob(vim.fn.stdpath "data" .. "/mason/packages/codelldb/extension/")
+local codelldb_path = mason_path .. "adapter/codelldb"
+local liblldb_path = mason_path .. "lldb/lib/liblldb.so"
+
+if vim.fn.has "mac" == 1 then
+	liblldb_path = mason_path .. "lldb/lib/liblldb.dylib"
+end
+
 return {
 	-- lsp
 	{
@@ -38,16 +48,27 @@ return {
 
 			lspconfig.lua_ls.setup {
 				capabilities = capabilities,
+				root_dir = lspconfig.util.root_pattern('.git'),
 				settings = {
 					Lua = {
+						runtime = {
+							-- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
+							version = 'LuaJIT',
+						},
 						diagnostics = {
+							-- Get the language server to recognize the `vim` global
 							globals = { 'vim' }
-						}
+						},
+						workspace = {
+							-- Make the server aware of Neovim runtime files
+							library = vim.api.nvim_get_runtime_file("", true),
+							checkThirdParty = false,
+						},
 					}
 				},
 				on_attach = lsp_attach
 			}
-			lspconfig.tsserver.setup {
+			lspconfig.ts_ls.setup {
 				capabilities = capabilities,
 				on_attach = lsp_attach
 			}
@@ -59,13 +80,6 @@ return {
 			--	capabilities = capabilities,
 			--	on_attach = lsp_attach
 			--}
-			require("rust-tools").setup({
-				server = {
-					capabilities = capabilities,
-					on_attach = lsp_attach,
-					standalone = false
-				}
-			})
 			lspconfig.bashls.setup {
 				capabilities = capabilities,
 				on_attach = lsp_attach
@@ -86,6 +100,10 @@ return {
 				capabilities = capabilities,
 				on_attach = lsp_attach
 			})
+			lspconfig.phpactor.setup({
+				capabilities = capabilities,
+				on_attach = lsp_attach
+			})
 			capabilities.textDocument.completion.completionItem.snippetSupport = true
 			lspconfig.emmet_ls.setup({
 				capabilities = capabilities,
@@ -93,13 +111,55 @@ return {
 			})
 		end
 	},
-	{ 'simrat39/rust-tools.nvim' },
+	{
+		'mrcjkb/rustaceanvim',
+		version = "^3",
+		ft = { "rust" },
+		config = function()
+			vim.g.rustaceanvim = {
+				server = {
+					on_attach = lsp_attach,
+					settings = {
+						-- rust-analyzer language server configuration
+						["rust-analyzer"] = {
+							rustfmt = {
+								extraArgs = { "+nightly" },
+							},
+							cargo = {
+								allFeatures = true,
+								loadOutDirsFromCheck = true,
+								runBuildScripts = true,
+							},
+							-- Add clippy lints for Rust.
+							checkOnSave = {
+								allFeatures = true,
+								command = "clippy",
+								extraArgs = { "--no-deps" },
+							},
+							-- TODO this breaks diagnostics, look into what can be done
+							-- procMacro = {
+							-- 	enable = true,
+							-- 	ignored = {
+							-- 		["async-trait"] = { "async_trait" },
+							-- 		["napi-derive"] = { "napi" },
+							-- 		["async-recursion"] = { "async_recursion" },
+							-- 	},
+							-- },
+						},
+					},
+				}
+			}
+		end
+	},
 	{ 'onsails/lspkind-nvim' }, -- pictograms replace (?) with lspsaga
-	{ 'j-hui/fidget.nvim' }, -- show lsp status
+	{
+		'j-hui/fidget.nvim',
+		config = true
+	}, -- show lsp status
 	-- completion
 	{
 		'hrsh7th/nvim-cmp',
-		config = function() 
+		config = function()
 			local cmp = require('cmp')
 			local lspkind = require('lspkind')
 
@@ -133,8 +193,8 @@ return {
 					{ name = 'path' },
 					{ name = 'luasnip' },
 					{ name = 'nvim_lsp_signature_help' },
-					}, {
+				}, {
-						{ name = 'buffer', keyword_length = 5 },
+					{ name = 'buffer', keyword_length = 5 },
 				}),
 				formatting = {
 					format = lspkind.cmp_format {
@@ -161,8 +221,8 @@ return {
 			cmp.setup.cmdline(':', {
 				sources = cmp.config.sources({
 					{ name = 'path' }
-					}, {
+				}, {
-						{ name = 'cmdline' }
+					{ name = 'cmdline' }
 				})
 			})
 		end,
@@ -179,6 +239,8 @@ return {
 	},
 	{
 		'L3MON4D3/LuaSnip',
+		version = "v2.*",
+		build = "make install_jsregexp",
 		config = function()
 			require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/snippets/" })
 		end
@@ -187,6 +249,13 @@ return {
 		'windwp/nvim-autopairs',
 		config = true
 	},
+	{
+		"folke/trouble.nvim",
+		dependencies = { "nvim-tree/nvim-web-devicons" },
+		opts = {
+			-- your configuration comes here
+			-- or leave it empty to use the default settings
+			-- refer to the configuration section below
+		},
+	},
 }
---	-- Linting & formtatting
---	'jose-elias-alvarez/null-ls.nvim';

lua/plugins/navigation.lua

@@ -1,65 +1,17 @@
 return {
 	{
 		'nvim-telescope/telescope.nvim',
-		tag = '0.1.1',
+		version = '0.1.*',
 		dependencies = { 'nvim-lua/plenary.nvim' },
 	},
 	{
 		'nvim-tree/nvim-tree.lua',
 		config = function()
 			require('nvim-tree').setup {
-				disable_netrw       = true,
+				view = {
-				hijack_netrw        = true,
-				open_on_setup       = false,
-				ignore_ft_on_setup  = {},
-				open_on_tab         = false,
-				hijack_cursor       = false,
-				update_cwd          = true,
-				hijack_directories  = {
-					enable = true,
-					auto_open = true,
-				},
-				diagnostics         = {
-					enable = false,
-					icons = {
-						hint = "",
-						info = "",
-						warning = "",
-						error = "",
-					}
-				},
-				update_focused_file = {
-					enable      = false,
-					update_cwd  = false,
-					ignore_list = {}
-				},
-				system_open         = {
-					cmd  = nil,
-					args = {}
-				},
-				filters             = {
-					dotfiles = false,
-					custom = {}
-				},
-				git                 = {
-					enable = true,
-					ignore = true,
-					timeout = 500,
-				},
-				view                = {
 					width = 30,
-					hide_root_folder = false,
 					side = 'left',
-					mappings = {
-						custom_only = false,
-						list = {}
-					}
 				},
-				actions             = {
-					open_file = {
-						resize_window = false
-					}
-				}
 			}
 		end,
 		dependencies = { 'nvim-tree/nvim-web-devicons' }

lua/plugins/style.lua

@@ -3,12 +3,12 @@ return {
 		'rebelot/kanagawa.nvim',
 		config = function()
 			vim.opt.guifont = 'Source Code Pro for Powerline'
-			vim.g.limelight_conceal_ctermfg = 'gray'
 			vim.cmd('colorscheme kanagawa')
 			vim.cmd('set termguicolors')
 			vim.opt.syntax = 'on'
 		end
 	},
+	{ 'lunarvim/lunar.nvim' },
 	{
 		'nvim-treesitter/nvim-treesitter',
 		build = ':TSUpdate',
@@ -28,7 +28,7 @@ return {
 	},
 	{
 		'akinsho/bufferline.nvim',
-		tag = "v3.3.0",
+		version = "*",
 		config = true,
 		dependencies = { 'nvim-tree/nvim-web-devicons' }
 	},
@@ -42,7 +42,10 @@ return {
 			}
 		end
 	},
-	{ 'lewis6991/gitsigns.nvim' },
+	{
+		'lewis6991/gitsigns.nvim',
+		config = true
+	},
 	{
 		'glepnir/dashboard-nvim',
 		event = 'VimEnter',