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
58 lines
2.4 KiB
Nix
58 lines
2.4 KiB
Nix
# ThinkPad T400 (NixOS). Shared laptop options live in ../../modules/laptop.nix;
|
|
# only host-specific settings are here. Install notes (boot variants, GPU,
|
|
# partitions): see ./README.md.
|
|
{ config, ... }:
|
|
|
|
{
|
|
imports = [
|
|
./hardware-configuration.nix
|
|
# Boot: import exactly ONE, matching the firmware currently flashed.
|
|
# Stock Lenovo BIOS and coreboot+SeaBIOS both use boot-bios.nix.
|
|
./boot-bios.nix
|
|
# ./boot-coreboot-grub.nix # coreboot with the GRUB payload (config-only GRUB)
|
|
# ./boot-coreboot-uefi.nix # coreboot with the Tianocore/edk2 UEFI payload
|
|
# # (systemd-boot; carries its own ESP mount)
|
|
];
|
|
|
|
networking.hostName = "T400-NixOS";
|
|
|
|
console.font = "Lat2-Terminus16";
|
|
|
|
# Low-RAM host (4 GiB max): a compressed RAM swap reduces disk paging.
|
|
zramSwap.enable = true;
|
|
|
|
# This host accepts SSH, so open 22 (the firewall itself is enabled in
|
|
# laptop.nix with a default-deny policy).
|
|
services.openssh.enable = true;
|
|
networking.firewall.allowedTCPPorts = [ 22 ];
|
|
|
|
# Intel Core 2 (Penryn) microcode. Redistributable firmware (enabled in
|
|
# workstation.nix) supplies the iwlwifi blobs (Intel WiFi Link 5100/5300) and
|
|
# the radeon firmware needed by the discrete GPU below.
|
|
hardware.cpu.intel.updateMicrocode = true;
|
|
|
|
# Battery longevity: cap charging to 75-80%. tlp itself comes from the
|
|
# nixos-hardware lenovo-thinkpad profile; tp_smapi supplies the threshold
|
|
# sysfs on this 2008-era ThinkPad (kernel-native natacpi is too new for it).
|
|
boot.kernelModules = [ "tp_smapi" ];
|
|
boot.extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
|
|
services.tlp.settings = {
|
|
START_CHARGE_THRESH_BAT0 = 75;
|
|
STOP_CHARGE_THRESH_BAT0 = 80;
|
|
};
|
|
|
|
# This T400 has the optional discrete GPU fitted: an ATI Mobility Radeon HD
|
|
# 3470 (RV620), driven by the open `radeon` KMS driver. Load it in the initrd
|
|
# for early modesetting (clean Sway/Wayland start); firmware comes from
|
|
# enableRedistributableFirmware above.
|
|
#
|
|
# The T400 has switchable graphics (this discrete GPU + the Intel GMA
|
|
# 4500MHD). Select "Discrete" in the firmware's graphics setting so only the
|
|
# ATI is live; if you instead run "Integrated", the Intel i915 driver takes
|
|
# over with no extra config and `radeon` simply stays idle.
|
|
boot.initrd.kernelModules = [ "radeon" ];
|
|
|
|
# See `man configuration.nix` / the stateVersion docs before changing.
|
|
system.stateVersion = "26.05";
|
|
}
|