Skip to content

Commit d4ce269

Browse files
committed
disable more plugins
1 parent 53927c8 commit d4ce269

File tree

12 files changed

+183
-195
lines changed

12 files changed

+183
-195
lines changed

init.lua

Lines changed: 120 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -642,123 +642,123 @@ require('lazy').setup({
642642
},
643643
},
644644

645-
{ -- Autocompletion
646-
'hrsh7th/nvim-cmp',
647-
event = 'InsertEnter',
648-
dependencies = {
649-
-- Snippet Engine & its associated nvim-cmp source
650-
{
651-
'L3MON4D3/LuaSnip',
652-
build = (function()
653-
-- Build Step is needed for regex support in snippets.
654-
-- This step is not supported in many windows environments.
655-
-- Remove the below condition to re-enable on windows.
656-
if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then
657-
return
658-
end
659-
return 'make install_jsregexp'
660-
end)(),
661-
dependencies = {
662-
-- `friendly-snippets` contains a variety of premade snippets.
663-
-- See the README about individual language/framework/plugin snippets:
664-
-- https://github.com/rafamadriz/friendly-snippets
665-
{
666-
'rafamadriz/friendly-snippets',
667-
config = function()
668-
require('luasnip.loaders.from_vscode').lazy_load()
669-
end,
670-
},
671-
},
672-
},
673-
'saadparwaiz1/cmp_luasnip',
674-
675-
-- Adds other completion capabilities.
676-
-- nvim-cmp does not ship with all sources by default. They are split
677-
-- into multiple repos for maintenance purposes.
678-
'hrsh7th/cmp-nvim-lsp',
679-
'hrsh7th/cmp-path',
680-
},
681-
config = function()
682-
-- See `:help cmp`
683-
local cmp = require 'cmp'
684-
local luasnip = require 'luasnip'
685-
luasnip.config.setup {}
686-
687-
cmp.setup {
688-
snippet = {
689-
expand = function(args)
690-
luasnip.lsp_expand(args.body)
691-
end,
692-
},
693-
completion = { completeopt = 'menu,menuone,noinsert' },
694-
695-
-- For an understanding of why these mappings were
696-
-- chosen, you will need to read `:help ins-completion`
697-
--
698-
-- No, but seriously. Please read `:help ins-completion`, it is really good!
699-
mapping = cmp.mapping.preset.insert {
700-
-- Select the [n]ext item
701-
['<C-n>'] = cmp.mapping.select_next_item(),
702-
-- Select the [p]revious item
703-
['<C-p>'] = cmp.mapping.select_prev_item(),
704-
705-
-- Scroll the documentation window [b]ack / [f]orward
706-
['<C-b>'] = cmp.mapping.scroll_docs(-4),
707-
['<C-f>'] = cmp.mapping.scroll_docs(4),
708-
709-
-- Accept ([y]es) the completion.
710-
-- This will auto-import if your LSP supports it.
711-
-- This will expand snippets if the LSP sent a snippet.
712-
['<C-y>'] = cmp.mapping.confirm { select = true },
713-
714-
-- If you prefer more traditional completion keymaps,
715-
-- you can uncomment the following lines
716-
--['<CR>'] = cmp.mapping.confirm { select = true },
717-
--['<Tab>'] = cmp.mapping.select_next_item(),
718-
--['<S-Tab>'] = cmp.mapping.select_prev_item(),
719-
720-
-- Manually trigger a completion from nvim-cmp.
721-
-- Generally you don't need this, because nvim-cmp will display
722-
-- completions whenever it has completion options available.
723-
['<C-Space>'] = cmp.mapping.complete {},
724-
725-
-- Think of <c-l> as moving to the right of your snippet expansion.
726-
-- So if you have a snippet that's like:
727-
-- function $name($args)
728-
-- $body
729-
-- end
730-
--
731-
-- <c-l> will move you to the right of each of the expansion locations.
732-
-- <c-h> is similar, except moving you backwards.
733-
['<C-l>'] = cmp.mapping(function()
734-
if luasnip.expand_or_locally_jumpable() then
735-
luasnip.expand_or_jump()
736-
end
737-
end, { 'i', 's' }),
738-
['<C-h>'] = cmp.mapping(function()
739-
if luasnip.locally_jumpable(-1) then
740-
luasnip.jump(-1)
741-
end
742-
end, { 'i', 's' }),
743-
744-
-- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
745-
-- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
746-
},
747-
sources = {
748-
{
749-
name = 'lazydev',
750-
-- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
751-
group_index = 0,
752-
},
753-
{ name = 'nvim_lsp' },
754-
{ name = 'luasnip' },
755-
{ name = 'path' },
756-
{ name = 'copilot' },
757-
{ name = 'buffer' },
758-
},
759-
}
760-
end,
761-
},
645+
-- { -- Autocompletion
646+
-- 'hrsh7th/nvim-cmp',
647+
-- event = 'InsertEnter',
648+
-- dependencies = {
649+
-- -- Snippet Engine & its associated nvim-cmp source
650+
-- {
651+
-- 'L3MON4D3/LuaSnip',
652+
-- build = (function()
653+
-- -- Build Step is needed for regex support in snippets.
654+
-- -- This step is not supported in many windows environments.
655+
-- -- Remove the below condition to re-enable on windows.
656+
-- if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then
657+
-- return
658+
-- end
659+
-- return 'make install_jsregexp'
660+
-- end)(),
661+
-- dependencies = {
662+
-- -- `friendly-snippets` contains a variety of premade snippets.
663+
-- -- See the README about individual language/framework/plugin snippets:
664+
-- -- https://github.com/rafamadriz/friendly-snippets
665+
-- {
666+
-- 'rafamadriz/friendly-snippets',
667+
-- config = function()
668+
-- require('luasnip.loaders.from_vscode').lazy_load()
669+
-- end,
670+
-- },
671+
-- },
672+
-- },
673+
-- 'saadparwaiz1/cmp_luasnip',
674+
--
675+
-- -- Adds other completion capabilities.
676+
-- -- nvim-cmp does not ship with all sources by default. They are split
677+
-- -- into multiple repos for maintenance purposes.
678+
-- 'hrsh7th/cmp-nvim-lsp',
679+
-- 'hrsh7th/cmp-path',
680+
-- },
681+
-- config = function()
682+
-- -- See `:help cmp`
683+
-- local cmp = require 'cmp'
684+
-- local luasnip = require 'luasnip'
685+
-- luasnip.config.setup {}
686+
--
687+
-- cmp.setup {
688+
-- snippet = {
689+
-- expand = function(args)
690+
-- luasnip.lsp_expand(args.body)
691+
-- end,
692+
-- },
693+
-- completion = { completeopt = 'menu,menuone,noinsert' },
694+
--
695+
-- -- For an understanding of why these mappings were
696+
-- -- chosen, you will need to read `:help ins-completion`
697+
-- --
698+
-- -- No, but seriously. Please read `:help ins-completion`, it is really good!
699+
-- mapping = cmp.mapping.preset.insert {
700+
-- -- Select the [n]ext item
701+
-- ['<C-n>'] = cmp.mapping.select_next_item(),
702+
-- -- Select the [p]revious item
703+
-- ['<C-p>'] = cmp.mapping.select_prev_item(),
704+
--
705+
-- -- Scroll the documentation window [b]ack / [f]orward
706+
-- ['<C-b>'] = cmp.mapping.scroll_docs(-4),
707+
-- ['<C-f>'] = cmp.mapping.scroll_docs(4),
708+
--
709+
-- -- Accept ([y]es) the completion.
710+
-- -- This will auto-import if your LSP supports it.
711+
-- -- This will expand snippets if the LSP sent a snippet.
712+
-- ['<C-y>'] = cmp.mapping.confirm { select = true },
713+
--
714+
-- -- If you prefer more traditional completion keymaps,
715+
-- -- you can uncomment the following lines
716+
-- --['<CR>'] = cmp.mapping.confirm { select = true },
717+
-- --['<Tab>'] = cmp.mapping.select_next_item(),
718+
-- --['<S-Tab>'] = cmp.mapping.select_prev_item(),
719+
--
720+
-- -- Manually trigger a completion from nvim-cmp.
721+
-- -- Generally you don't need this, because nvim-cmp will display
722+
-- -- completions whenever it has completion options available.
723+
-- ['<C-Space>'] = cmp.mapping.complete {},
724+
--
725+
-- -- Think of <c-l> as moving to the right of your snippet expansion.
726+
-- -- So if you have a snippet that's like:
727+
-- -- function $name($args)
728+
-- -- $body
729+
-- -- end
730+
-- --
731+
-- -- <c-l> will move you to the right of each of the expansion locations.
732+
-- -- <c-h> is similar, except moving you backwards.
733+
-- ['<C-l>'] = cmp.mapping(function()
734+
-- if luasnip.expand_or_locally_jumpable() then
735+
-- luasnip.expand_or_jump()
736+
-- end
737+
-- end, { 'i', 's' }),
738+
-- ['<C-h>'] = cmp.mapping(function()
739+
-- if luasnip.locally_jumpable(-1) then
740+
-- luasnip.jump(-1)
741+
-- end
742+
-- end, { 'i', 's' }),
743+
--
744+
-- -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
745+
-- -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
746+
-- },
747+
-- sources = {
748+
-- {
749+
-- name = 'lazydev',
750+
-- -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
751+
-- group_index = 0,
752+
-- },
753+
-- { name = 'nvim_lsp' },
754+
-- { name = 'luasnip' },
755+
-- { name = 'path' },
756+
-- { name = 'copilot' },
757+
-- { name = 'buffer' },
758+
-- },
759+
-- }
760+
-- end,
761+
-- },
762762

763763
{ -- You can easily change to a different colorscheme.
764764
-- Change the name of the colorscheme plugin below, and then
@@ -830,7 +830,7 @@ require('lazy').setup({
830830
{ 'nushell/tree-sitter-nu' },
831831
},
832832
opts = {
833-
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'nu' },
833+
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'nu', 'go' },
834834
-- Autoinstall languages that are not installed
835835
auto_install = true,
836836
highlight = {
@@ -864,13 +864,13 @@ require('lazy').setup({
864864
-- require 'kickstart.plugins.lint',
865865
-- require 'kickstart.plugins.autopairs',
866866
-- require 'kickstart.plugins.neo-tree',
867-
require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
867+
-- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
868868

869869
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
870870
-- This is the easiest way to modularize your config.
871871
--
872872
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
873-
{ import = 'custom.plugins' },
873+
-- { import = 'custom.plugins' },
874874
--
875875
-- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
876876
-- Or use telescope!

lua/custom/plugins/copilot-cmp.lua

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
if true then
22
return {}
3-
end
4-
return {
5-
'zbirenbaum/copilot-cmp',
6-
config = function()
7-
require('copilot_cmp').setup()
8-
end,
9-
opts = {
10-
filetypes = {
11-
['.'] = false,
12-
go = true,
3+
else
4+
return {
5+
'zbirenbaum/copilot-cmp',
6+
config = function()
7+
require('copilot_cmp').setup()
8+
end,
9+
opts = {
10+
filetypes = {
11+
['.'] = false,
12+
go = true,
13+
},
1314
},
14-
},
15-
}
15+
}
16+
end

lua/custom/plugins/copilot.lua

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
if true then
22
return {}
3-
end
4-
return {
5-
'zbirenbaum/copilot.lua',
6-
opts = {
7-
suggestion = { enabled = false },
8-
panel = { enabled = false },
9-
filetypes = {
10-
['.'] = false,
11-
go = true,
3+
else
4+
return {
5+
'zbirenbaum/copilot.lua',
6+
opts = {
7+
suggestion = { enabled = false },
8+
panel = { enabled = false },
9+
filetypes = {
10+
['.'] = false,
11+
go = true,
12+
},
1213
},
13-
},
14-
}
14+
}
15+
end

lua/custom/plugins/harpoon.lua

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
if true then
22
return {}
3+
else
4+
-- https://github.com/ThePrimeagen/harpoon/tree/harpoon2 - this branch, follow before removing trueflag above
5+
return {
6+
'ThePrimeagen/harpoon',
7+
branch = 'harpoon2',
8+
dependencies = { { 'nvim-lua/plenary.nvim' } },
9+
}
310
end
4-
-- https://github.com/ThePrimeagen/harpoon/tree/harpoon2 - this branch, follow before removing trueflag above
5-
return {
6-
'ThePrimeagen/harpoon',
7-
branch = 'harpoon2',
8-
dependencies = { { 'nvim-lua/plenary.nvim' } },
9-
}

lua/custom/plugins/mini-nvim.lua

Lines changed: 0 additions & 17 deletions
This file was deleted.

lua/custom/plugins/obsidian-nvim.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if true then
2-
return
2+
return {}
33
else
44
return {
55
'epwalsh/obsidian.nvim',

lua/custom/plugins/pkl-ls.lua

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
if true then
22
return {}
3+
else
4+
return {
5+
'jayadamsmorgan/PklLanguageServer',
6+
build = 'mv Editors/Neovim/pklls-nvim/* .',
7+
config = function()
8+
local capabilities = require('cmp_nvim_lsp').default_capabilities() -- if you are using nvim_cmp for completion
9+
require('pklls-nvim.init').setup {
10+
capabilities = capabilities, -- change or remove this
11+
-- on_attach = custom_on_attach -- change or remove this
12+
-- cmd = custom_path_to_pkl_lsp_server
13+
}
14+
end,
15+
dependencies = {
16+
'neovim/nvim-lspconfig',
17+
},
18+
}
319
end
4-
return {
5-
'jayadamsmorgan/PklLanguageServer',
6-
build = 'mv Editors/Neovim/pklls-nvim/* .',
7-
config = function()
8-
local capabilities = require('cmp_nvim_lsp').default_capabilities() -- if you are using nvim_cmp for completion
9-
require('pklls-nvim.init').setup {
10-
capabilities = capabilities, -- change or remove this
11-
-- on_attach = custom_on_attach -- change or remove this
12-
-- cmd = custom_path_to_pkl_lsp_server
13-
}
14-
end,
15-
dependencies = {
16-
'neovim/nvim-lspconfig',
17-
},
18-
}

0 commit comments

Comments
 (0)