diff --git a/config/nvim/.luarc.json b/config/nvim/.luarc.json deleted file mode 100644 index 1aa7674..0000000 --- a/config/nvim/.luarc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "diagnostics.globals": [ - "enabled_plugins" - ] -} \ No newline at end of file diff --git a/config/nvim/lua/aleidk/plugins-ide/formatter.lua b/config/nvim/lua/aleidk/plugins-ide/formatter.lua index 2cab30d..45a73fa 100644 --- a/config/nvim/lua/aleidk/plugins-ide/formatter.lua +++ b/config/nvim/lua/aleidk/plugins-ide/formatter.lua @@ -28,6 +28,7 @@ return { python = { "ruff_format", "ruff_organize_imports" }, scss = { "prettierd", "prettier", stop_after_first = true }, sh = { "shfmt" }, + toml = { "taplo" }, typescript = { "biome" }, typescriptreact = { "biome" }, xml = { "lemminx" }, diff --git a/config/nvim/lua/aleidk/plugins-ide/lsp.lua b/config/nvim/lua/aleidk/plugins-ide/lsp.lua index 32fed8d..de3a8b4 100644 --- a/config/nvim/lua/aleidk/plugins-ide/lsp.lua +++ b/config/nvim/lua/aleidk/plugins-ide/lsp.lua @@ -98,6 +98,7 @@ return { "blade" }, }, + harper_ls = {}, html = {}, marksman = {}, phpactor = {}, @@ -134,6 +135,7 @@ return { }, }, sqlls = {}, + taplo = {}, yamlls = { settings = { yaml = { diff --git a/config/nvim/lua/aleidk/plugins-ide/trouble.lua b/config/nvim/lua/aleidk/plugins-ide/trouble.lua index 8b31a1c..b7a17bf 100644 --- a/config/nvim/lua/aleidk/plugins-ide/trouble.lua +++ b/config/nvim/lua/aleidk/plugins-ide/trouble.lua @@ -1,3 +1,5 @@ +---@module 'trouble' + return { "folke/trouble.nvim", dependencies = { "nvim-tree/nvim-web-devicons" }, @@ -40,7 +42,7 @@ return { ---@type trouble.Config return { - focus = false, + focus = true, ---@type trouble.Window.opts preview = { @@ -51,13 +53,24 @@ return { ---@type table keys = { - [""] = "jump_close", - ["<2-leftmouse>"] = "jump_close", + [""] = "jump_close", + [""] = "jump", + ["<2-leftmouse>"] = "jump", [""] = "jump_split_close", [""] = "jump_vsplit_close", ["v"] = "jump_split_close", ["s"] = "jump_vsplit_close", [""] = "cancel", -- hack to fool myself into thinking I move to the avobe window + ["a"] = function(view, ctx) + -- TODO: this is not possible until this issue is solved + -- https://github.com/neovim/neovim/issues/31206 + local trouble = require("trouble") + view:action("jump_only") + + vim.lsp.buf.code_action() + + trouble.focus(view, ctx) + end, }, win = win_opts, ---@type table