wave/qa-core-system #3

Merged
bernardo merged 4 commits from wave/qa-core-system into main 2026-05-19 19:17:22 +01:00
3 changed files with 23 additions and 3 deletions
Showing only changes of commit 99a6c7d547 - Show all commits

View File

@@ -24,6 +24,18 @@ in
"crypted_main" on multi-disk installs to match the disko layout.
'';
};
user = lib.mkOption {
type = lib.types.str;
default = "nomarchy";
description = ''
Primary user whose home subset (.ssh, .gnupg, keyrings, common
directories) survives the rootfs wipe. Must match the user
created via `users.users.<name>` otherwise the persistence
block is silently inert and the user's home directory is wiped
on every boot. The installer writes this for you.
'';
};
};
config = lib.mkIf cfg.enable {
@@ -72,7 +84,7 @@ in
"/etc/machine-id"
"/etc/supergfxd.conf"
];
users.nomarchy = {
users.${cfg.user} = {
directories = [
".ssh"
".gnupg"

View File

@@ -153,10 +153,18 @@ Without prime config, supergfxd still switches modes but render-offload via `nvi
`bool`, default `false`. Intel IPU7 camera support (kernel modules + firmware).
### `impermanence.enable`
### `nomarchy.system.impermanence.enable`
`bool`, default `false`. Erase Your Darlings root wipe on boot. Defined in `core/system/impermanence.nix`. The installer writes the flag based on the impermanence prompt.
### `nomarchy.system.impermanence.mainLuksName`
`str`, default `"crypted"`. Name of the `/dev/mapper` entry holding the BTRFS root. The disko layout uses `"crypted"` on single-disk installs and `"crypted_main"` once multiple drives are selected — the installer writes the matching value automatically.
### `nomarchy.system.impermanence.user`
`str`, default `"nomarchy"`. Primary user whose home subset (`.ssh`, `.gnupg`, `.local/share/keyrings`, `Documents`, `Downloads`, `Pictures`, `Videos`, `Projects`) survives the rootfs wipe. Must match the user created via `users.users.<name>` — otherwise the persistence block is silently inert and the user's home directory is wiped on every boot. The installer writes this for you.
---
## Home Manager options (`home.nix`)

View File

@@ -1459,7 +1459,7 @@ generate_flake_config() {
if (( ${#_drives[@]} > 1 )); then
_main_luks_name="crypted_main"
fi
impermanence_opt=$'nomarchy.system.impermanence.enable = true;\n nomarchy.system.impermanence.mainLuksName = "'"$_main_luks_name"$'";'
impermanence_opt=$'nomarchy.system.impermanence.enable = true;\n nomarchy.system.impermanence.mainLuksName = "'"$_main_luks_name"$'";\n nomarchy.system.impermanence.user = "'"$USERNAME"$'";'
fi
local PROFILE_SYSTEM_OPTS=""