summaryrefslogtreecommitdiff
path: root/.config/nvim/lua/custom
diff options
context:
space:
mode:
Diffstat (limited to '.config/nvim/lua/custom')
-rw-r--r--.config/nvim/lua/custom/config/language-servers.lua16
-rw-r--r--.config/nvim/lua/custom/plugins/colorscheme.lua3
-rw-r--r--.config/nvim/lua/custom/plugins/conform.lua2
-rw-r--r--.config/nvim/lua/custom/plugins/nvim-lint.lua2
4 files changed, 21 insertions, 2 deletions
diff --git a/.config/nvim/lua/custom/config/language-servers.lua b/.config/nvim/lua/custom/config/language-servers.lua
index 97c8e30..199aba2 100644
--- a/.config/nvim/lua/custom/config/language-servers.lua
+++ b/.config/nvim/lua/custom/config/language-servers.lua
@@ -65,4 +65,20 @@ return {
ts_ls = true, -- javascript/typescript
-- marksman = true, -- Markdown LSP
markdown_oxide = true, -- Markdown LSP but better
+ gopls = {
+ cmd = { 'gopls' },
+ filetypes = { 'go', 'gomod', 'gowork', 'gotmpl' },
+ root_dir = function(filename)
+ return require('lspconfig/util').root_pattern('go.work', 'go.mod', '.git')(filename)
+ end,
+ settings = {
+ gopls = {
+ completeUnimported = true,
+ -- usePlaceholders = true,
+ analyses = {
+ unusedparams = true,
+ },
+ },
+ },
+ }, -- Go LSP
}
diff --git a/.config/nvim/lua/custom/plugins/colorscheme.lua b/.config/nvim/lua/custom/plugins/colorscheme.lua
index e3dc5bd..a5e44d3 100644
--- a/.config/nvim/lua/custom/plugins/colorscheme.lua
+++ b/.config/nvim/lua/custom/plugins/colorscheme.lua
@@ -6,8 +6,11 @@ return {
config = function()
vim.cmd.colorscheme('tokyonight-night')
require('colorschemes.dapui').set()
+ -- vim.g.material_style = 'deep ocean'
+ -- vim.cmd.colorscheme('material')
end,
},
+ -- 'marko-cerovac/material.nvim',
-- 'rktjmp/lush.nvim',
-- 'catppuccin/nvim',
-- 'marko-cerovac/material.nvim',
diff --git a/.config/nvim/lua/custom/plugins/conform.lua b/.config/nvim/lua/custom/plugins/conform.lua
index 759f5ba..bf28542 100644
--- a/.config/nvim/lua/custom/plugins/conform.lua
+++ b/.config/nvim/lua/custom/plugins/conform.lua
@@ -16,7 +16,7 @@ return {
['c'] = { 'clang-format' },
['python'] = { 'isort', 'black' },
['rust'] = { 'rustfmt' },
- ['go'] = { 'gofumpt' },
+ ['go'] = { 'gofumpt', "goimports-reviser", "golines" },
['markdown'] = { 'prettierd', 'prettier', stop_after_first = true },
['yaml'] = { 'prettierd' },
['json'] = { 'jq' },
diff --git a/.config/nvim/lua/custom/plugins/nvim-lint.lua b/.config/nvim/lua/custom/plugins/nvim-lint.lua
index 4e334d9..67aca74 100644
--- a/.config/nvim/lua/custom/plugins/nvim-lint.lua
+++ b/.config/nvim/lua/custom/plugins/nvim-lint.lua
@@ -6,7 +6,7 @@ return {
lint.linters_by_ft = {
c = { 'clangtidy' },
cpp = { 'clangtidy' },
- go = { 'golangci-lint' },
+ -- go = { 'golangci-lint' },
python = { 'flake8' },
json = { 'jsonlint' },
bash = { 'shellcheck' },