mirror of
https://github.com/LunarVim/LunarVim.git
synced 2024-09-21 02:55:09 +02:00
Merge branch 'master' of github.com:ChristianChiarulli/LunarVim
This commit is contained in:
commit
c0c7e170af
2 changed files with 43 additions and 7 deletions
|
@ -1,3 +1,4 @@
|
||||||
|
-- TODO refacor this whole file and treesitter in general
|
||||||
-- if not package.loaded['nvim-treesitter'] then return end
|
-- if not package.loaded['nvim-treesitter'] then return end
|
||||||
--
|
--
|
||||||
-- Custom parsers
|
-- Custom parsers
|
||||||
|
@ -99,7 +100,7 @@ require("nvim-treesitter.configs").setup {
|
||||||
-- indent = {enable = true, disable = {"python", "html", "javascript"}},
|
-- indent = {enable = true, disable = {"python", "html", "javascript"}},
|
||||||
-- TODO seems to be broken
|
-- TODO seems to be broken
|
||||||
indent = { enable = { "javascriptreact" } },
|
indent = { enable = { "javascriptreact" } },
|
||||||
-- autotag = { enable = O.plugin.ts_autotag.active },
|
autotag = { enable = O.plugin.ts_autotag.active },
|
||||||
textobjects = {
|
textobjects = {
|
||||||
swap = {
|
swap = {
|
||||||
enable = O.plugin.ts_textobjects,
|
enable = O.plugin.ts_textobjects,
|
||||||
|
@ -133,9 +134,9 @@ require("nvim-treesitter.configs").setup {
|
||||||
show_help = "?",
|
show_help = "?",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
-- rainbow = {
|
rainbow = {
|
||||||
-- enable = O.plugin.ts_rainbow.active,
|
enable = O.plugin.ts_rainbow.active,
|
||||||
-- extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean
|
extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean
|
||||||
-- max_file_lines = 1000, -- Do not enable for files with more than 1000 lines, int
|
max_file_lines = 1000, -- Do not enable for files with more than 1000 lines, int
|
||||||
-- },
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -315,6 +315,7 @@ return require("packer").startup(function(use)
|
||||||
end,
|
end,
|
||||||
disable = not O.plugin.lsp_rooter.active,
|
disable = not O.plugin.lsp_rooter.active,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Markdown preview
|
-- Markdown preview
|
||||||
use {
|
use {
|
||||||
"iamcco/markdown-preview.nvim",
|
"iamcco/markdown-preview.nvim",
|
||||||
|
@ -322,18 +323,21 @@ return require("packer").startup(function(use)
|
||||||
ft = "markdown",
|
ft = "markdown",
|
||||||
disable = not O.plugin.markdown_preview.active,
|
disable = not O.plugin.markdown_preview.active,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Interactive scratchpad
|
-- Interactive scratchpad
|
||||||
use {
|
use {
|
||||||
"metakirby5/codi.vim",
|
"metakirby5/codi.vim",
|
||||||
cmd = "Codi",
|
cmd = "Codi",
|
||||||
disable = not O.plugin.codi.active,
|
disable = not O.plugin.codi.active,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Use fzy for telescope
|
-- Use fzy for telescope
|
||||||
use {
|
use {
|
||||||
"nvim-telescope/telescope-fzy-native.nvim",
|
"nvim-telescope/telescope-fzy-native.nvim",
|
||||||
event = "BufRead",
|
event = "BufRead",
|
||||||
disable = not O.plugin.telescope_fzy.active,
|
disable = not O.plugin.telescope_fzy.active,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Use project for telescope
|
-- Use project for telescope
|
||||||
use {
|
use {
|
||||||
"nvim-telescope/telescope-project.nvim",
|
"nvim-telescope/telescope-project.nvim",
|
||||||
|
@ -347,24 +351,28 @@ return require("packer").startup(function(use)
|
||||||
event = "BufRead",
|
event = "BufRead",
|
||||||
disable = not O.plugin.sanegx.active,
|
disable = not O.plugin.sanegx.active,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Sane gx for netrw_gx bug
|
-- Sane gx for netrw_gx bug
|
||||||
use {
|
use {
|
||||||
"folke/todo-comments.nvim",
|
"folke/todo-comments.nvim",
|
||||||
event = "BufRead",
|
event = "BufRead",
|
||||||
disable = not O.plugin.todo_comments.active,
|
disable = not O.plugin.todo_comments.active,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- LSP Colors
|
-- LSP Colors
|
||||||
use {
|
use {
|
||||||
"folke/lsp-colors.nvim",
|
"folke/lsp-colors.nvim",
|
||||||
event = "BufRead",
|
event = "BufRead",
|
||||||
disable = not O.plugin.lsp_colors.active,
|
disable = not O.plugin.lsp_colors.active,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Git Blame
|
-- Git Blame
|
||||||
use {
|
use {
|
||||||
"f-person/git-blame.nvim",
|
"f-person/git-blame.nvim",
|
||||||
event = "BufRead",
|
event = "BufRead",
|
||||||
disable = not O.plugin.git_blame.active,
|
disable = not O.plugin.git_blame.active,
|
||||||
}
|
}
|
||||||
|
|
||||||
use {
|
use {
|
||||||
"ruifm/gitlinker.nvim",
|
"ruifm/gitlinker.nvim",
|
||||||
event = "BufRead",
|
event = "BufRead",
|
||||||
|
@ -386,24 +394,28 @@ return require("packer").startup(function(use)
|
||||||
disable = not O.plugin.gitlinker.active,
|
disable = not O.plugin.gitlinker.active,
|
||||||
requires = "nvim-lua/plenary.nvim",
|
requires = "nvim-lua/plenary.nvim",
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Lazygit
|
-- Lazygit
|
||||||
use {
|
use {
|
||||||
"kdheepak/lazygit.nvim",
|
"kdheepak/lazygit.nvim",
|
||||||
cmd = "LazyGit",
|
cmd = "LazyGit",
|
||||||
disable = not O.plugin.lazygit.active,
|
disable = not O.plugin.lazygit.active,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Octo
|
-- Octo
|
||||||
use {
|
use {
|
||||||
"pwntester/octo.nvim",
|
"pwntester/octo.nvim",
|
||||||
event = "BufRead",
|
event = "BufRead",
|
||||||
disable = not O.plugin.octo.active,
|
disable = not O.plugin.octo.active,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Diffview
|
-- Diffview
|
||||||
use {
|
use {
|
||||||
"sindrets/diffview.nvim",
|
"sindrets/diffview.nvim",
|
||||||
event = "BufRead",
|
event = "BufRead",
|
||||||
disable = not O.plugin.diffview.active,
|
disable = not O.plugin.diffview.active,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Easily Create Gists
|
-- Easily Create Gists
|
||||||
use {
|
use {
|
||||||
"mattn/vim-gist",
|
"mattn/vim-gist",
|
||||||
|
@ -411,12 +423,14 @@ return require("packer").startup(function(use)
|
||||||
disable = not O.plugin.gist.active,
|
disable = not O.plugin.gist.active,
|
||||||
requires = "mattn/webapi-vim",
|
requires = "mattn/webapi-vim",
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Lush Create Color Schemes
|
-- Lush Create Color Schemes
|
||||||
use {
|
use {
|
||||||
"rktjmp/lush.nvim",
|
"rktjmp/lush.nvim",
|
||||||
-- cmd = {"LushRunQuickstart", "LushRunTutorial", "Lushify"},
|
-- cmd = {"LushRunQuickstart", "LushRunTutorial", "Lushify"},
|
||||||
disable = not O.plugin.lush.active,
|
disable = not O.plugin.lush.active,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- HTML preview
|
-- HTML preview
|
||||||
use {
|
use {
|
||||||
"turbio/bracey.vim",
|
"turbio/bracey.vim",
|
||||||
|
@ -432,7 +446,13 @@ return require("packer").startup(function(use)
|
||||||
}
|
}
|
||||||
|
|
||||||
-- LANGUAGE SPECIFIC GOES HERE
|
-- LANGUAGE SPECIFIC GOES HERE
|
||||||
use { "lervag/vimtex", ft = "tex", config = function() require("lv-vimtex") end }
|
use {
|
||||||
|
"lervag/vimtex",
|
||||||
|
ft = "tex",
|
||||||
|
config = function()
|
||||||
|
require "lv-vimtex"
|
||||||
|
end,
|
||||||
|
}
|
||||||
|
|
||||||
-- Rust tools
|
-- Rust tools
|
||||||
-- TODO: use lazy loading maybe?
|
-- TODO: use lazy loading maybe?
|
||||||
|
@ -479,16 +499,31 @@ return require("packer").startup(function(use)
|
||||||
disable = not O.plugin.tabnine.active,
|
disable = not O.plugin.tabnine.active,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
-- Pretty parentheses
|
||||||
|
use {
|
||||||
|
"p00f/nvim-ts-rainbow",
|
||||||
|
disable = not O.plugin.ts_rainbow.active,
|
||||||
|
}
|
||||||
|
|
||||||
|
-- Autotags <div>|</div>
|
||||||
|
use {
|
||||||
|
"windwp/nvim-ts-autotag",
|
||||||
|
event = "InsertEnter",
|
||||||
|
disable = not O.plugin.ts_autotag.active,
|
||||||
|
}
|
||||||
|
|
||||||
-- Custom semantic text objects
|
-- Custom semantic text objects
|
||||||
use {
|
use {
|
||||||
"nvim-treesitter/nvim-treesitter-textobjects",
|
"nvim-treesitter/nvim-treesitter-textobjects",
|
||||||
disable = not O.plugin.ts_textobjects.active,
|
disable = not O.plugin.ts_textobjects.active,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Smart text objects
|
-- Smart text objects
|
||||||
use {
|
use {
|
||||||
"RRethy/nvim-treesitter-textsubjects",
|
"RRethy/nvim-treesitter-textsubjects",
|
||||||
disable = not O.plugin.ts_textsubjects.active,
|
disable = not O.plugin.ts_textsubjects.active,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Text objects using hint labels
|
-- Text objects using hint labels
|
||||||
use {
|
use {
|
||||||
"mfussenegger/nvim-ts-hint-textobject",
|
"mfussenegger/nvim-ts-hint-textobject",
|
||||||
|
|
Loading…
Reference in a new issue