flake-parts/setups/nixos: refactor

This commit is contained in:
Gabriel Arazas 2024-01-26 17:39:12 +08:00
parent 42a24ada02
commit 7b77035949
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC

View File

@ -329,6 +329,9 @@ let
inputs.${config.homeManagerBranch}.nixosModules.home-manager
../../../configs/nixos/${name}
# Mapping the declarative home-manager users (if it has one) into NixOS
# users.
(lib.mkIf (config.homeManagerUsers.users != { })
(
let
setupConfig = config;
@ -336,17 +339,8 @@ let
inherit (config.homeManagerUsers) nixpkgsInstance;
isNixpkgs = state: hasHomeManagerUsers && nixpkgsInstance == state;
in
{ config, lib, ... }: {
{ config, lib, pkgs, ... }: {
config = lib.mkMerge [
{
nixpkgs.overlays = setupConfig.overlays;
networking.hostName = lib.mkDefault setupConfig.hostname;
}
(lib.mkIf (setupConfig.domain != null) {
networking.domain = lib.mkDefault setupConfig.domain;
})
(lib.mkIf hasHomeManagerUsers {
users.users =
lib.mkMerge
@ -419,6 +413,24 @@ let
setupConfig.homeManagerUsers.users);
})
];
}))
# Setting up the typical configuration.
(
let
setupConfig = config;
in
{ config, lib, ... }: {
config = lib.mkMerge [
{
nixpkgs.overlays = setupConfig.overlays;
networking.hostName = lib.mkDefault setupConfig.hostname;
}
(lib.mkIf (setupConfig.domain != null) {
networking.domain = lib.mkDefault setupConfig.domain;
})
];
}
)
];