lyrathorpeandEmma Thorpe
128deca2e3
CI / flake (push) Successful in 3m26s
## Summary Separates user identity (data) from the reusable Nix modules and lets a host declare any number of users, replacing the previous one-user-per-host structure. Also restructures the tree and exposes the home config for use off these hosts. ## Changes - **User registry** (`users/registry.nix`): per-user identity (name, email, groups, authorized + signing keys) as the single source of truth; no user data hardcoded in modules. - **Multi-user `mkHost`**: a host declares a `users` set keyed by username; per-user identity is injected into each home config via the `identity` module arg. - **Restructured layout**: `users/`, `home/`, `modules/`, `hosts/`, `lib/` replace the former `lyrathorpe/` and `system/` trees. - **Portable outputs**: standalone `homeConfigurations."<user>@<system>"` (the portable subset — shell, git, editor, claude) plus an exported `homeModules` for use on machines not managed by this flake, or as an input to other flakes. - Docs (`README.md`, `home/README.md`) and `.gitignore` updated for the new paths. ## Fixes - Closes #46 — shared user module authorized one user's SSH key for every account. - Closes #47 — git committer identity hardcoded as defaults instead of per-user. - Closes #48 — EDaaS systemd linger hardcoded to a literal username. ## Verification - `nix flake check` passes: treefmt, deadnix, statix, pre-commit, and evaluation of all NixOS hosts + Darwin + homeConfigurations. - Derivation-path comparison vs `main`: `lyrathorpe-mbp` and `emmathorpe-edaas` are byte-identical; `lyrathorpe-t400`, `lyrathorpe-macpro31` and `lyrathorpe-rpi5` differ only by de-duplicating a repeated `authorized_keys` entry (confirmed with nix-diff — no other change). - Standalone `homeConfigurations."lyrathorpe@x86_64-linux".activationPackage` builds. ## Notes - `emmathorpe` has no personal authorized key yet (it previously inherited Lyra's key via the bug in #46); the registry entry is intentionally empty — add a real key if SSH login as `emmathorpe` is wanted (moot on the WSL host). - A two-repo (public dotfiles / private systems) split is deferred by design; this internal restructure is the prerequisite for it. --------- Co-authored-by: Emma Thorpe <emma.thorpe@citrix.com> Reviewed-on: #49
50 lines
2.0 KiB
Nix
50 lines
2.0 KiB
Nix
# Form-factor-agnostic base for the physical graphical NixOS machines. Imported
|
|
# by both ./laptop.nix and ./desktop.nix; those add only the bits that differ
|
|
# between portable and desktop hosts (chiefly the networking backend).
|
|
#
|
|
# The bootloader is NOT set here -- it is firmware-specific, not form-factor:
|
|
# UEFI hosts (MBP, Mac Pro 3,1) use systemd-boot, the BIOS-only T400 uses GRUB.
|
|
# Each machine config declares its own.
|
|
{ lib, pkgs, ... }:
|
|
{
|
|
features.swayDesktop.enable = true;
|
|
|
|
console.keyMap = "dvorak";
|
|
|
|
# Intel thermal management. x86 only -- the Asahi MBP governs its own SoC
|
|
# thermals, and thermald is an Intel-platform daemon.
|
|
services.thermald.enable = lib.mkIf pkgs.stdenv.hostPlatform.isx86_64 true;
|
|
|
|
# Default-deny inbound. Hosts that run a listening service open their own
|
|
# ports next to where the service is enabled (e.g. sshd -> 22 on X1).
|
|
networking.firewall.enable = true;
|
|
|
|
# Disk hygiene for the physical hosts. fstrim reclaims unused SSD blocks on a
|
|
# weekly timer; cleanOnBoot wipes /tmp at every boot.
|
|
services.fstrim.enable = true;
|
|
boot.tmp.cleanOnBoot = true;
|
|
|
|
# Userspace OOM killer: act on memory pressure early instead of letting the
|
|
# kernel OOM-thrash. Matters on the 4 GiB T400 and the elderly Mac Pro.
|
|
services.earlyoom.enable = true;
|
|
|
|
# Firmware updates via LVFS. No-op on the Asahi MBP (Apple-managed firmware),
|
|
# useful for UEFI/SSD updates on the x86 hosts.
|
|
services.fwupd.enable = true;
|
|
|
|
# Audio. PipeWire with the PulseAudio shim covers every graphical host; no
|
|
# per-machine audio config is needed.
|
|
services.pipewire = {
|
|
enable = true;
|
|
pulse.enable = true;
|
|
};
|
|
|
|
# swaylock PAM stack. None of these machines has working fingerprint auth, so
|
|
# an empty service is enough -- swaylock falls back to password.
|
|
security.pam.services.swaylock = { };
|
|
|
|
# Redistributable firmware (GPU/Wi-Fi/NIC blobs) for the x86 hosts. Harmless
|
|
# on the Asahi MBP, which supplies its own peripheral firmware out-of-band.
|
|
hardware.enableRedistributableFirmware = true;
|
|
}
|