traxys/Nixfiles
1
0
Fork 0
mirror of https://github.com/traxys/Nixfiles.git synced 2026-03-12 23:51:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

neovim: Expose update nvim treesitter

Browse source
This commit is contained in:
traxys 2024-03-11 12:46:13 +01:00
parent 08aa83ee31
commit e5f7538e39
2 changed files with 34 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

46
flake.nix
View file

@ -320,7 +320,16 @@
// {
glaurung = inputs.glaurung.defaultPackage."${system}";
raclette = inputs.raclette.defaultPackage."${system}";
neovimTraxys = let
roaming_proxy = inputs.roaming_proxy.defaultPackage."${system}";
update-nvim-treesitter = callPackage ./neovim/nvim-treesitter {
inherit (self.packages."${system}") nvim-treesitter upstream;
};
inherit (nixpkgs-traxys.legacyPackages."${system}") groovy-language-server;
inherit (inputs.mujmap.packages."${system}") mujmap;
}
// (
let
inputsMatching = with builtins;
prefix:
nixpkgs.lib.mapAttrs'
@ -354,22 +363,29 @@
};
nixvim' = inputs.nixvim.legacyPackages."${system}";
neovimNightly = inputs.neovim-flake.packages."${system}".neovim;
in
callPackage ({pkgs}:
nixvim'.makeNixvimWithModule {
module = import ./neovim;
pkgs = (pkgs.extend neovimPlugins).extend (final: prev: {
vimPlugins = prev.vimPlugins.extend (final': prev': {
nvim-treesitter = prev'.nvim-treesitter.overrideAttrs (
prev.callPackage ./neovim/nvim-treesitter/override.nix {} final' prev'
);
});
callPackage ({pkgs}: let
neovimPkgs = (pkgs.extend neovimPlugins).extend (final: prev: {
vimPlugins = prev.vimPlugins.extend (final': prev': {
nvim-treesitter = prev'.nvim-treesitter.overrideAttrs (
prev.callPackage ./neovim/nvim-treesitter/override.nix {} final' prev'
);
});
}) {};
roaming_proxy = inputs.roaming_proxy.defaultPackage."${system}";
inherit (nixpkgs-traxys.legacyPackages."${system}") groovy-language-server;
inherit (inputs.mujmap.packages."${system}") mujmap;
};
});
in {
neovimTraxys = nixvim'.makeNixvimWithModule {
module = {
imports = [./neovim];
package = neovimNightly;
};
pkgs = neovimPkgs;
};
update-nvim-treesitter = neovimPkgs.callPackage ./neovim/nvim-treesitter {
upstream = neovimNightly;
};
}) {}
);
extraInfo = import ./extra_info.nix;
in {

6
neovim/nvim-treesitter/default.nix
View file

@ -1,7 +1,7 @@
{
lib,
upstream,
nvim-treesitter,
vimPlugins,
neovimUtils,
nurl,
python3,
@ -14,7 +14,7 @@
neovim-unwrapped = upstream;
})
.makeNeovimConfig {
plugins = [nvim-treesitter];
plugins = [vimPlugins.nvim-treesitter];
};
in
stdenv.mkDerivation {
@ -29,7 +29,7 @@ in
mkdir -p $out/bin
cat $src > $out/bin/update-nvim-treesitter
chmod +x $out/bin/update-nvim-treesitter
wrapProgram $out/bin/update-nvim-treesitter --set NVIM_TREESITTER "${nvim-treesitter}" --prefix PATH : ${
wrapProgram $out/bin/update-nvim-treesitter --set NVIM_TREESITTER "${vimPlugins.nvim-treesitter}" --prefix PATH : ${
lib.makeBinPath [
(wrapNeovimUnstable upstream neovimTs)
nurl