mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-20 16:15:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

modules/output: move symlinkJoin to build.package

Browse source
This commit is contained in:
Matt Sturgeon 2025-01-20 13:50:50 +00:00
parent 731699a24c
commit 00586f8f1b
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
7 changed files with 62 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

3
wrappers/darwin.nix
View file

@ -26,7 +26,6 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [
cfg.build.package
cfg.build.printInitPackage
] ++ lib.optional cfg.enableMan cfg.build.manDocsPackage;
];
};
}

3
wrappers/hm.nix
View file

@ -34,8 +34,7 @@ in
config = mkIf cfg.enable {
home.packages = [
cfg.build.package
cfg.build.printInitPackage
] ++ lib.optional cfg.enableMan cfg.build.manDocsPackage;
];
home.sessionVariables = mkIf cfg.defaultEditor { EDITOR = "nvim"; };

3
wrappers/nixos.nix
View file

@ -35,8 +35,7 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [
cfg.build.package
cfg.build.printInitPackage
] ++ lib.optional cfg.enableMan cfg.build.manDocsPackage;
];
environment.variables = {
VIM = mkIf (!cfg.wrapRc) "/etc/nvim";

36
wrappers/standalone.nix
View file

@ -39,28 +39,20 @@ let
];
inherit extraSpecialArgs;
};
inherit (nixvimConfig.config) enableMan build;
inherit (nixvimConfig._module.args.pkgs) symlinkJoin;
in
(symlinkJoin {
name = "nixvim";
paths = [
build.package
build.printInitPackage
] ++ lib.optional enableMan build.manDocsPackage;
meta.mainProgram = "nvim";
})
// rec {
inherit (nixvimConfig) config options;
extend =
extension:
mkNvim {
imports = [
mod
extension
];
};
nixvimExtend = lib.warn "<nixvim>.nixvimExtend has been renamed to <nixvim>.extend" extend;
};
nixvimConfig.config.build.package.overrideAttrs (old: {
passthru = old.passthru or { } // rec {
inherit (nixvimConfig) config options;
extend =
extension:
mkNvim {
imports = [
mod
extension
];
};
nixvimExtend = lib.warn "<nixvim>.nixvimExtend has been renamed to <nixvim>.extend" extend;
};
});
in
mkNvim module