c82dd5bf02acf75923f453e4250acca68fe60d37

Author
TheEdgeOfRage <git@theedgeofrage.com>
Committer
TheEdgeOfRage <git@theedgeofrage.com>
Date

Message

Fix neovim diagnostic window

Diff

  1diff --git a/dot_config/nvim/lua/mappings.lua b/dot_config/nvim/lua/mappings.lua
  2index 36f14df7025685f80bdbb90d85b9e3a5599d7c0a..9e6b6cc822291fcd1bf0624b77496f3b510467d9 100644
  3--- a/dot_config/nvim/lua/mappings.lua
  4+++ b/dot_config/nvim/lua/mappings.lua
  5@@ -107,7 +107,9 @@ vim.keymap.set("n", "<leader>ei", telescope.diagnostics, opts)
  6 
  7 vim.keymap.set("n", "<leader>vc", vim.lsp.buf.code_action, opts)
  8 vim.keymap.set("n", "<leader>vr", vim.lsp.buf.rename, opts)
  9-vim.keymap.set("n", "E", vim.lsp.buf.hover, opts)
 10+vim.keymap.set("n", "E", function()
 11+	vim.lsp.buf.hover({ border = "rounded" })
 12+end, opts)
 13 vim.keymap.set("i", "<C-h>", vim.lsp.buf.signature_help, opts)
 14 vim.keymap.set("n", "<C-h>", vim.lsp.buf.signature_help, opts)
 15 vim.keymap.set("n", "<leader>en", function()
 16diff --git a/dot_config/nvim/lua/plugins/lsp.lua b/dot_config/nvim/lua/plugins/lsp.lua
 17index 6e81246ae14699e331abaaa406fd3188c4a71fa0..6b1618ea3864cb1ee30055e3dbb383f195cc5a2a 100644
 18--- a/dot_config/nvim/lua/plugins/lsp.lua
 19+++ b/dot_config/nvim/lua/plugins/lsp.lua
 20@@ -24,12 +24,6 @@ return {
 21 					),
 22 				},
 23 			}
 24-			local efm_languages = {
 25-				typescript = { prettier },
 26-				javascript = { prettier },
 27-				json = { prettier },
 28-				markdown = { prettier },
 29-			}
 30 			local servers = {
 31 				golangci_lint_ls = {
 32 					root_dir = require("lspconfig.util").root_pattern(
 33@@ -50,6 +44,7 @@ return {
 34 						gopls = {
 35 							gofumpt = true,
 36 							staticcheck = true,
 37+							-- buildFlags = { "-tags=duckdb_arrow" },
 38 							hints = {
 39 								assignVariableTypes = false,
 40 								compositeLiteralFields = false,
 41@@ -86,20 +81,6 @@ return {
 42 						},
 43 					},
 44 				},
 45-				efm = {
 46-					cmd = { "/home/pavle/.local/share/nvim/mason/bin/efm-langserver" },
 47-					init_options = { documentFormatting = true },
 48-					root_dir = vim.uv.cwd,
 49-					filetypes = vim.tbl_keys(efm_languages),
 50-					settings = {
 51-						rootMarkers = { ".git/", ".prettierignore" },
 52-						lintDebounce = 100,
 53-						logLevel = 5,
 54-						logFile = "/home/pavle/.local/state/nvim/efm.log",
 55-						languages = efm_languages,
 56-					},
 57-					single_file_support = true,
 58-				},
 59 				eslint = {},
 60 				ts_ls = {},
 61 				prismals = {},
 62@@ -119,6 +100,26 @@ return {
 63 				vim.lsp.enable(server)
 64 				vim.lsp.config(server, config)
 65 			end
 66+
 67+			local efm_languages = {
 68+				typescript = { prettier },
 69+				javascript = { prettier },
 70+				json = { prettier },
 71+				markdown = { prettier },
 72+			}
 73+			require("lspconfig").efm.setup({
 74+				cmd = { "/home/pavle/.local/share/nvim/mason/bin/efm-langserver" },
 75+				init_options = { documentFormatting = true },
 76+				filetypes = vim.tbl_keys(efm_languages),
 77+				settings = {
 78+					rootMarkers = { ".git/", ".prettierignore" },
 79+					lintDebounce = 100,
 80+					logLevel = 5,
 81+					logFile = "/home/pavle/.local/state/nvim/efm.log",
 82+					languages = efm_languages,
 83+				},
 84+				single_file_support = true,
 85+			})
 86 		end,
 87 	},
 88 	{
 89diff --git a/dot_config/nvim/lua/sets.lua b/dot_config/nvim/lua/sets.lua
 90index 0b189fec5e8203c73067bbef44466ccd4d821b05..5140fa1839d476e3c608eab96e464f5db5cc66c2 100644
 91--- a/dot_config/nvim/lua/sets.lua
 92+++ b/dot_config/nvim/lua/sets.lua
 93@@ -69,4 +69,9 @@ vim.opt.ignorecase = true
 94 vim.opt.smartcase = true
 95 vim.opt.shell = "/usr/bin/zsh"
 96 
 97-vim.diagnostic.config({ virtual_text = true })
 98+vim.diagnostic.config({
 99+	virtual_text = true,
100+	virtual_lines = false,
101+	jump = { float = { border = "rounded" } },
102+	update_in_insert = false,
103+})