eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-26 21:19:45 +01:00
Code Issues Releases Wiki Activity

Move integration-common.nix to nixos/common.nix

Browse source
This commit is contained in:
Naïm Favier 2022-06-16 12:26:57 +02:00 committed by Robert Helgesson
parent 69e804839e
commit 586ac1fd58
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nix-darwin/default.nix
View file

@ -7,7 +7,7 @@ let
cfg = config.home-manager; cfg = config.home-manager;
in { in {
imports = [ ../integration-common.nix ]; imports = [ ../nixos/common.nix ];
config = mkMerge [ config = mkMerge [
{ home-manager.extraSpecialArgs.darwinConfig = config; } { home-manager.extraSpecialArgs.darwinConfig = config; }

6
integration-common.nix → nixos/common.nix
View file

@ -9,17 +9,17 @@ let
cfg = config.home-manager; cfg = config.home-manager;
extendedLib = import ./modules/lib/stdlib-extended.nix pkgs.lib; extendedLib = import ../modules/lib/stdlib-extended.nix pkgs.lib;
hmModule' = types.submoduleWith { hmModule' = types.submoduleWith {
specialArgs = { specialArgs = {
lib = extendedLib; lib = extendedLib;
osConfig = config; osConfig = config;
modulesPath = builtins.toString ./modules; modulesPath = builtins.toString ../modules;
} // cfg.extraSpecialArgs; } // cfg.extraSpecialArgs;
modules = [ modules = [
({ name, ... }: { ({ name, ... }: {
imports = import ./modules/modules.nix { imports = import ../modules/modules.nix {
inherit pkgs; inherit pkgs;
lib = extendedLib; lib = extendedLib;
useNixpkgsModule = !cfg.useGlobalPkgs; useNixpkgsModule = !cfg.useGlobalPkgs;

2
nixos/default.nix
View file

@ -11,7 +11,7 @@ let
} // optionalAttrs cfg.verbose { VERBOSE = "1"; }; } // optionalAttrs cfg.verbose { VERBOSE = "1"; };
in { in {
imports = [ ../integration-common.nix ]; imports = [ ./common.nix ];
config = mkMerge [ config = mkMerge [
{ {