From 3dceb67a34a556923993be664a8c687d0d27cc45 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Sat, 11 Dec 2021 15:09:11 +0000 Subject: [PATCH] treesitter: don't use packer --- flake.lock | 6 +++--- plugins/languages/treesitter.nix | 15 +++++---------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index df70beea..96aafd6d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1635792138, - "narHash": "sha256-D79GqaYrwgyM4wvOPbQeKveAHROnVh97F36iSGZO9uA=", + "lastModified": 1638986258, + "narHash": "sha256-OceRdctKZRSgqQxVRvvNB0MaEnFMzQqjUffecoDE9eI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b165ce0c4efbb74246714b5c66b6bcdce8cde175", + "rev": "581d2d6c9cd5c289002203581d8aa0861963a933", "type": "github" }, "original": { diff --git a/plugins/languages/treesitter.nix b/plugins/languages/treesitter.nix index abe228a0..439f7898 100644 --- a/plugins/languages/treesitter.nix +++ b/plugins/languages/treesitter.nix @@ -75,16 +75,11 @@ in }; in mkIf cfg.enable { programs.nixvim = { - plugins.packer = { - enable = true; - plugins = [{ - name = "nvim-treesitter/nvim-treesitter"; - run = ":TSUpdate"; - config = helpers.mkRaw ''function() - require('nvim-treesitter.configs').setup(${helpers.toLuaObject tsOptions}) - end''; - }]; - }; + extraConfigLua = '' + require('nvim-treesitter.configs').setup(${helpers.toLuaObject tsOptions}) + ''; + + extraPlugins = [ pkgs.vimPlugins.nvim-treesitter ]; extraPackages = [ pkgs.tree-sitter pkgs.nodejs ]; options = mkIf cfg.folding {