From 3b64d08ed86fb60dd623ce1faacb536ff26d2960 Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Mon, 6 Oct 2025 16:05:56 +0200 Subject: [PATCH] Fix treesitter --- flake.lock | 119 ++++++++++++++++++++++++++++++++++++++++++++++------- flake.nix | 7 +++- 2 files changed, 110 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index bb875ad..9d6714f 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1759425175, - "narHash": "sha256-RiZ/hh21blseTtqH+y1qfnKceIBJjAp6zHQjWs70C/4=", + "lastModified": 1759739185, + "narHash": "sha256-mO3kaYc+xdbwf8roqexsKq1ocQCQsZzFha0fIJMbRRw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d9b6b807f63697236c11efd101e85c051a532213", + "rev": "722d8e6f96a0fd1dcf3d49a1f2dc38aec8c4039d", "type": "github" }, "original": { @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1759337100, - "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", + "lastModified": 1759711004, + "narHash": "sha256-B39NxeKCnK3DJlmJKIts6njcXcVVASLUChDNmRl4dxQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", + "rev": "6f4021da5d2bb5ea7cb782ff413ecb7062066820", "type": "github" }, "original": { @@ -109,11 +109,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1759281824, - "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", + "lastModified": 1759580034, + "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b5be50345d4113d04ba58c444348849f5585b4a", + "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", "type": "github" }, "original": { @@ -141,11 +141,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -202,12 +218,85 @@ "type": "github" } }, + "nvim-treesitter": { + "flake": false, + "locked": { + "lastModified": 1759569217, + "narHash": "sha256-BughuOIwOvSzNyxRQy1g0X5zYFxipEaF/q4jeNKiB8g=", + "owner": "nvim-treesitter", + "repo": "nvim-treesitter", + "rev": "01ced7499fb07f6c94abd316414ef198bd6e7058", + "type": "github" + }, + "original": { + "owner": "nvim-treesitter", + "ref": "main", + "repo": "nvim-treesitter", + "type": "github" + } + }, + "nvim-treesitter-main": { + "inputs": { + "nixpkgs": "nixpkgs_3", + "nvim-treesitter": "nvim-treesitter_2", + "nvim-treesitter-textobjects": "nvim-treesitter-textobjects" + }, + "locked": { + "lastModified": 1759559567, + "narHash": "sha256-cNu8MIRumBeW1HJK8c8IM6ge1yalz4xS5j5RCDbhf0Y=", + "owner": "iofq", + "repo": "nvim-treesitter-main", + "rev": "1f19cc0a907328d8dbf467ee9fe216277628d366", + "type": "github" + }, + "original": { + "owner": "iofq", + "repo": "nvim-treesitter-main", + "type": "github" + } + }, + "nvim-treesitter-textobjects": { + "flake": false, + "locked": { + "lastModified": 1756368113, + "narHash": "sha256-+KmOpRi4JAqm6UqYdtk80jwFrJhLCs0lZM/Liofq0R4=", + "owner": "nvim-treesitter", + "repo": "nvim-treesitter-textobjects", + "rev": "1b2d85d3de6114c4bcea89ffb2cd1ce9e3a19931", + "type": "github" + }, + "original": { + "owner": "nvim-treesitter", + "ref": "main", + "repo": "nvim-treesitter-textobjects", + "type": "github" + } + }, + "nvim-treesitter_2": { + "flake": false, + "locked": { + "lastModified": 1759376029, + "narHash": "sha256-Cu6Wg9SKJpYAkp8DPAXe4Rf9OSSWW2wNdmCkYtl//fw=", + "owner": "nvim-treesitter", + "repo": "nvim-treesitter", + "rev": "99bd52ba56a4b7c9a8cc50a6140180755e76fac6", + "type": "github" + }, + "original": { + "owner": "nvim-treesitter", + "ref": "main", + "repo": "nvim-treesitter", + "type": "github" + } + }, "root": { "inputs": { "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", + "nvim-treesitter": "nvim-treesitter", + "nvim-treesitter-main": "nvim-treesitter-main", "vim-org-roam": "vim-org-roam" } }, diff --git a/flake.nix b/flake.nix index 1c87b02..94012c3 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,8 @@ url = "github:chipsenkbeil/org-roam.nvim"; flake = false; }; + # Workaround until nvim-treesitter main branch is used in nixpkgs + nvim-treesitter-main.url = "github:iofq/nvim-treesitter-main"; }; outputs = @@ -44,7 +46,10 @@ "nvidia-x11" "nvidia-settings" ]; - overlays = extraOverlays ++ (pkgs.lib.attrValues self.overlays); + overlays = + extraOverlays + ++ (pkgs.lib.attrValues self.overlays) + ++ [ inputs.nvim-treesitter-main.overlays.default ]; }; pkgs = mkPkgs nixpkgs [ ];