From 2442c3ec55bc115263724dba3a045ec1cbff0247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Thu, 18 Jan 2024 00:57:56 +0100 Subject: [PATCH] Fix loading treesitter config --- nvim/lazy-lock.json | 1 + nvim/lua/plugins/init.lua | 1 - nvim/lua/plugins/treesitter.lua | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index c7fc539..50378f3 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -7,6 +7,7 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-snippy": { "branch": "master", "commit": "6e39210aa3a74e2bf6462f492eaf0d436cd2b7d3" }, + "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, "formatter.nvim": { "branch": "master", "commit": "cb4778b8432f1ae86dae4634c0b611cb269a4c2f" }, diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua index a08b069..d946c90 100644 --- a/nvim/lua/plugins/init.lua +++ b/nvim/lua/plugins/init.lua @@ -2,7 +2,6 @@ return { 'ConradIrwin/vim-bracketed-paste', 'airblade/vim-rooter', 'nuchs/vim-hypr-nav', - 'luckasRanarison/tree-sitter-hypr', 'debugloop/telescope-undo.nvim', {'windwp/nvim-autopairs', event = "InsertEnter", opts = {}}, {'NeogitOrg/neogit', dependencies = {"nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim", "sindrets/diffview.nvim"}, config = true, lazy = true}, diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua index 7f61f47..44dd3a3 100644 --- a/nvim/lua/plugins/treesitter.lua +++ b/nvim/lua/plugins/treesitter.lua @@ -1,5 +1,6 @@ return { 'nvim-treesitter/nvim-treesitter', + dependencies = {'luckasRanarison/tree-sitter-hypr'}, build = ":TSUpdate", opts = { ensure_installed = { "cpp", "c", "lua", "vim", "dockerfile", "python", "java", "cmake", "diff", "gitcommit", "html", "css", "javascript", "json", "rust", "sql", "yaml" }, @@ -23,7 +24,7 @@ return { }, }, config = function (_, opts) - require("nvim-treesitter").setup(opts) + require("nvim-treesitter.configs").setup(opts) local parser_config = require("nvim-treesitter.parsers").get_parser_configs() parser_config.hypr = { install_info = {