Skip to content

Commit 1e58d44

Browse files
committed
Remove some plugins that were conflicting or not being used
1 parent 204e2c4 commit 1e58d44

4 files changed

Lines changed: 30 additions & 9 deletions

File tree

lazy-lock.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"fzf-lua": { "branch": "main", "commit": "d9508cc1d05ffcdc91a32dfd38fc1013a56b20da" },
1010
"gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" },
1111
"guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
12-
"harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
1312
"indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
1413
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
1514
"lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },

lua/kickstart/plugins/mini.lua

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ return {
1616
-- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
1717
-- - sd' - [S]urround [D]elete [']quotes
1818
-- - sr)' - [S]urround [R]eplace [)] [']
19-
require('mini.surround').setup()
19+
-- TODO: not sure if I need it, will disable for now
20+
-- require('mini.surround').setup()
2021

2122
-- Simple and easy statusline.
2223
-- You could remove this setup call if you don't like it,
@@ -36,9 +37,6 @@ return {
3637
require('mini.bracketed').setup()
3738
require('mini.operators').setup()
3839
require('mini.bufremove').setup()
39-
require('mini.jump').setup()
40-
require('mini.jump2d').setup()
41-
require('mini.pairs').setup()
4240

4341
-- ... and there is more!
4442
-- Check out: https://github.com/echasnovski/mini.nvim

lua/kickstart/plugins/treesitter.lua

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,34 @@ return {
99
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
1010
config = function(_, opts)
1111
require('nvim-treesitter').setup(opts)
12-
local ensureInstalled =
13-
{ 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'go', 'rust', 'elixir', 'toml', 'yaml' }
12+
local ensureInstalled = {
13+
'bash',
14+
'c',
15+
'diff',
16+
'html',
17+
'lua',
18+
'luadoc',
19+
'markdown',
20+
'markdown_inline',
21+
'query',
22+
'vim',
23+
'vimdoc',
24+
'go',
25+
'rust',
26+
'elixir',
27+
'toml',
28+
'yaml',
29+
'ecma',
30+
'typescript',
31+
}
1432
local alreadyInstalled = require('nvim-treesitter').get_installed 'parsers'
1533
local parsersToInstall = vim
1634
.iter(ensureInstalled)
1735
:filter(function(parser)
1836
return not vim.tbl_contains(alreadyInstalled, parser)
1937
end)
2038
:totable()
21-
print(parsersToInstall)
39+
-- print(parsersToInstall)
2240
if #parsersToInstall > 0 then
2341
require('nvim-treesitter').install(parsersToInstall)
2442
end
@@ -37,6 +55,12 @@ return {
3755
end
3856
end,
3957
})
58+
59+
-- special case for handling tsx files
60+
if parser == 'typescript' then
61+
-- table.insert(filetypes, 'typescriptreact')
62+
vim.treesitter.language.register('typescript', { 'ts', 'typescript', 'typescriptreact' })
63+
end
4064
end
4165
end,
4266
-- There are additional nvim-treesitter modules that you can use to interact

lua/lazy-plugins.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ require('lazy').setup({
5858
require 'custom/plugins/oil',
5959
require 'custom/plugins/trouble',
6060
require 'custom/plugins/flash',
61-
require 'custom/plugins/harpoon',
61+
-- require 'custom/plugins/harpoon',
6262
require 'custom/plugins/lualine',
6363
require 'custom/plugins/noice',
6464
require 'custom/plugins/theme',

0 commit comments

Comments
 (0)