mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 00:25:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

wrappers: move assertion propagation to _shared.nix

Browse source
This commit is contained in:
Matt Sturgeon 2024-09-24 11:25:43 +01:00
parent 6da94195c2
commit 87509bac1f
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
4 changed files with 36 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

3
wrappers/_shared.nix
View file

@ -53,6 +53,9 @@ in
_module.args.nixvimLib = lib.mkDefault config.lib.nixvim.extendedLib; _module.args.nixvimLib = lib.mkDefault config.lib.nixvim.extendedLib;
} }
# Propagate nixvim's assertions to the host modules
(lib.mkIf cfg.enable { inherit (cfg) warnings assertions; })
# Propagate extraFiles to the host modules # Propagate extraFiles to the host modules
(optionalAttrs (filesOpt != null) ( (optionalAttrs (filesOpt != null) (
mkIf (!cfg.wrapRc) ( mkIf (!cfg.wrapRc) (

9
wrappers/darwin.nix
View file

@ -37,13 +37,10 @@ in
imports = [ (import ./_shared.nix { }) ]; imports = [ (import ./_shared.nix { }) ];
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable {
{
environment.systemPackages = [ environment.systemPackages = [
cfg.finalPackage cfg.finalPackage
cfg.printInitPackage cfg.printInitPackage
] ++ (lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs); ] ++ lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs;
} };
{ inherit (cfg) warnings assertions; }
]);
} }

23
wrappers/hm.nix
View file

@ -43,21 +43,18 @@ in
}) })
]; ];
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable {
{
home.packages = [ home.packages = [
cfg.finalPackage cfg.finalPackage
cfg.printInitPackage cfg.printInitPackage
] ++ (lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs); ] ++ lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs;
}
{
inherit (cfg) warnings assertions;
home.sessionVariables = mkIf cfg.defaultEditor { EDITOR = "nvim"; }; home.sessionVariables = mkIf cfg.defaultEditor { EDITOR = "nvim"; };
}
{ programs = mkIf cfg.vimdiffAlias {
programs.bash.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; }; bash.shellAliases.vimdiff = "nvim -d";
programs.fish.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; }; fish.shellAliases.vimdiff = "nvim -d";
programs.zsh.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; }; zsh.shellAliases.vimdiff = "nvim -d";
} };
]); };
} }

15
wrappers/nixos.nix
View file

@ -45,20 +45,17 @@ in
}) })
]; ];
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable {
{
environment.systemPackages = [ environment.systemPackages = [
cfg.finalPackage cfg.finalPackage
cfg.printInitPackage cfg.printInitPackage
] ++ (lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs); ] ++ lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs;
}
{
inherit (cfg) warnings assertions;
programs.neovim.defaultEditor = cfg.defaultEditor;
environment.variables = { environment.variables = {
VIM = mkIf (!cfg.wrapRc) "/etc/nvim"; VIM = mkIf (!cfg.wrapRc) "/etc/nvim";
EDITOR = mkIf cfg.defaultEditor (lib.mkOverride 900 "nvim"); EDITOR = mkIf cfg.defaultEditor (lib.mkOverride 900 "nvim");
}; };
}
]); programs.neovim.defaultEditor = cfg.defaultEditor;
};
} }