From 71f2f5bb0d08ee459429af6a0b2c8158533dd3b0 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 27 Aug 2024 22:06:32 +0200 Subject: [PATCH] nvim: treesitter: move some parsers to their own config file in lang directory --- nvim/lua/user/lazy.lua | 4 ++++ nvim/lua/user/plugins/editor/treesitter.lua | 19 +---------------- nvim/lua/user/plugins/lang/blade.lua | 2 +- nvim/lua/user/plugins/lang/cmake.lua | 8 +++++++ nvim/lua/user/plugins/lang/docker.lua | 8 +++++++ nvim/lua/user/plugins/lang/markdown.lua | 23 +++++++++++++++++++++ nvim/lua/user/plugins/lang/ninja.lua | 8 +++++++ 7 files changed, 53 insertions(+), 19 deletions(-) create mode 100644 nvim/lua/user/plugins/lang/cmake.lua create mode 100644 nvim/lua/user/plugins/lang/docker.lua create mode 100644 nvim/lua/user/plugins/lang/markdown.lua create mode 100644 nvim/lua/user/plugins/lang/ninja.lua diff --git a/nvim/lua/user/lazy.lua b/nvim/lua/user/lazy.lua index 2cc4594..595f933 100644 --- a/nvim/lua/user/lazy.lua +++ b/nvim/lua/user/lazy.lua @@ -27,12 +27,16 @@ require("lazy").setup({ { import = "user.plugins.lang.lua" }, { import = "user.plugins.lang.bash" }, { import = "user.plugins.lang.clangd" }, + { import = "user.plugins.lang.cmake" }, + { import = "user.plugins.lang.ninja" }, + { import = "user.plugins.lang.docker" }, { import = "user.plugins.lang.go" }, { import = "user.plugins.lang.rust" }, { import = "user.plugins.lang.php" }, { import = "user.plugins.lang.css" }, { import = "user.plugins.lang.typescript" }, { import = "user.plugins.lang.vue" }, + { import = "user.plugins.lang.markdown" }, }, pkg = { sources = { diff --git a/nvim/lua/user/plugins/editor/treesitter.lua b/nvim/lua/user/plugins/editor/treesitter.lua index c1ab901..204c633 100644 --- a/nvim/lua/user/plugins/editor/treesitter.lua +++ b/nvim/lua/user/plugins/editor/treesitter.lua @@ -29,33 +29,16 @@ return { }, }, opts = { - -- A list of parser names + -- Default parsers. ensure_installed = { - "bash", - "c", - "cpp", - "ninja", - "cmake", - "dockerfile", - "make", "vim", "vimdoc", "query", - "javascript", - -- "typescript", - "css", - "scss", - -- "html", - -- "vue", "json", "jsonc", "yaml", "toml", "xml", - "glsl", - "hlsl", - "markdown", - "markdown_inline", "kdl", }, diff --git a/nvim/lua/user/plugins/lang/blade.lua b/nvim/lua/user/plugins/lang/blade.lua index 8548145..4e23c72 100644 --- a/nvim/lua/user/plugins/lang/blade.lua +++ b/nvim/lua/user/plugins/lang/blade.lua @@ -2,7 +2,7 @@ return { { "nvim-treesitter/nvim-treesitter", opts = { - ensure_installed = { "blade" } + ensure_installed = { "blade", "html" } } }, } diff --git a/nvim/lua/user/plugins/lang/cmake.lua b/nvim/lua/user/plugins/lang/cmake.lua new file mode 100644 index 0000000..37fb5d5 --- /dev/null +++ b/nvim/lua/user/plugins/lang/cmake.lua @@ -0,0 +1,8 @@ +return { + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { "cmake" } + } + }, +} diff --git a/nvim/lua/user/plugins/lang/docker.lua b/nvim/lua/user/plugins/lang/docker.lua new file mode 100644 index 0000000..e3cd55d --- /dev/null +++ b/nvim/lua/user/plugins/lang/docker.lua @@ -0,0 +1,8 @@ +return { + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { "dockerfile" } + } + }, +} diff --git a/nvim/lua/user/plugins/lang/markdown.lua b/nvim/lua/user/plugins/lang/markdown.lua new file mode 100644 index 0000000..c631138 --- /dev/null +++ b/nvim/lua/user/plugins/lang/markdown.lua @@ -0,0 +1,23 @@ +return { + 'MeanderingProgrammer/render-markdown.nvim', + dependencies = { + 'nvim-tree/nvim-web-devicons', + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { "markdown" } + } + } + }, + opts = { + code = { + style = 'normal', + min_width = 45, + left_pad = 2, + right_pad = 2, + border = 'thick', + above = ' ', + below = ' ', + }, + } +} diff --git a/nvim/lua/user/plugins/lang/ninja.lua b/nvim/lua/user/plugins/lang/ninja.lua new file mode 100644 index 0000000..ef4d45c --- /dev/null +++ b/nvim/lua/user/plugins/lang/ninja.lua @@ -0,0 +1,8 @@ +return { + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { "ninja" } + } + }, +}