diff --git a/init.lua b/init.lua index ded6ab50..be78a910 100644 --- a/init.lua +++ b/init.lua @@ -642,123 +642,123 @@ require('lazy').setup({ }, }, - { -- Autocompletion - 'hrsh7th/nvim-cmp', - event = 'InsertEnter', - dependencies = { - -- Snippet Engine & its associated nvim-cmp source - { - 'L3MON4D3/LuaSnip', - build = (function() - -- Build Step is needed for regex support in snippets. - -- This step is not supported in many windows environments. - -- Remove the below condition to re-enable on windows. - if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then - return - end - return 'make install_jsregexp' - end)(), - dependencies = { - -- `friendly-snippets` contains a variety of premade snippets. - -- See the README about individual language/framework/plugin snippets: - -- https://github.com/rafamadriz/friendly-snippets - { - 'rafamadriz/friendly-snippets', - config = function() - require('luasnip.loaders.from_vscode').lazy_load() - end, - }, - }, - }, - 'saadparwaiz1/cmp_luasnip', - - -- Adds other completion capabilities. - -- nvim-cmp does not ship with all sources by default. They are split - -- into multiple repos for maintenance purposes. - 'hrsh7th/cmp-nvim-lsp', - 'hrsh7th/cmp-path', - }, - config = function() - -- See `:help cmp` - local cmp = require 'cmp' - local luasnip = require 'luasnip' - luasnip.config.setup {} - - cmp.setup { - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - completion = { completeopt = 'menu,menuone,noinsert' }, - - -- For an understanding of why these mappings were - -- chosen, you will need to read `:help ins-completion` - -- - -- No, but seriously. Please read `:help ins-completion`, it is really good! - mapping = cmp.mapping.preset.insert { - -- Select the [n]ext item - [''] = cmp.mapping.select_next_item(), - -- Select the [p]revious item - [''] = cmp.mapping.select_prev_item(), - - -- Scroll the documentation window [b]ack / [f]orward - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - - -- Accept ([y]es) the completion. - -- This will auto-import if your LSP supports it. - -- This will expand snippets if the LSP sent a snippet. - [''] = cmp.mapping.confirm { select = true }, - - -- If you prefer more traditional completion keymaps, - -- you can uncomment the following lines - --[''] = cmp.mapping.confirm { select = true }, - --[''] = cmp.mapping.select_next_item(), - --[''] = cmp.mapping.select_prev_item(), - - -- Manually trigger a completion from nvim-cmp. - -- Generally you don't need this, because nvim-cmp will display - -- completions whenever it has completion options available. - [''] = cmp.mapping.complete {}, - - -- Think of as moving to the right of your snippet expansion. - -- So if you have a snippet that's like: - -- function $name($args) - -- $body - -- end - -- - -- will move you to the right of each of the expansion locations. - -- is similar, except moving you backwards. - [''] = cmp.mapping(function() - if luasnip.expand_or_locally_jumpable() then - luasnip.expand_or_jump() - end - end, { 'i', 's' }), - [''] = cmp.mapping(function() - if luasnip.locally_jumpable(-1) then - luasnip.jump(-1) - end - end, { 'i', 's' }), - - -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: - -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps - }, - sources = { - { - name = 'lazydev', - -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it - group_index = 0, - }, - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - { name = 'path' }, - { name = 'copilot' }, - { name = 'buffer' }, - }, - } - end, - }, + -- { -- Autocompletion + -- 'hrsh7th/nvim-cmp', + -- event = 'InsertEnter', + -- dependencies = { + -- -- Snippet Engine & its associated nvim-cmp source + -- { + -- 'L3MON4D3/LuaSnip', + -- build = (function() + -- -- Build Step is needed for regex support in snippets. + -- -- This step is not supported in many windows environments. + -- -- Remove the below condition to re-enable on windows. + -- if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then + -- return + -- end + -- return 'make install_jsregexp' + -- end)(), + -- dependencies = { + -- -- `friendly-snippets` contains a variety of premade snippets. + -- -- See the README about individual language/framework/plugin snippets: + -- -- https://github.com/rafamadriz/friendly-snippets + -- { + -- 'rafamadriz/friendly-snippets', + -- config = function() + -- require('luasnip.loaders.from_vscode').lazy_load() + -- end, + -- }, + -- }, + -- }, + -- 'saadparwaiz1/cmp_luasnip', + -- + -- -- Adds other completion capabilities. + -- -- nvim-cmp does not ship with all sources by default. They are split + -- -- into multiple repos for maintenance purposes. + -- 'hrsh7th/cmp-nvim-lsp', + -- 'hrsh7th/cmp-path', + -- }, + -- config = function() + -- -- See `:help cmp` + -- local cmp = require 'cmp' + -- local luasnip = require 'luasnip' + -- luasnip.config.setup {} + -- + -- cmp.setup { + -- snippet = { + -- expand = function(args) + -- luasnip.lsp_expand(args.body) + -- end, + -- }, + -- completion = { completeopt = 'menu,menuone,noinsert' }, + -- + -- -- For an understanding of why these mappings were + -- -- chosen, you will need to read `:help ins-completion` + -- -- + -- -- No, but seriously. Please read `:help ins-completion`, it is really good! + -- mapping = cmp.mapping.preset.insert { + -- -- Select the [n]ext item + -- [''] = cmp.mapping.select_next_item(), + -- -- Select the [p]revious item + -- [''] = cmp.mapping.select_prev_item(), + -- + -- -- Scroll the documentation window [b]ack / [f]orward + -- [''] = cmp.mapping.scroll_docs(-4), + -- [''] = cmp.mapping.scroll_docs(4), + -- + -- -- Accept ([y]es) the completion. + -- -- This will auto-import if your LSP supports it. + -- -- This will expand snippets if the LSP sent a snippet. + -- [''] = cmp.mapping.confirm { select = true }, + -- + -- -- If you prefer more traditional completion keymaps, + -- -- you can uncomment the following lines + -- --[''] = cmp.mapping.confirm { select = true }, + -- --[''] = cmp.mapping.select_next_item(), + -- --[''] = cmp.mapping.select_prev_item(), + -- + -- -- Manually trigger a completion from nvim-cmp. + -- -- Generally you don't need this, because nvim-cmp will display + -- -- completions whenever it has completion options available. + -- [''] = cmp.mapping.complete {}, + -- + -- -- Think of as moving to the right of your snippet expansion. + -- -- So if you have a snippet that's like: + -- -- function $name($args) + -- -- $body + -- -- end + -- -- + -- -- will move you to the right of each of the expansion locations. + -- -- is similar, except moving you backwards. + -- [''] = cmp.mapping(function() + -- if luasnip.expand_or_locally_jumpable() then + -- luasnip.expand_or_jump() + -- end + -- end, { 'i', 's' }), + -- [''] = cmp.mapping(function() + -- if luasnip.locally_jumpable(-1) then + -- luasnip.jump(-1) + -- end + -- end, { 'i', 's' }), + -- + -- -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: + -- -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps + -- }, + -- sources = { + -- { + -- name = 'lazydev', + -- -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it + -- group_index = 0, + -- }, + -- { name = 'nvim_lsp' }, + -- { name = 'luasnip' }, + -- { name = 'path' }, + -- { name = 'copilot' }, + -- { name = 'buffer' }, + -- }, + -- } + -- end, + -- }, { -- You can easily change to a different colorscheme. -- Change the name of the colorscheme plugin below, and then @@ -830,7 +830,7 @@ require('lazy').setup({ { 'nushell/tree-sitter-nu' }, }, opts = { - ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'nu' }, + ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'nu', 'go' }, -- Autoinstall languages that are not installed auto_install = true, highlight = { @@ -864,13 +864,13 @@ require('lazy').setup({ -- require 'kickstart.plugins.lint', -- require 'kickstart.plugins.autopairs', -- require 'kickstart.plugins.neo-tree', - require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps + -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -- This is the easiest way to modularize your config. -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - { import = 'custom.plugins' }, + -- { import = 'custom.plugins' }, -- -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` -- Or use telescope! diff --git a/lua/custom/plugins/copilot-cmp.lua b/lua/custom/plugins/copilot-cmp.lua index 560f181a..d59202a7 100644 --- a/lua/custom/plugins/copilot-cmp.lua +++ b/lua/custom/plugins/copilot-cmp.lua @@ -1,15 +1,16 @@ if true then return {} -end -return { - 'zbirenbaum/copilot-cmp', - config = function() - require('copilot_cmp').setup() - end, - opts = { - filetypes = { - ['.'] = false, - go = true, +else + return { + 'zbirenbaum/copilot-cmp', + config = function() + require('copilot_cmp').setup() + end, + opts = { + filetypes = { + ['.'] = false, + go = true, + }, }, - }, -} + } +end diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua index 6fbac8a3..f86a00aa 100644 --- a/lua/custom/plugins/copilot.lua +++ b/lua/custom/plugins/copilot.lua @@ -1,14 +1,15 @@ if true then return {} -end -return { - 'zbirenbaum/copilot.lua', - opts = { - suggestion = { enabled = false }, - panel = { enabled = false }, - filetypes = { - ['.'] = false, - go = true, +else + return { + 'zbirenbaum/copilot.lua', + opts = { + suggestion = { enabled = false }, + panel = { enabled = false }, + filetypes = { + ['.'] = false, + go = true, + }, }, - }, -} + } +end diff --git a/lua/custom/plugins/harpoon.lua b/lua/custom/plugins/harpoon.lua index 1fa20fde..0e0b0ef3 100644 --- a/lua/custom/plugins/harpoon.lua +++ b/lua/custom/plugins/harpoon.lua @@ -1,9 +1,10 @@ if true then return {} +else + -- https://github.com/ThePrimeagen/harpoon/tree/harpoon2 - this branch, follow before removing trueflag above + return { + 'ThePrimeagen/harpoon', + branch = 'harpoon2', + dependencies = { { 'nvim-lua/plenary.nvim' } }, + } end --- https://github.com/ThePrimeagen/harpoon/tree/harpoon2 - this branch, follow before removing trueflag above -return { - 'ThePrimeagen/harpoon', - branch = 'harpoon2', - dependencies = { { 'nvim-lua/plenary.nvim' } }, -} diff --git a/lua/custom/plugins/mini-nvim.lua b/lua/custom/plugins/mini-nvim.lua deleted file mode 100644 index af62bd1e..00000000 --- a/lua/custom/plugins/mini-nvim.lua +++ /dev/null @@ -1,17 +0,0 @@ -if true then - return {} -else - return { - 'echasnovski/mini.nvim', - version = false, - -- require('mini.ai').setup(), - -- require('mini.operators').setup(), - -- require('mini.surround').setup(), - -- require('mini.bracketed').setup(), - -- require('mini.files').setup(), - -- require('mini.pick').setup(), - -- -- require('mini.hues').setup(), - -- require('mini.icons').setup(), - -- require('mini.statusline').setup(), - } -end diff --git a/lua/custom/plugins/obsidian-nvim.lua b/lua/custom/plugins/obsidian-nvim.lua index 1ea55ace..48761030 100644 --- a/lua/custom/plugins/obsidian-nvim.lua +++ b/lua/custom/plugins/obsidian-nvim.lua @@ -1,5 +1,5 @@ if true then - return + return {} else return { 'epwalsh/obsidian.nvim', diff --git a/lua/custom/plugins/pkl-ls.lua b/lua/custom/plugins/pkl-ls.lua index dac8b3e6..8dcac0d1 100644 --- a/lua/custom/plugins/pkl-ls.lua +++ b/lua/custom/plugins/pkl-ls.lua @@ -1,18 +1,19 @@ if true then return {} +else + return { + 'jayadamsmorgan/PklLanguageServer', + build = 'mv Editors/Neovim/pklls-nvim/* .', + config = function() + local capabilities = require('cmp_nvim_lsp').default_capabilities() -- if you are using nvim_cmp for completion + require('pklls-nvim.init').setup { + capabilities = capabilities, -- change or remove this + -- on_attach = custom_on_attach -- change or remove this + -- cmd = custom_path_to_pkl_lsp_server + } + end, + dependencies = { + 'neovim/nvim-lspconfig', + }, + } end -return { - 'jayadamsmorgan/PklLanguageServer', - build = 'mv Editors/Neovim/pklls-nvim/* .', - config = function() - local capabilities = require('cmp_nvim_lsp').default_capabilities() -- if you are using nvim_cmp for completion - require('pklls-nvim.init').setup { - capabilities = capabilities, -- change or remove this - -- on_attach = custom_on_attach -- change or remove this - -- cmd = custom_path_to_pkl_lsp_server - } - end, - dependencies = { - 'neovim/nvim-lspconfig', - }, -} diff --git a/lua/custom/plugins/pkl-neovim.lua b/lua/custom/plugins/pkl-neovim.lua index d26686c4..c7c1dc94 100644 --- a/lua/custom/plugins/pkl-neovim.lua +++ b/lua/custom/plugins/pkl-neovim.lua @@ -1,12 +1,13 @@ if true then return {} +else + return { + 'https://github.com/apple/pkl-neovim', + lazy = true, + event = 'BufReadPre *.pkl', + dependencies = { 'nvim-treesitter/nvim-treesitter' }, + build = function() + vim.cmd 'TSInstall! pkl' + end, + } end -return { - 'https://github.com/apple/pkl-neovim', - lazy = true, - event = 'BufReadPre *.pkl', - dependencies = { 'nvim-treesitter/nvim-treesitter' }, - build = function() - vim.cmd 'TSInstall! pkl' - end, -} diff --git a/lua/custom/plugins/snacks-nvim.lua b/lua/custom/plugins/snacks-nvim.lua index 762b3c88..c093e330 100644 --- a/lua/custom/plugins/snacks-nvim.lua +++ b/lua/custom/plugins/snacks-nvim.lua @@ -1,5 +1,5 @@ if true then - return + return {} else return { 'folke/snacks.nvim', diff --git a/lua/custom/plugins/transparent-nvim.lua b/lua/custom/plugins/transparent-nvim.lua index 4b5b6f94..01d5baee 100644 --- a/lua/custom/plugins/transparent-nvim.lua +++ b/lua/custom/plugins/transparent-nvim.lua @@ -1,5 +1,5 @@ if true then - return + return {} else return { 'xiyaowong/transparent.nvim', diff --git a/lua/custom/plugins/vim-be-good.lua b/lua/custom/plugins/vim-be-good.lua index eee6e41e..8adb5e4c 100644 --- a/lua/custom/plugins/vim-be-good.lua +++ b/lua/custom/plugins/vim-be-good.lua @@ -1,5 +1,5 @@ if true then - return + return {} else return { 'ThePrimeagen/vim-be-good', diff --git a/lua/custom/plugins/zellij-nav.lua b/lua/custom/plugins/zellij-nav.lua index 288cba2d..2d28d303 100644 --- a/lua/custom/plugins/zellij-nav.lua +++ b/lua/custom/plugins/zellij-nav.lua @@ -1,5 +1,5 @@ if true then - return + return {} else return { 'https://git.sr.ht/~swaits/zellij-nav.nvim',