Use telescope to display references, diagnostics and code actions

dap (need to properly configure dap anyway)

remove nvim-tree
remove goyo and limelight commands and keymaps

init.lua

@@ -29,7 +29,7 @@ vim.opt.incsearch = true
 vim.opt.scrolloff = 12
 vim.opt.sidescrolloff = 8
 vim.opt.mouse = 'a'
-vim.opt.autochdir = true
+vim.opt.autochdir = false
 vim.opt.clipboard = 'unnamed,unnamedplus'
 vim.opt.number = true
 vim.opt.wrap = false

lazy-lock.json

@@ -1,6 +1,6 @@
 {
   "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
-  "bufferline.nvim": { "branch": "main", "commit": "5c528bee3dd797d5bd6bae5f229411939b25b203" },
+  "bufferline.nvim": { "branch": "main", "commit": "2e3c8cc5a57ddd32f1edd2ffd2ccb10c09421f6c" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
@@ -8,30 +8,31 @@
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "dashboard-nvim": { "branch": "master", "commit": "d2c5a4d1341f5ca1ed2ecb4ecfcff2bc8ea18b14" },
+  "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" },
-  "fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" },
+  "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
-  "gitsigns.nvim": { "branch": "main", "commit": "7c27a30450130cd59c4994a6755e3c5d74d83e76" },
+  "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" },
-  "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" },
+  "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" },
-  "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
+  "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
-  "lspkind-nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" },
+  "lspkind-nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" },
   "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
   "lunar.nvim": { "branch": "master", "commit": "08bbc93b96ad698d22fc2aa01805786bcedc34b9" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
+  "nvim-autopairs": { "branch": "master", "commit": "48ca9aaee733911424646cb1605f27bc01dedbe3" },
-  "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" },
+  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
-  "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" },
+  "nvim-dap": { "branch": "master", "commit": "2b428ff2632e73295e9decbcf1c40d8e26213305" },
-  "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
+  "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "52638640ae309cacdaff785fdbb854437bd1ee5c" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" },
-  "nvim-lspconfig": { "branch": "master", "commit": "54617a18f4cf46f0c2f6d024fa6feb7515fe036d" },
+  "nvim-jdtls": { "branch": "master", "commit": "99e4b2081de1d9162666cc7b563cbeb01c26b66b" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a67bc39aaa4f1e13212c5022a561120846eaef27" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
-  "nvim-tree.lua": { "branch": "master", "commit": "120ba58254835d412bbc91cffe847e9be835fadd" },
+  "nvim-treesitter": { "branch": "master", "commit": "047ce49ccf9a2dce22e1cf3843bef3b5682a8144" },
-  "nvim-treesitter": { "branch": "master", "commit": "f9e9370a6f710148f4a3f3f4f23d5349c85c2888" },
+  "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },
-  "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
   "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
-  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
-  "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" },
+  "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" },
+  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" },
+  "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
-  "vimwiki": { "branch": "dev", "commit": "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8" }
+  "vimwiki": { "branch": "dev", "commit": "705ad1e0dded0e3b7ff5fac78547ab67c9d39bdf" }
 }

lua/commands.lua

@@ -1,8 +1,5 @@
 -- commands.lua
 
-vim.cmd 'autocmd! User GoyoEnter Limelight'
-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'
@@ -10,3 +7,31 @@ 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!'
+
+-- Array of file names indicating root directory. Modify to your liking.
+local root_names = { '.git', 'Makefile' }
+
+-- Cache to use for speed up (at cost of possibly outdated results)
+local root_cache = {}
+
+local set_root = function()
+	-- Get directory path to start search from
+	local path = vim.api.nvim_buf_get_name(0)
+	if path == '' then return end
+	path = vim.fs.dirname(path)
+
+	-- Try cache and resort to searching upward for root directory
+	local root = root_cache[path]
+	if root == nil then
+		local root_file = vim.fs.find(root_names, { path = path, upward = true })[1]
+		if root_file == nil then return end
+		root = vim.fs.dirname(root_file)
+		root_cache[path] = root
+	end
+
+	-- Set current directory
+	vim.fn.chdir(root)
+end
+
+local root_augroup = vim.api.nvim_create_augroup('MyAutoRoot', {})
+vim.api.nvim_create_autocmd('BufEnter', { group = root_augroup, callback = set_root })

lua/maps.lua

@@ -8,10 +8,6 @@ local function map(mode, lhs, rhs, opts)
 	vim.api.nvim_set_keymap(mode, lhs, rhs, options)
 end
 
-function maps.toggleGoyo()
-	map('n', '<C-g>', ':Goyo<Enter>', { noremap = false })
-end
-
 function maps.term()
 	-- Open and move to resized terminal
 	map('n', '<leader>t', '<C-w>s<C-w>j :terminal<CR>:res 5<CR>i', { noremap = false })
@@ -45,10 +41,10 @@ end
 function maps.init()
 	vim.g.mapleader = " "
 
-	map('n', '<leader>b', '<cmd>NvimTreeToggle<CR>')
+	-- map('n', '<leader>b', '<cmd>NvimTreeToggle<CR>')
+	map('n', '<leader>b', '<cmd>Lexplore | vert res 30<CR>')
 	map('n', '<leader>cc', '<cmd>Telescope colorscheme<CR>')
 
-	maps.toggleGoyo()
 	maps.term()
 	maps.telescope()
 	maps.fixIndent()

lua/plugins/lsp.lua

@@ -1,16 +1,21 @@
-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)
-
 local lsp_attach = function(client, buf)
 	vim.api.nvim_buf_set_option(buf, "formatexpr", "v:lua.vim.lsp.formatexpr()")
 	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)
+	vim.lsp.inlay_hint.enable(true, nil)
+
+	local opts = { noremap = true, silent = true }
+	vim.keymap.set('n', '<S-C-e>', require("telescope.builtin").diagnostics, opts)
+
 
 	local bufopts = { noremap = true, silent = true, buffer = buf }
+
+	vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, bufopts)
+	vim.keymap.set('n', '<C-e>', require("telescope.builtin").diagnostics, bufopts)
+	vim.keymap.set('n', '<C-ü>d', vim.diagnostic.goto_prev, bufopts)
+	vim.keymap.set('n', '<C-¨>d', vim.diagnostic.goto_next, bufopts)
+
 	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)
@@ -19,7 +24,7 @@ local lsp_attach = function(client, buf)
 	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', 'gr', require("telescope.builtin").lsp_references, bufopts)
 end
 
 local mason_path = vim.fn.glob(vim.fn.stdpath "data" .. "/mason/packages/codelldb/extension/")
@@ -68,7 +73,7 @@ return {
 				},
 				on_attach = lsp_attach
 			}
-			lspconfig.ts_ls.setup {
+			lspconfig.tsserver.setup {
 				capabilities = capabilities,
 				on_attach = lsp_attach
 			}
@@ -104,6 +109,10 @@ return {
 				capabilities = capabilities,
 				on_attach = lsp_attach
 			})
+			lspconfig.julials.setup({
+				capabilities = capabilities,
+				on_attach = lsp_attach
+			})
 			capabilities.textDocument.completion.completionItem.snippetSupport = true
 			lspconfig.emmet_ls.setup({
 				capabilities = capabilities,
@@ -113,7 +122,8 @@ return {
 	},
 	{
 		'mrcjkb/rustaceanvim',
-		version = "^3",
+		version = "^4",
+		lazy = false,
 		ft = { "rust" },
 		config = function()
 			vim.g.rustaceanvim = {
@@ -151,6 +161,135 @@ return {
 			}
 		end
 	},
+	{
+		'mfussenegger/nvim-jdtls',
+		ft = { "java" },
+		config = function()
+			local home = os.getenv('HOME')
+			local jdtls = require('jdtls')
+			local capabilities = require('cmp_nvim_lsp').default_capabilities()
+			local root_markers = { 'gradlew', 'mvnw', 'git' }
+			local root_dir = require('jdtls.setup').find_root(root_markers)
+			local workspace_folder = home .. "/.local/share/eclipse/" .. vim.fn.fnamemodify(root_dir, ":p:h:t")
+			local config = {
+				flags = {
+					debounce_text_changes = 80,
+				},
+				capabilities = capabilities,
+				on_attach = lsp_attach, -- We pass our on_attach keybindings to the configuration map
+				root_dir = root_dir, -- Set the root directory to our found root_marker
+				-- here you can configure eclipse.jdt.ls specific settings
+				-- these are defined by the eclipse.jdt.ls project and will be passed to eclipse when starting.
+				-- see https://github.com/eclipse/eclipse.jdt.ls/wiki/running-the-java-ls-server-from-the-command-line#initialize-request
+				-- for a list of options
+				settings = {
+					java = {
+						format = {
+							settings = {
+								-- use google java style guidelines for formatting
+								-- to use, make sure to download the file from https://github.com/google/styleguide/blob/gh-pages/eclipse-java-google-style.xml
+								-- and place it in the ~/.local/share/eclipse directory
+								-- url = "/.local/share/eclipse/eclipse-java-google-style.xml",
+								-- profile = "googlestyle",
+							},
+						},
+						signaturehelp = { enabled = true },
+						contentprovider = { preferred = 'fernflower' }, -- use fernflower to decompile library code
+						-- specify any completion options
+						completion = {
+							favoritestaticmembers = {
+								-- "org.hamcrest.matcherassert.assertthat",
+								-- "org.hamcrest.matchers.*",
+								-- "org.hamcrest.corematchers.*",
+								-- "org.junit.jupiter.api.assertions.*",
+								-- "java.util.objects.requirenonnull",
+								-- "java.util.objects.requirenonnullelse",
+								-- "org.mockito.mockito.*"
+							},
+							filteredtypes = {
+								-- "com.sun.*",
+								-- "io.micrometer.shaded.*",
+								-- "java.awt.*",
+								-- "jdk.*", "sun.*",
+							},
+						},
+						-- specify any options for organizing imports
+						sources = {
+							organizeimports = {
+								starthreshold = 9999,
+								staticstarthreshold = 9999,
+							},
+						},
+						-- how code generation should act
+						codegeneration = {
+							tostring = {
+								template = "${object.classname}{${member.name()}=${member.value}, ${othermembers}}"
+							},
+							hashcodeequals = {
+								usejava7objects = true,
+							},
+							useblocks = true,
+						},
+						-- if you are developing in projects with different java versions, you need
+						-- to tell eclipse.jdt.ls to use the location of the jdk for your java version
+						-- see https://github.com/eclipse/eclipse.jdt.ls/wiki/running-the-java-ls-server-from-the-command-line#initialize-request
+						-- and search for `interface runtimeoption`
+						-- the `name` is not arbitrary, but must match one of the elements from `enum executionenvironment` in the link above
+						configuration = {
+							runtimes = {
+								{
+									name = "JavaSE-17",
+									path = home .. "/.local/share/asdf/installs/java/oracle-17.0.11/",
+								},
+								{
+									name = "JavaSE-21",
+									path = home .. "/.local/share/asdf/installs/java/oracle-21.0.2/",
+								},
+								{
+									name = "JavaSE-1.8",
+									path = home .. "/.local/share/asdf/installs/java/adoptopenjdk-8.0.412+8/"
+								},
+							}
+						}
+					}
+				},
+				-- cmd is the command that starts the language server. whatever is placed
+				-- here is what is passed to the command line to execute jdtls.
+				-- note that eclipse.jdt.ls must be started with a java version of 17 or higher
+				-- see: https://github.com/eclipse/eclipse.jdt.ls#running-from-the-command-line
+				-- for the full list of options
+				cmd = {
+					home .. "/.local/share/asdf/installs/java/oracle-21.0.2/bin/java",
+					'-Declipse.application=org.eclipse.jdt.ls.core.id1',
+					'-Dosgi.bundles.defaultstartlevel=4',
+					'-Declipse.product=org.eclipse.jdt.ls.core.product',
+					'-Dlog.protocol=true',
+					'-Dlog.level=all',
+					'-Xmx4G',
+					'--add-modules=ALL-SYSTEM',
+					'--add-opens', 'java.base/java.util=ALL-UNNAMED',
+					'--add-opens', 'java.base/java.lang=ALL-UNNAMED',
+					-- if you use lombok, download the lombok jar and place it in ~/.local/share/eclipse
+					'-javaagent:' .. home .. '/.local/share/nvim/mason/packages/jdtls/lombok.jar',
+
+					-- the jar file is located where jdtls was installed. this will need to be updated
+					-- to the location where you installed jdtls
+					'-jar', vim.fn.glob(
+					home ..
+					'/.local/share/nvim/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_*.jar'),
+
+					-- the configuration for jdtls is also placed where jdtls was installed. this will
+					-- need to be updated depending on your environment
+					'-configuration', home .. '/.local/share/nvim/mason/packages/jdtls/config_linux',
+
+					-- use the workspace_folder defined above to store data for this project
+					'-data', workspace_folder,
+				},
+			}
+
+			jdtls.start_or_attach(config)
+		end
+	},
 	{ 'onsails/lspkind-nvim' }, -- pictograms replace (?) with lspsaga
 	{
 		'j-hui/fidget.nvim',

lua/plugins/navigation.lua

@@ -3,17 +3,38 @@ return {
 		'nvim-telescope/telescope.nvim',
 		version = '0.1.*',
 		dependencies = { 'nvim-lua/plenary.nvim' },
+		config = function()
+			local opts = { noremap = true, silent = true }
+			vim.keymap.set("n", "<leader>gh", require("telescope.builtin").git_bcommits, opts)
+			vim.keymap.set("n", "<leader>gb", require("telescope.builtin").git_branches, opts)
+			vim.keymap.set("n", "<leader>gs", require("telescope.builtin").git_status, opts)
+		end
 	},
 	{
-		'nvim-tree/nvim-tree.lua',
+		'nvim-telescope/telescope-ui-select.nvim',
+		dependencies = { 'nvim-telescope/telescope.nvim' },
 		config = function()
-			require('nvim-tree').setup {
+			require("telescope").setup {
-				view = {
+				extensions = {
-					width = 30,
+					["ui-select"] = {
-					side = 'left',
+						require("telescope.themes").get_dropdown()
-				},
+					}
+				}
 			}
-		end,
+			require("telescope").load_extension("ui-select")
-		dependencies = { 'nvim-tree/nvim-web-devicons' }
+		end
 	}
+	-- Don't really need it. Nicer than the default but that's it
+	-- {
+	-- 	'nvim-tree/nvim-tree.lua',
+	-- 	config = function()
+	-- 		require('nvim-tree').setup {
+	-- 			view = {
+	-- 				width = 30,
+	-- 				side = 'left',
+	-- 			},
+	-- 		}
+	-- 	end,
+	-- 	dependencies = { 'nvim-tree/nvim-web-devicons' }
+	-- }
 }

lua/plugins/style.lua

@@ -3,9 +3,22 @@ return {
 		'rebelot/kanagawa.nvim',
 		config = function()
 			vim.opt.guifont = 'Source Code Pro for Powerline'
-			vim.cmd('colorscheme kanagawa')
 			vim.cmd('set termguicolors')
 			vim.opt.syntax = 'on'
+			require('kanagawa').setup({
+				colors = {
+					palette = {
+						lotusGray = "#F8F7F4",
+						lotusWhite0 = "#FBFBF9",
+						lotusWhite1 = "#F2F0E9",
+						lotusWhite2 = "#F8F7F2",
+						lotusWhite3 = "#F6F6F1",
+						lotusWhite4 = "#F4F1E6",
+						lotusWhite5 = "#FcFBF9",
+					}
+				}
+			})
+			vim.cmd('colorscheme kanagawa-lotus')
 		end
 	},
 	{ 'lunarvim/lunar.nvim' },