refactor of user
This commit is contained in:
1 parent
a81a8ac57b
commit
e7d22b40ff
9 files changed
+75
-199
No files matched your search
+35
-15
@@ -2,6 +2,8 @@
|
||||
, home-manager
|
||||
, nix-darwin
|
||||
, lix-module
|
||||
, systems
|
||||
, hlCommonSettings
|
||||
}:
|
||||
let
|
||||
makeImports =
|
||||
@@ -15,34 +17,31 @@ let
|
||||
home-manager-modules
|
||||
else
|
||||
[ ]) ++ extraConfiguration;
|
||||
in
|
||||
{
|
||||
makeNixOsModule =
|
||||
{ system
|
||||
, configuration ? null
|
||||
, ...
|
||||
}@attrs:
|
||||
nixpkgs.lib.nixosSystem {
|
||||
eachSystem = nixpkgs.lib.genAttrs (import systems);
|
||||
pkgs = eachSystem (system:
|
||||
import nixpkgs {
|
||||
system = system;
|
||||
modules = (makeImports {
|
||||
attrs = attrs;
|
||||
home-manager-modules = [ home-manager.nixosModules.default ];
|
||||
extraConfiguration = [ lix-module.nixosModules.default ];
|
||||
});
|
||||
};
|
||||
config = { allowUnfree = true; };
|
||||
});
|
||||
makeNixOsModuleMaker =
|
||||
masterAttrs:
|
||||
{ system ? masterAttrs.system ? "x86_64-linux"
|
||||
, configuration ? null
|
||||
, ...
|
||||
}@attrs:
|
||||
let joinedttrs = masterAttrs // attrs;
|
||||
in
|
||||
nixpkgs.lib.nixosSystem {
|
||||
system = system;
|
||||
modules = (makeImports {
|
||||
attrs = masterAttrs // attrs;
|
||||
attrs = joinedttrs;
|
||||
home-manager-modules = [ home-manager.nixosModules.default ];
|
||||
extraConfiguration = [ lix-module.nixosModules.default ];
|
||||
});
|
||||
};
|
||||
makeNixOsModule =
|
||||
makeNixOsModuleMaker { };
|
||||
makeHLService = makeNixOsModuleMaker hlCommonSettings;
|
||||
makeDarwinModule =
|
||||
{ system ? "x86_64-darwin"
|
||||
, user
|
||||
@@ -63,4 +62,25 @@ in
|
||||
})
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
eachSystem = eachSystem;
|
||||
pkgs = pkgs;
|
||||
makeNixOsModule = makeNixOsModule;
|
||||
makeHLService = makeHLService;
|
||||
makeDarwinModule = makeDarwinModule;
|
||||
makeHLServices =
|
||||
{ nodeNames ? [ ]
|
||||
, systemStateVersion ? "24.05"
|
||||
, user
|
||||
}: builtins.listToAttrs (builtins.map
|
||||
(name: {
|
||||
name = name;
|
||||
value = makeHLService {
|
||||
hostName = name;
|
||||
configuration = (import (./hosts + "/${name}.nix") { user = user; });
|
||||
systemStateVersion = systemStateVersion;
|
||||
};
|
||||
})
|
||||
nodeNames);
|
||||
}
|
||||
Reference in new issue
Block a user