diff options
Diffstat (limited to 'nvim')
| -rw-r--r-- | nvim/lua/config/autocmds.lua | 37 | ||||
| -rw-r--r-- | nvim/lua/config/treesitter.lua | 23 | ||||
| -rw-r--r-- | nvim/lua/plugins/treesitter.lua | 22 |
3 files changed, 37 insertions, 45 deletions
diff --git a/nvim/lua/config/autocmds.lua b/nvim/lua/config/autocmds.lua index 52c56f9..a4ce4ae 100644 --- a/nvim/lua/config/autocmds.lua +++ b/nvim/lua/config/autocmds.lua | |||
| @@ -1,30 +1,17 @@ | |||
| 1 | -- https://github.com/nvim-treesitter/nvim-treesitter/blob/main/doc/nvim-treesitter.txt | 1 | -- https://github.com/nvim-treesitter/nvim-treesitter/blob/main/doc/nvim-treesitter.txt |
| 2 | local treesitter_languages = require("config.treesitter").languages | ||
| 3 | |||
| 4 | local function enable_treesitter_features() | ||
| 5 | if not pcall(vim.treesitter.start) then return end | ||
| 6 | |||
| 7 | vim.wo.foldmethod = "expr" | ||
| 8 | vim.wo.foldexpr = "v:lua.vim.treesitter.foldexpr()" | ||
| 9 | vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" | ||
| 10 | end | ||
| 11 | |||
| 2 | vim.api.nvim_create_autocmd("FileType", { | 12 | vim.api.nvim_create_autocmd("FileType", { |
| 3 | pattern = { | 13 | pattern = treesitter_languages, |
| 4 | "bash", | 14 | callback = enable_treesitter_features, |
| 5 | "c", | ||
| 6 | "cpp", | ||
| 7 | "html", | ||
| 8 | "javascript", | ||
| 9 | "lua", | ||
| 10 | "make", | ||
| 11 | "markdown", | ||
| 12 | "markdown_inline", | ||
| 13 | "prisma", | ||
| 14 | "python", | ||
| 15 | "typescript", | ||
| 16 | "vim", | ||
| 17 | "vim", | ||
| 18 | "vimdoc", | ||
| 19 | "yaml", | ||
| 20 | "zsh", | ||
| 21 | }, | ||
| 22 | callback = function() | ||
| 23 | vim.treesitter.start() | ||
| 24 | vim.wo.foldexpr = "v:lua.vim.treesitter.foldexpr()" | ||
| 25 | vim.wo.foldmethod = "expr" | ||
| 26 | vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" | ||
| 27 | end, | ||
| 28 | }) | 15 | }) |
| 29 | 16 | ||
| 30 | -- https://github.com/nvim-tree/nvim-tree.lua/wiki/Open-At-Startup | 17 | -- https://github.com/nvim-tree/nvim-tree.lua/wiki/Open-At-Startup |
diff --git a/nvim/lua/config/treesitter.lua b/nvim/lua/config/treesitter.lua new file mode 100644 index 0000000..c1e25a9 --- /dev/null +++ b/nvim/lua/config/treesitter.lua | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | local M = {} | ||
| 2 | |||
| 3 | -- https://github.com/nvim-treesitter/nvim-treesitter/blob/main/SUPPORTED_LANGUAGES.md | ||
| 4 | M.languages = { | ||
| 5 | "bash", | ||
| 6 | "c", | ||
| 7 | "cpp", | ||
| 8 | "html", | ||
| 9 | "javascript", | ||
| 10 | "lua", | ||
| 11 | "make", | ||
| 12 | "markdown", | ||
| 13 | "markdown_inline", | ||
| 14 | "prisma", | ||
| 15 | "python", | ||
| 16 | "typescript", | ||
| 17 | "vim", | ||
| 18 | "vimdoc", | ||
| 19 | "yaml", | ||
| 20 | "zsh", | ||
| 21 | } | ||
| 22 | |||
| 23 | return M | ||
diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua index 2bbc4c1..235c0b5 100644 --- a/nvim/lua/plugins/treesitter.lua +++ b/nvim/lua/plugins/treesitter.lua | |||
| @@ -12,29 +12,11 @@ return { | |||
| 12 | lazy = false, | 12 | lazy = false, |
| 13 | config = function() | 13 | config = function() |
| 14 | local treesitter = require("nvim-treesitter") | 14 | local treesitter = require("nvim-treesitter") |
| 15 | local langs = require("config.treesitter").languages | ||
| 15 | 16 | ||
| 16 | -- treesitter.setup({}) | 17 | -- treesitter.setup({}) |
| 17 | 18 | ||
| 18 | -- https://github.com/nvim-treesitter/nvim-treesitter/blob/main/SUPPORTED_LANGUAGES.md | 19 | treesitter.install(langs) |
| 19 | treesitter.install({ | ||
| 20 | "bash", | ||
| 21 | "c", | ||
| 22 | "cpp", | ||
| 23 | "html", | ||
| 24 | "javascript", | ||
| 25 | "lua", | ||
| 26 | "make", | ||
| 27 | "markdown", | ||
| 28 | "markdown_inline", | ||
| 29 | "prisma", | ||
| 30 | "python", | ||
| 31 | "typescript", | ||
| 32 | "vim", | ||
| 33 | "vim", | ||
| 34 | "vimdoc", | ||
| 35 | "yaml", | ||
| 36 | "zsh", | ||
| 37 | }) | ||
| 38 | end, | 20 | end, |
| 39 | }, | 21 | }, |
| 40 | } | 22 | } |
