feat!: change machine hostnames

Instead of merely naming my systems "laptop", "desktop", etc. (boring),
I now have them named after Aristotelian elements (cool).

This also gives me an excuse to refactor my flake file.
This commit is contained in:
Kiana Sheibani 2024-10-15 03:25:56 -04:00
parent e4ec3df115
commit fb7b45f98d
Signed by: toki
GPG key ID: 6CB106C25E86A9F7
13 changed files with 81 additions and 83 deletions

View file

@ -31,52 +31,51 @@ outputs = { self,
moduleArgs = { inherit username fullname email; } // inputs;
mkConfig =
{ platform,
{ machine,
system ? "x86_64-linux",
configModules ? [ ./config ],
configExtraModules ? [],
homeModules ? [ ./home-manager ],
homeExtraModules ? []
}:
nixpkgs.lib.nixosSystem {
inherit system;
modules =
configModules ++
configExtraModules ++
[
./platform.nix
{ _module.args = moduleArgs;
inherit platform; }
./hardware-configuration/${platform}.nix
{
"toki-${machine}" = nixpkgs.lib.nixosSystem {
inherit system;
modules =
configModules ++
configExtraModules ++
[
./machine.nix
{ _module.args = moduleArgs;
inherit machine; }
./hardware-configuration/${machine}.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = moduleArgs;
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = moduleArgs;
home-manager.sharedModules = [ ./platform.nix { inherit platform; } ];
home-manager.users.${username} = {
imports = homeModules ++ homeExtraModules;
};
}
];
home-manager.sharedModules = [ ./machine.nix { inherit machine; } ];
home-manager.users.${username} = {
imports = homeModules ++ homeExtraModules;
};
}
];
};
};
in {
nixosConfigurations = {
"${username}-desktop" = mkConfig {
platform = "desktop";
};
"${username}-laptop" = mkConfig {
platform = "laptop";
nixosConfigurations =
mkConfig {
machine = "earth";
} //
mkConfig {
machine = "fire";
configExtraModules = [
nixos-hardware.nixosModules.microsoft-surface-pro-intel
];
};
"${username}-mobile" = mkConfig {
platform = "mobile";
} //
mkConfig {
machine = "air";
system = "aarch64-linux";
configExtraModules = [
./mobile/config.nix
@ -89,6 +88,5 @@ outputs = { self,
./mobile/home-manager.nix
];
};
};
};
}