[nvim] gruvbox original hard and some plugin changes

This commit is contained in:
Afonso Franco 2024-04-18 01:21:37 +01:00
parent d79b876cd0
commit 18e82da1c6
Signed by: afonso
SSH key fingerprint: SHA256:aiLbdlPwXKJS5wMnghdtod0SPy8imZjlVvCyUX9DJNk
6 changed files with 118 additions and 17 deletions

View file

@ -1,4 +1,5 @@
vim.g.gruvbox_material_better_performance = 1 vim.g.gruvbox_material_better_performance = 1
vim.g.gruvbox_material_background = 'medium' vim.g.gruvbox_material_background = 'hard'
vim.g.gruvbox_material_foreground = 'original'
vim.opt.background = 'dark' vim.opt.background = 'dark'
vim.cmd('colorscheme gruvbox-material') vim.cmd('colorscheme gruvbox-material')

View file

@ -3,6 +3,7 @@ require("conform").setup({
python = { "black" }, python = { "black" },
javascript = { "prettierd" }, javascript = { "prettierd" },
markdown = { "mdformat" }, markdown = { "mdformat" },
go = { "gofmt" },
json = {"jq"} json = {"jq"}
} }
}) })

View file

@ -147,7 +147,7 @@ lazy.setup({
{ {
"rcarriga/nvim-dap-ui", "rcarriga/nvim-dap-ui",
event = "VeryLazy", event = "VeryLazy",
dependencies = {"mfussenegger/nvim-dap","nvim-neotest/nvim-nio"}, dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" },
config = function() config = function()
local dap = require("dap") local dap = require("dap")
local dapui = require("dapui") local dapui = require("dapui")
@ -196,6 +196,61 @@ lazy.setup({
require("plugins.lspconfig") require("plugins.lspconfig")
end, end,
}, },
{
"folke/trouble.nvim",
branch = "dev",
keys = {
{
"<leader>xx",
"<cmd>Trouble diagnostics toggle<cr>",
desc = "Diagnostics (Trouble)",
},
{
"<leader>xX",
"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
desc = "Buffer Diagnostics (Trouble)",
},
{
"<leader>cs",
"<cmd>Trouble symbols toggle focus=false<cr>",
desc = "Symbols (Trouble)",
},
{
"<leader>cl",
"<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
desc = "LSP Definitions / references / ... (Trouble)",
},
{
"<leader>xL",
"<cmd>Trouble loclist toggle<cr>",
desc = "Location List (Trouble)",
},
{
"<leader>xQ",
"<cmd>Trouble qflist toggle<cr>",
desc = "Quickfix List (Trouble)",
},
},
opts = {
modes = {
mydiags = {
mode = "diagnostics", -- inherit from diagnostics mode
filter = {
any = {
buf = 0, -- current buffer
{
severity = vim.diagnostic.severity.ERROR, -- errors only
-- limit to files in the current project
function(item)
return item.filename:find(vim.loop.cwd(), 1, true)
end,
},
},
},
}
}
}
},
{ {
"stevearc/conform.nvim", "stevearc/conform.nvim",
@ -204,6 +259,19 @@ lazy.setup({
end, end,
}, },
{
'dense-analysis/ale',
config = function()
vim.g.ale_linters_explicit = 1
vim.g.ale_echo_msg_error_str = 'E'
vim.g.ale_echo_msg_warning_str = 'W'
vim.g.ale_echo_msg_format = '[%linter%] %s [%severity%]'
--vim.g.ale_linters = {
-- go = { 'golangci-lint' },
--}
end
},
{ {
"lervag/vimtex", "lervag/vimtex",
config = function() config = function()
@ -211,13 +279,13 @@ lazy.setup({
end, end,
}, },
'tpope/vim-commentary', --'tpope/vim-commentary',
-- { -- {
-- "mrcjkb/rustaceanvim", -- "mrcjkb/rustaceanvim",
-- version = "^4", -- Recommended -- version = "^4", -- Recommended
-- ft = { "rust" }, -- ft = { "rust" },
-- }, -- },
"barreiroleo/ltex-extra.nvim", "barreiroleo/ltex-extra.nvim",
@ -260,5 +328,10 @@ lazy.setup({
'ThePrimeagen/vim-be-good', 'ThePrimeagen/vim-be-good',
--JQ --JQ
'jrop/jq.nvim' 'jrop/jq.nvim',
{
'BooleanCube/keylab.nvim',
opts = {}
}
}) })

View file

@ -18,6 +18,9 @@ vim.api.nvim_create_autocmd("LspAttach", {
local client = vim.lsp.get_client_by_id(ev.data.client_id) local client = vim.lsp.get_client_by_id(ev.data.client_id)
client.server_capabilities.semanticTokensProvider = nil client.server_capabilities.semanticTokensProvider = nil
--Enable inlay hints
--vim.lsp.inlay_hint.enable(ev.buf,true)
-- Mappings. -- Mappings.
-- See `:help vim.lsp.*` for documentation on any of the below functions -- See `:help vim.lsp.*` for documentation on any of the below functions
local bufopts = { noremap = true, silent = true, buffer = ev.buf } local bufopts = { noremap = true, silent = true, buffer = ev.buf }
@ -35,6 +38,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
vim.keymap.set("n", "<space>ge", function() vim.diagnostic.goto_next() end, bufopts) vim.keymap.set("n", "<space>ge", function() vim.diagnostic.goto_next() end, bufopts)
vim.keymap.set("n", "<space>gE", function() vim.diagnostic.goto_prev() end, bufopts) vim.keymap.set("n", "<space>gE", function() vim.diagnostic.goto_prev() end, bufopts)
vim.keymap.set("n", "<space>fo", function() conform.format({ lsp_fallback = true }) end, bufopts) vim.keymap.set("n", "<space>fo", function() conform.format({ lsp_fallback = true }) end, bufopts)
vim.keymap.set("n", "<space>n", "<cmd>!toke check<cr>")
end, end,
}) })
@ -50,6 +54,26 @@ mason_lspconfig.setup_handlers({
capabilities = capabilities, capabilities = capabilities,
}) })
end, end,
["gopls"] = function ()
lspconfig["gopls"].setup({
capabilities = capabilities,
settings = {
gopls = {
["ui.completion.usePlaceholders"] = true,
["ui.diagnostic.staticcheck"] = true,
["ui.inlayhint.hints"] = {
assignVariablesTypes = true,
compositeLiteralFields = true,
compositeLiteralTypes = true,
constantValues = true,
functionTypeParameters = true,
parameterNames = true,
rangeVariableTypes = true
},
}
}
})
end,
["lua_ls"] = function() ["lua_ls"] = function()
lspconfig["lua_ls"].setup({ lspconfig["lua_ls"].setup({
capabilities = capabilities, capabilities = capabilities,
@ -61,6 +85,7 @@ mason_lspconfig.setup_handlers({
diagnostics = { diagnostics = {
globals = { 'vim' }, globals = { 'vim' },
}, },
hint = { enable = true }
}, },
}, },
}) })

View file

@ -2,8 +2,8 @@ require('lualine').setup {
options = { options = {
icons_enabled = true, icons_enabled = true,
theme = 'auto', theme = 'auto',
component_separators = { left = '', right = ''}, component_separators = { left = '', right = ''},
section_separators = { left = '', right = ''}, section_separators = { left = '', right = ''},
disabled_filetypes = { disabled_filetypes = {
statusline = {}, statusline = {},
winbar = {}, winbar = {},
@ -18,11 +18,11 @@ require('lualine').setup {
} }
}, },
sections = { sections = {
lualine_a = {'mode'}, lualine_a = {},
lualine_b = {'branch', 'diff', 'diagnostics'}, lualine_b = {},
lualine_c = {'filename'}, lualine_c = {},
lualine_x = {'lsp', 'fileformat', 'filetype'}, lualine_x = {'filetype'},
lualine_y = {'progress'}, lualine_y = {},
lualine_z = {'location'} lualine_z = {'location'}
}, },
inactive_sections = { inactive_sections = {

View file

@ -8,6 +8,7 @@ null_ls.setup({
null_ls.builtins.formatting.prettierd.with({ null_ls.builtins.formatting.prettierd.with({
filetypes = { "html", "json", "css", "js", "yaml", "markdown" }, filetypes = { "html", "json", "css", "js", "yaml", "markdown" },
}), }),
null_ls.builtins.diagnostics.golangci_lint,
}, },
on_attach = function(client,bufnr) on_attach = function(client,bufnr)
if client.supports_method("textDocument/formatting") then if client.supports_method("textDocument/formatting") then