Remove some plugins that were conflicting or not being used
This commit is contained in:
parent
204e2c4f61
commit
1e58d4494c
|
|
@ -9,7 +9,6 @@
|
||||||
"fzf-lua": { "branch": "main", "commit": "d9508cc1d05ffcdc91a32dfd38fc1013a56b20da" },
|
"fzf-lua": { "branch": "main", "commit": "d9508cc1d05ffcdc91a32dfd38fc1013a56b20da" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" },
|
"gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" },
|
||||||
"guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
|
"guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
|
||||||
"harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
|
|
||||||
"indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
|
"indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
|
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
|
||||||
"lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
|
"lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,8 @@ return {
|
||||||
-- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
|
-- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
|
||||||
-- - sd' - [S]urround [D]elete [']quotes
|
-- - sd' - [S]urround [D]elete [']quotes
|
||||||
-- - sr)' - [S]urround [R]eplace [)] [']
|
-- - sr)' - [S]urround [R]eplace [)] [']
|
||||||
require('mini.surround').setup()
|
-- TODO: not sure if I need it, will disable for now
|
||||||
|
-- require('mini.surround').setup()
|
||||||
|
|
||||||
-- Simple and easy statusline.
|
-- Simple and easy statusline.
|
||||||
-- You could remove this setup call if you don't like it,
|
-- You could remove this setup call if you don't like it,
|
||||||
|
|
@ -36,9 +37,6 @@ return {
|
||||||
require('mini.bracketed').setup()
|
require('mini.bracketed').setup()
|
||||||
require('mini.operators').setup()
|
require('mini.operators').setup()
|
||||||
require('mini.bufremove').setup()
|
require('mini.bufremove').setup()
|
||||||
require('mini.jump').setup()
|
|
||||||
require('mini.jump2d').setup()
|
|
||||||
require('mini.pairs').setup()
|
|
||||||
|
|
||||||
-- ... and there is more!
|
-- ... and there is more!
|
||||||
-- Check out: https://github.com/echasnovski/mini.nvim
|
-- Check out: https://github.com/echasnovski/mini.nvim
|
||||||
|
|
|
||||||
|
|
@ -9,8 +9,26 @@ return {
|
||||||
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
|
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
|
||||||
config = function(_, opts)
|
config = function(_, opts)
|
||||||
require('nvim-treesitter').setup(opts)
|
require('nvim-treesitter').setup(opts)
|
||||||
local ensureInstalled =
|
local ensureInstalled = {
|
||||||
{ 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'go', 'rust', 'elixir', 'toml', 'yaml' }
|
'bash',
|
||||||
|
'c',
|
||||||
|
'diff',
|
||||||
|
'html',
|
||||||
|
'lua',
|
||||||
|
'luadoc',
|
||||||
|
'markdown',
|
||||||
|
'markdown_inline',
|
||||||
|
'query',
|
||||||
|
'vim',
|
||||||
|
'vimdoc',
|
||||||
|
'go',
|
||||||
|
'rust',
|
||||||
|
'elixir',
|
||||||
|
'toml',
|
||||||
|
'yaml',
|
||||||
|
'ecma',
|
||||||
|
'typescript',
|
||||||
|
}
|
||||||
local alreadyInstalled = require('nvim-treesitter').get_installed 'parsers'
|
local alreadyInstalled = require('nvim-treesitter').get_installed 'parsers'
|
||||||
local parsersToInstall = vim
|
local parsersToInstall = vim
|
||||||
.iter(ensureInstalled)
|
.iter(ensureInstalled)
|
||||||
|
|
@ -18,7 +36,7 @@ return {
|
||||||
return not vim.tbl_contains(alreadyInstalled, parser)
|
return not vim.tbl_contains(alreadyInstalled, parser)
|
||||||
end)
|
end)
|
||||||
:totable()
|
:totable()
|
||||||
print(parsersToInstall)
|
-- print(parsersToInstall)
|
||||||
if #parsersToInstall > 0 then
|
if #parsersToInstall > 0 then
|
||||||
require('nvim-treesitter').install(parsersToInstall)
|
require('nvim-treesitter').install(parsersToInstall)
|
||||||
end
|
end
|
||||||
|
|
@ -37,6 +55,12 @@ return {
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
-- special case for handling tsx files
|
||||||
|
if parser == 'typescript' then
|
||||||
|
-- table.insert(filetypes, 'typescriptreact')
|
||||||
|
vim.treesitter.language.register('typescript', { 'ts', 'typescript', 'typescriptreact' })
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
-- There are additional nvim-treesitter modules that you can use to interact
|
-- There are additional nvim-treesitter modules that you can use to interact
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ require('lazy').setup({
|
||||||
require 'custom/plugins/oil',
|
require 'custom/plugins/oil',
|
||||||
require 'custom/plugins/trouble',
|
require 'custom/plugins/trouble',
|
||||||
require 'custom/plugins/flash',
|
require 'custom/plugins/flash',
|
||||||
require 'custom/plugins/harpoon',
|
-- require 'custom/plugins/harpoon',
|
||||||
require 'custom/plugins/lualine',
|
require 'custom/plugins/lualine',
|
||||||
require 'custom/plugins/noice',
|
require 'custom/plugins/noice',
|
||||||
require 'custom/plugins/theme',
|
require 'custom/plugins/theme',
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue