update lazy-lock.json

- 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"
+    ]
+}

lazy-lock.json

@@ -1,5 +1,5 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "f7c845749aba6096f041a73a26ba64f3817bab99" },
+  "LuaSnip": { "branch": "master", "commit": "bc8ec05022743d3f08bda7a76c6bb5e9a9024581" },
   "bufferline.nvim": { "branch": "main", "commit": "52d6acabb79c8c0942f8873a0ca7848eb2159267" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" },
@@ -8,24 +8,29 @@
   "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
-  "dashboard-nvim": { "branch": "master", "commit": "398ba8d9390c13c87a964cbca756319531fffdb7" },
+  "dashboard-nvim": { "branch": "master", "commit": "4c2b038c5cfa70f90506f1551e5fd2d040174e08" },
-  "fidget.nvim": { "branch": "main", "commit": "688b4fec4517650e29c3e63cfbb6e498b3112ba1" },
+  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
-  "gitsigns.nvim": { "branch": "main", "commit": "f388995990aba04cfdc7c3ab870c33e280601109" },
+  "gitsigns.nvim": { "branch": "main", "commit": "f412f51d0eaf0905a2759c8087090071689bb8fb" },
-  "kanagawa.nvim": { "branch": "master", "commit": "4c8d48726621a7f3998c7ed35b2c2535abc22def" },
+  "kanagawa.nvim": { "branch": "master", "commit": "5c4037432f0ae2d0b75d3a7b7cfa3022d7054e4d" },
-  "lazy.nvim": { "branch": "main", "commit": "8077428e63feb0f3bf795d53b23ba1695b28ab0e" },
+  "lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" },
   "lspkind-nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" },
-  "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" },
+  "lualine.nvim": { "branch": "master", "commit": "c28a7427c3fb29322db136f0564ec58807b26747" },
-  "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": "b64fdede85fd5e0b720ce722919e0a9b95ed6547" },
-  "nvim-autopairs": { "branch": "master", "commit": "6a5faeabdbcc86cfbf1561ae430a451a72126e81" },
+  "mason.nvim": { "branch": "main", "commit": "46abd3ff86c74294fed9a530ec872ec7a4680bef" },
-  "nvim-cmp": { "branch": "main", "commit": "7a3b1e76f74934b12fda82158237c6ad8bfd3d40" },
+  "null-ls.nvim": { "branch": "main", "commit": "defa0518762abb32279d601443344fb9773f9330" },
-  "nvim-lspconfig": { "branch": "master", "commit": "62856b20751b748841b0f3ec5a10b1e2f6a6dbc9" },
+  "nvim-autopairs": { "branch": "master", "commit": "0fd6519d44eac3a6736aafdb3fe9da916c3701d4" },
-  "nvim-tree.lua": { "branch": "master", "commit": "9c97e6449b0b0269bd44e1fd4857184dfa57bb4c" },
+  "nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" },
-  "nvim-treesitter": { "branch": "master", "commit": "b4d8b7e5a374b800838a13aa6829ac4d542c6f1c" },
+  "nvim-dap": { "branch": "master", "commit": "1dd02e82c77d558e30ba831db4c2e7ed534e874f" },
-  "nvim-web-devicons": { "branch": "master", "commit": "4709a504d2cd2680fb511675e64ef2790d491d36" },
+  "nvim-dap-ui": { "branch": "master", "commit": "56a2df0e96bfa64ebd6967e7cad877a1530633d5" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "8db23ea51203b5f00ad107a0cef7e0b2d7a0476c" },
+  "nvim-lspconfig": { "branch": "master", "commit": "0bc0c38e1b11dfb6b5f1794d53869f89ccf9e78f" },
+  "nvim-tree.lua": { "branch": "master", "commit": "94e3b0990017a42fa4581ea3d0bc08b897727d4d" },
+  "nvim-treesitter": { "branch": "master", "commit": "9711139326284ddb2c6f1d29783a162c08b47bb8" },
+  "nvim-web-devicons": { "branch": "master", "commit": "0568104bf8d0c3ab16395433fcc5c1638efc25d4" },
   "playground": { "branch": "master", "commit": "4044b53c4d4fcd7a78eae20b8627f78ce7dc6f56" },
   "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" },
   "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
   "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" },
-  "vimwiki": { "branch": "dev", "commit": "fea8bee382b2051b0137fd2cacf0862823ee69b3" }
+  "vimwiki": { "branch": "dev", "commit": "dec6a9ecab3e5ec9ceff28b84cabb5c62d05ee9f" }
 }

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' }
+	},
+	{
+		'theHamsta/nvim-dap-virtual-text',
+		config = true
+	}
+}

lua/plugins/lsp.lua

@@ -20,6 +20,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,11 +46,22 @@ 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
@@ -64,6 +83,10 @@ return {
 					capabilities = capabilities,
 					on_attach = lsp_attach,
 					standalone = false
+				},
+				dap = {
+					adapter = require('rust-tools.dap').get_codelldb_adapter(
+						codelldb_path, liblldb_path)
 				}
 			})
 			lspconfig.bashls.setup {
@@ -86,6 +109,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,
@@ -95,11 +122,14 @@ return {
 	},
 	{ 'simrat39/rust-tools.nvim' },
 	{ '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')
 
@@ -114,7 +144,7 @@ return {
 				mapping = cmp.mapping.preset.insert({
 					["<C-n>"] = cmp.mapping.select_next_item { behavior = cmp.SelectBehavior.Insert },
 					["<C-p>"] = cmp.mapping.select_prev_item { behavior = cmp.SelectBehavior.Insert },
-					['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
+					['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs( -4), { 'i', 'c' }),
 					['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
 					['<C-s>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
 					['<C-y>'] = cmp.mapping.confirm({
@@ -133,8 +163,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 +191,8 @@ return {
 			cmp.setup.cmdline(':', {
 				sources = cmp.config.sources({
 					{ name = 'path' }
-					}, {
+				}, {
-						{ name = 'cmdline' }
+					{ name = 'cmdline' }
 				})
 			})
 		end,
@@ -187,6 +217,17 @@ return {
 		'windwp/nvim-autopairs',
 		config = true
 	},
+	{
+		'jose-elias-alvarez/null-ls.nvim',
+		config = function()
+			local null_ls = require('null-ls')
+			local sources = {
+				null_ls.builtins.formatting.prettierd.with({
+					filetypes = { "html", "json", "yaml", "markdown" },
+					-- extra_filetypes = { "toml" }, -- find out how to install plugins / wait for mason to support them
+				}),
+			}
+			null_ls.setup({ sources = sources })
+		end
+	}
 }
---	-- Linting & formtatting
---	'jose-elias-alvarez/null-ls.nvim';

lua/plugins/navigation.lua

@@ -8,45 +8,7 @@ return {
 		'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',
@@ -55,11 +17,6 @@ return {
 						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',
@@ -42,7 +42,10 @@ return {
 			}
 		end
 	},
-	{ 'lewis6991/gitsigns.nvim' },
+	{
+		'lewis6991/gitsigns.nvim',
+		config = true
+	},
 	{
 		'glepnir/dashboard-nvim',
 		event = 'VimEnter',