refactor(flake): optimize structure

- get rid of some `rec`s
- move lib & overlays into flake modules
This commit is contained in:
Felix Schröter 2023-09-30 16:21:03 +02:00
parent ea5b11995b
commit 10c0834daa
Signed by: felschr
GPG key ID: 671E39E6744C807D
6 changed files with 90 additions and 74 deletions

View file

@ -1,7 +1,7 @@
name:
{ user ? { }, hm ? { }, modules ? [ ], config, usesContainers ? false, ... }:
{ inputs, nixConfig, pkgs, lib, home-manager, ... }: {
{ inputs, pkgs, lib, home-manager, ... }: {
imports = [ home-manager.nixosModules.home-manager ];
users.users."${name}" = {
@ -24,6 +24,6 @@ name:
useGlobalPkgs = true;
backupFileExtension = "backup";
users."${name}" = lib.mkMerge [ { imports = modules; } (import config) ];
extraSpecialArgs = { inherit inputs nixConfig; };
extraSpecialArgs = { inherit inputs; };
} // hm;
}

21
lib/default.nix Normal file
View file

@ -0,0 +1,21 @@
{ inputs, ... }:
let createUser' = import ./createUser.nix;
in {
flake = {
lib = {
createSystem = hostName:
{ hardwareConfig, config }:
({ pkgs, lib, ... }: {
networking.hostName = hostName;
imports = [ ../modules/common.nix hardwareConfig config ];
});
createUser = name: args:
({ pkgs, ... }@args2:
(createUser' name args)
({ inherit (inputs) home-manager; } // args2));
createMediaGroup = _: { users.groups.media.gid = 600; };
};
};
}