lyrathorpe/nixfiles
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(user): switch primary identity to lyrathorpe / Lyra Thorpe

Browse Source 
Thread username and fullName per host through the flake host table and specialArgs / home-manager.extraSpecialArgs, so user.nix and git.nix derive identity instead of hardcoding it.

MBP and X1 now provision user lyrathorpe (Lyra Thorpe). EDaaS retains emmathorpe (Emma Thorpe) and its wsl.defaultUser; work commit email is unchanged.
This commit is contained in:
Emma Thorpe
2026-06-02 14:58:26 +00:00
parent 74792f9e5b
commit 5b6fae13fb
3 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.nix
+40 -26
View File
@@ -69,67 +69,81 @@
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; };
}
];
# mkHost :: { system, modules } -> nixosSystem
# mkHost :: { system, username, fullName, modules, homeModules } -> nixosSystem
# Builds one machine by appending its host-specific modules to the shared
# baseModules. `inputs` is threaded into specialArgs so any module can
# reach the flake inputs (e.g. the work module uses inputs for claude-code).
# baseModules. The user identity (username/fullName) is threaded through
# specialArgs so user.nix and the home modules stay host-agnostic, and the
# home-manager profile is keyed by the host's username.
mkHost =
{ system, modules }:
{
system,
username,
fullName,
modules,
homeModules,
}:
nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = { inherit inputs; };
modules = baseModules ++ modules;
specialArgs = { inherit inputs username fullName; };
modules =
baseModules
++ modules
++ [
{
home-manager.extraSpecialArgs = { inherit inputs username fullName; };
home-manager.users.${username}.imports = homeModules;
}
];
};
# Host table — declarative registry of every machine. To add a host:
# give it a name, its `system`, and the list of machine-specific modules.
# give it a name, its `system`, the owning user, and the module lists.
# mapAttrs below turns each entry into a nixosConfiguration of the same name.
hosts = {
emmathorpe-mbp = {
system = "aarch64-linux";
username = "lyrathorpe";
fullName = "Lyra Thorpe";
modules = [
./system/machine/MBP-Asahi/configuration.nix
nixos-apple-silicon.nixosModules.default
./emmathorpe/swaywm.nix
{
home-manager.users.emmathorpe.imports = [
./emmathorpe/home
./emmathorpe/home/desktop.nix
];
}
];
homeModules = [
./emmathorpe/home
./emmathorpe/home/desktop.nix
];
};
emmathorpe-x1c = {
system = "x86_64-linux";
username = "lyrathorpe";
fullName = "Lyra Thorpe";
modules = [
./system/machine/X1/configuration.nix
./emmathorpe/swaywm.nix
{
home-manager.users.emmathorpe.imports = [
./emmathorpe/home
./emmathorpe/home/desktop.nix
];
}
];
homeModules = [
./emmathorpe/home
./emmathorpe/home/desktop.nix
];
};
emmathorpe-edaas = {
system = "x86_64-linux";
username = "emmathorpe";
fullName = "Emma Thorpe";
modules = [
./system/machine/EDaaS/configuration.nix
nixos-wsl.nixosModules.default
./emmathorpe/swaywm.nix
{
home-manager.users.emmathorpe.imports = [
./emmathorpe/home
./system/modules/work/default.nix
];
}
];
homeModules = [
./emmathorpe/home
./system/modules/work/default.nix
];
};
};