🪴 my neovim config:)
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

chore: update nixpkgs & vendor treesitter deps

robin 8dfb236a 7aabfc8f

+35 -17
+13 -13
flake.lock
··· 28 28 ] 29 29 }, 30 30 "locked": { 31 - "lastModified": 1770937279, 32 - "narHash": "sha256-ErfbJi1Hfk9Db/Pp1z2rSJZzFADD9gmWzozTIsos9a0=", 31 + "lastModified": 1772121647, 32 + "narHash": "sha256-YV8qKbAMsYvso2/EW5wIXlGrkujYJQXUUDFb4HLyldg=", 33 33 "owner": "tgirlcloud", 34 34 "repo": "gift-wrap", 35 - "rev": "336742742587931d0dc974e5b706f01a27106c64", 35 + "rev": "817ac0c77eaefcdcabbcf96357690696bd461a47", 36 36 "type": "github" 37 37 }, 38 38 "original": { ··· 52 52 ] 53 53 }, 54 54 "locked": { 55 - "lastModified": 1771113898, 56 - "narHash": "sha256-0t6wai1op7OUc4mAhM4BYIbfQMvYmMhW2jXP2VQ0/KA=", 55 + "lastModified": 1772150696, 56 + "narHash": "sha256-0QNL7sbGgKipjr1uXr3KpaPgBWKZmM97l/T7zkWdVqI=", 57 57 "owner": "nix-community", 58 58 "repo": "neovim-nightly-overlay", 59 - "rev": "5e829d6d57633d5d56a0f351564331fca40d507b", 59 + "rev": "de416cbd51404e64540ca4746393d1866b219bae", 60 60 "type": "github" 61 61 }, 62 62 "original": { ··· 68 68 "neovim-src": { 69 69 "flake": false, 70 70 "locked": { 71 - "lastModified": 1771320919, 72 - "narHash": "sha256-4UnU1BCrLW4rg/sAGTEbImbiziUblClqE0JYU07r2Mk=", 71 + "lastModified": 1772185972, 72 + "narHash": "sha256-Wf8BtQb1XIzJ02qLQa52G/wBsWYE60vA5GRjA8o8TpQ=", 73 73 "owner": "neovim", 74 74 "repo": "neovim", 75 - "rev": "dcbe5bdd96749a47098904224ceb09bfafd87ae7", 75 + "rev": "5cbb9d613bf6d8983b5effd7e20343a4ef497c06", 76 76 "type": "github" 77 77 }, 78 78 "original": { ··· 83 83 }, 84 84 "nixpkgs": { 85 85 "locked": { 86 - "lastModified": 1771025653, 87 - "narHash": "sha256-RCtFY7B4CEfUQx10pQbKMU+vPsLcAS7OPjoW2fDrLsk=", 88 - "rev": "7d2ae6d8b8b697b5114a4249d0d958ee5f23d8fe", 86 + "lastModified": 1772082373, 87 + "narHash": "sha256-OgUF+EoJ36hz3jo8qBuizb8suT0mu1n7mzmcGdeOjWE=", 88 + "rev": "26eaeac4e409d7b5a6bf6f90a2a2dc223c78d915", 89 89 "type": "tarball", 90 - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre946098.7d2ae6d8b8b6/nixexprs.tar.xz?lastModified=1771025653&rev=7d2ae6d8b8b697b5114a4249d0d958ee5f23d8fe" 90 + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre954674.26eaeac4e409/nixexprs.tar.xz?lastModified=1772082373&rev=26eaeac4e409d7b5a6bf6f90a2a2dc223c78d915" 91 91 }, 92 92 "original": { 93 93 "type": "tarball",
+22 -4
pkgs/ivy/package.nix
··· 3 3 fetchFromGitHub, 4 4 stdenvNoCC, 5 5 6 + tree-sitter, 6 7 # get extra plugins we don't want to build 7 8 vimPlugins, 8 9 ··· 166 167 # keep-sorted end 167 168 ]; 168 169 169 - treesitterGrammars = vimPlugins.nvim-treesitter.withPlugins ( 170 - p: map (name: p.${name}) grammarsNames 171 - ); 170 + treesitterPlugins = 171 + f: 172 + let 173 + inherit (vimPlugins.nvim-treesitter) 174 + builtGrammars 175 + grammarToPlugin 176 + ; 177 + 178 + selectedGrammars = f (tree-sitter.builtGrammars // builtGrammars); 179 + 180 + grammarPlugins = map grammarToPlugin selectedGrammars; 181 + 182 + queryPlugins = lib.pipe selectedGrammars [ 183 + (map (g: g.associatedQuery or null)) 184 + (lib.filter (q: q != null)) 185 + ]; 186 + in 187 + grammarPlugins ++ queryPlugins; 188 + 189 + treesitterGrammars = treesitterPlugins (p: map (name: p.${name}) grammarsNames); 172 190 in 173 191 wrapNeovim { 174 192 pname = "ivy"; ··· 184 202 185 203 ] 186 204 # install our treesitter grammars 187 - ++ treesitterGrammars.dependencies 205 + ++ treesitterGrammars 188 206 ); 189 207 190 208 optPlugins = flatten [