From 82e0f37eb30e16b8c57ecb1b9e239b5fd75ed6f7 Mon Sep 17 00:00:00 2001 From: David Luevano Alvarado Date: Sat, 10 Feb 2024 20:14:49 -0600 Subject: refactor(plugins): name changes and restructures --- lua/plugins/colorizer.lua | 2 +- lua/plugins/init.lua | 9 --------- lua/plugins/lspconfig.lua | 7 ++++++- lua/plugins/lualine.lua | 2 +- lua/plugins/neo-tree.lua | 1 + lua/plugins/standalone.lua | 9 +++++++++ lua/plugins/treesitter.lua | 5 ++--- lua/plugins/undotree.lua | 2 +- 8 files changed, 21 insertions(+), 16 deletions(-) delete mode 100644 lua/plugins/init.lua create mode 100644 lua/plugins/standalone.lua (limited to 'lua') diff --git a/lua/plugins/colorizer.lua b/lua/plugins/colorizer.lua index a4d0425..2a6b40f 100644 --- a/lua/plugins/colorizer.lua +++ b/lua/plugins/colorizer.lua @@ -30,6 +30,6 @@ return { config = function(_, opts) require('colorizer').setup(opts) - vim.keymap.set('n', 'ct', 'ColorizerToggle', { desc = '[C]olorizer [T]oggle' }) + vim.keymap.set('n', 'ct', 'ColorizerToggle', { desc = '[c]olorizer [t]oggle' }) end } diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua deleted file mode 100644 index b278ce2..0000000 --- a/lua/plugins/init.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - -- Detect tabstop and shiftwidth automatically, - -- uses .editorconfig https://editorconfig.org/ - 'tpope/vim-sleuth', - -- "gc" to comment visual regions/lines - { 'numToStr/Comment.nvim', opts = {} }, - -- required for nvim-qt on windows - { 'equalsraf/neovim-gui-shim' }, -} diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index 8023bdc..27ad7b7 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -122,6 +122,11 @@ return { }) -- At the end, add GDscript support, which is only supported by lspconfig itself - lspconfig.gdscript.setup({ capabilities = capabilities }) + lspconfig.gdscript.setup({ + capabilities = capabilities, + on_attach = on_attach, + -- Need a better setup, this is for wsl -> win setup, but the ip will change dynamically + -- cmd = { 'nc', '172.30.112.1', '6005' }, + }) end, } diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index 3354031..0821711 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -1,7 +1,7 @@ return { 'nvim-lualine/lualine.nvim', dependencies = { - { 'nvim-tree/nvim-web-devicons', opt = {} }, + 'nvim-tree/nvim-web-devicons', 'rmagatti/auto-session', }, opts = { diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index c95eefb..cecd66f 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -292,6 +292,7 @@ return { highlight_separator_active = "NeoTreeTabSeparatorActive", }, }, + -- lazy load on nt keys = { { 'nt', 'Neotree toggle', desc = 'Toggle [N]eo[t]ree' }, }, diff --git a/lua/plugins/standalone.lua b/lua/plugins/standalone.lua new file mode 100644 index 0000000..bfd9e18 --- /dev/null +++ b/lua/plugins/standalone.lua @@ -0,0 +1,9 @@ +return { + -- Detect tabstop and shiftwidth automatically, + -- uses .editorconfig https://editorconfig.org/ + { 'tpope/vim-sleuth', opts = {} }, + -- "gc" to comment visual regions/lines + { 'numToStr/Comment.nvim', opts = {} }, + -- required for nvim-qt on windows + { 'equalsraf/neovim-gui-shim', opts = {} }, +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index a942921..5f4cb18 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -82,14 +82,13 @@ return { ['[]'] = '@class.outer', }, }, - -- TODO: probably change to sa (swap argument) swap = { enable = true, swap_next = { - ['a'] = { query = '@parameter.inner', desc = 'Swap with next parameter' }, + ['a'] = { query = '@parameter.inner', desc = 'Swap with next [a]rgument' }, }, swap_previous = { - ['A'] = { query = '@parameter.inner', desc = 'Swap with previous parameter' }, + ['A'] = { query = '@parameter.inner', desc = 'Swap with previous [A]rgument' }, }, }, }, diff --git a/lua/plugins/undotree.lua b/lua/plugins/undotree.lua index 047a5ac..16f57bc 100644 --- a/lua/plugins/undotree.lua +++ b/lua/plugins/undotree.lua @@ -2,6 +2,6 @@ return { 'mbbill/undotree', -- lazy load on u keys = { - { 'u', 'UndotreeToggle', desc = 'Toggle [U]ndotree' }, + { 'u', 'UndotreeToggle', desc = '[u]ndotree toggle' }, }, } -- cgit v1.2.3-70-g09d2