diff options
| -rw-r--r-- | .config/nvim/lazy-lock.json | 3 | ||||
| -rw-r--r-- | .config/nvim/lua/custom/config/language-servers.lua | 16 | ||||
| -rw-r--r-- | .config/nvim/lua/custom/plugins/colorscheme.lua | 3 | ||||
| -rw-r--r-- | .config/nvim/lua/custom/plugins/conform.lua | 2 | ||||
| -rw-r--r-- | .config/nvim/lua/custom/plugins/nvim-lint.lua | 2 |
5 files changed, 23 insertions, 3 deletions
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 8f93779..60b8c29 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -5,6 +5,7 @@ "auto-save.nvim": { "branch": "main", "commit": "5fe9ab0c42f0457f2a973e814a6352b8eeb04730" }, "auto-session": { "branch": "main", "commit": "51e26935e3cc5c46b7dd93f3762a803540ff3581" }, "buffer_manager.nvim": { "branch": "main", "commit": "fd36131b2b3e0f03fd6353ae2ffc88cf920b3bbb" }, + "bullets.vim": { "branch": "master", "commit": "2253f970e54320dbd76fd6bb4f5a0bf2436ce232" }, "ccc.nvim": { "branch": "main", "commit": "790aa881d7f47bc7cc07ad03f1216bb7caf9ef67" }, "clangd_extensions.nvim": { "branch": "main", "commit": "385a44f133f4145e3a3da1a2a557225dccc3e1f8" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, @@ -29,6 +30,7 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "material.nvim": { "branch": "main", "commit": "ac8f02e97e359b7d258c0a00ec0949fe880790ad" }, "mini.ai": { "branch": "main", "commit": "40e380a589d07ec2c856940c6422aafe5d949a0d" }, "mini.nvim": { "branch": "main", "commit": "e50cf9de614500a20e47cfc50e30a100042f91c3" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, @@ -62,7 +64,6 @@ "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "tiny-inline-diagnostic.nvim": { "branch": "main", "commit": "1a83e7ce5c9d0ae4d89fc5c812b55ff8ed1d39e7" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "tokyonight.nvim": { "branch": "main", "commit": "817bb6ffff1b9ce72cdd45d9fcfa8c9cd1ad3839" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" }, 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' }, |