diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua index 147eea0..cefdf10 100644 --- a/.config/nvim/lua/plugins/colorscheme.lua +++ b/.config/nvim/lua/plugins/colorscheme.lua @@ -10,5 +10,9 @@ return { priority = 1000 }, { "blazkowolf/gruber-darker.nvim" }, - { "sainnhe/everforest" } + { "sainnhe/everforest" }, + { + "navarasu/onedark.nvim", + priority = 1000, + } } diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index 91d031c..a42bce5 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -19,28 +19,28 @@ return { event = "VeryLazy", opts = {} }, - { - "ray-x/go.nvim", - dependencies = { - "ray-x/guihua.lua", - "neovim/nvim-lspconfig", - "nvim-treesitter/nvim-treesitter", - }, - config = function(lp, opts) - require("go").setup(opts) - local format_sync_grp = vim.api.nvim_create_augroup("GoFormat", {}) - vim.api.nvim_create_autocmd("BufWritePre", { - pattern = "*.go", - callback = function() - require('go.format').goimports() - end, - group = format_sync_grp, - }) - end, - event = { "CmdlineEnter" }, - ft = { "go", 'gomod' }, - build = ':lua require("go.install").update_all_sync()' - }, + -- { + -- "ray-x/go.nvim", + -- dependencies = { + -- "ray-x/guihua.lua", + -- "neovim/nvim-lspconfig", + -- "nvim-treesitter/nvim-treesitter", + -- }, + -- config = function(lp, opts) + -- require("go").setup(opts) + -- local format_sync_grp = vim.api.nvim_create_augroup("GoFormat", {}) + -- vim.api.nvim_create_autocmd("BufWritePre", { + -- pattern = "*.go", + -- callback = function() + -- require('go.format').goimports() + -- end, + -- group = format_sync_grp, + -- }) + -- end, + -- event = { "CmdlineEnter" }, + -- ft = { "go", 'gomod' }, + -- build = ':lua require("go.install").update_all_sync()' + -- }, { "neovim/nvim-lspconfig", dependencies = { @@ -115,10 +115,14 @@ return { assignVariablesTypes = true, compositeLiteralFields = true, compositeLiteralTypes = true, + completeUnimported = true, constantValues = true, functionTypeParameters = true, parameterNames = true, - rangeVariableTypes = true + rangeVariableTypes = true, + analyses = { + unusedparams = true, + } }, } } @@ -165,6 +169,9 @@ return { lspconfig["pyright"].setup({ capabilities = capabilities, }) + lspconfig["sourcekit"].setup({ + capabilities = capabilities, + }) end, }, { @@ -172,6 +179,12 @@ return { version = '^5', lazy = false }, + { + "leoluz/nvim-dap-go", + ft = "go", + dependencies = "mfussenegger/nvim-dap", + opts = {} + }, { "rcarriga/nvim-dap-ui", event = "VeryLazy", diff --git a/.config/nvim/lua/plugins/misc.lua b/.config/nvim/lua/plugins/misc.lua index b6c9899..f7cac5e 100644 --- a/.config/nvim/lua/plugins/misc.lua +++ b/.config/nvim/lua/plugins/misc.lua @@ -47,9 +47,27 @@ return { end }, "tpope/vim-fugitive", + { + 'codethread/qmk.nvim', + config = function() + ---@type qmk.UserConfig + local conf = { + name = 'LAYOUT_lily58_pro', + variant = 'zmk', + layout = { + 'x x x x x x _ _ _ _ x x x x x x', + 'x x x x x x _ _ _ _ x x x x x x', + 'x x x x x x _ _ _ _ x x x x x x', + 'x x x x x x x _ _ x x x x x x x', + '_ _ _ x x x x _ _ x x x x _ _ _', + } + } + require('qmk').setup(conf) + end + }, { "afonsofrancof/worktrees.nvim", - dev = true, + dev = false, event = "VeryLazy", opts = { mappings = { @@ -58,5 +76,29 @@ return { switch = "wts", } } + }, + { + "afonsofrancof/osc11.nvim", + dev = false, + dependencies = { + "navarasu/onedark.nvim", + }, + opts = { + on_dark = function() + vim.g.gruvbox_material_better_performance = 1 + vim.g.gruvbox_material_background = "hard" + vim.g.gruvbox_material_foreground = "original" + vim.g.gruvbox_material_transparent_background = 2 + vim.opt.background = "dark" + vim.cmd('colorscheme gruvbox-material') + end, + on_light = function() + require('onedark').setup { + style = 'light' + } + -- Enable theme + require('onedark').load() + end, + } } } diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index 6001626..931acd9 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -53,4 +53,5 @@ return { }) end }, + "kyoh86/vim-jsonl" }