Fix lithium config

This commit is contained in:
Vili Sinervä 2025-07-18 10:44:43 +03:00
parent ae425fcd72
commit b477690d33
Signed by: Vili Sinervä
SSH key fingerprint: SHA256:FladqYjaE4scJY3Hi+gnShZ6ygnTJgixy0I6BAoHyos
2 changed files with 34 additions and 30 deletions

View file

@ -3,6 +3,7 @@
imports = [ ../../disko/luks-zfs-impermanence.nix ]; imports = [ ../../disko/luks-zfs-impermanence.nix ];
custom = { custom = {
platform.impermanence.enable = true;
roles = { roles = {
desktop.enable = true; desktop.enable = true;
development.enable = true; development.enable = true;

View file

@ -10,8 +10,9 @@ in
options.custom.roles.personalMachine.enable = options.custom.roles.personalMachine.enable =
lib.mkEnableOption "role for personal machines (desktop/laptop)"; lib.mkEnableOption "role for personal machines (desktop/laptop)";
config = config = lib.mkIf cfg.enable (
(lib.mkIf cfg.enable { lib.mkMerge [
{
custom = { custom = {
hardware = { hardware = {
keychron.enable = true; keychron.enable = true;
@ -29,16 +30,18 @@ in
}; };
}; };
system.autoUpgrade.allowReboot = lib.mkForce false; system.autoUpgrade.allowReboot = lib.mkForce false;
}) }
// (lib.mkIf config.custom.platform.impermanence.enable { (lib.mkIf config.custom.platform.impermanence.enable {
# TODO Remove this temporary impermanence setup in favor of a more detailed one # TODO Remove this temporary impermanence setup in favor of a more detailed one
environment.persistence."/persist".directories = [ environment.persistence."/persist".directories = [
{ {
directory = config.users.users.vili.home; directory = "/home/vili";
user = config.users.users.vili.name; user = config.users.users.vili.name;
group = config.users.users.vili.group; group = config.users.users.vili.group;
mode = "u=rwx,g=,o="; mode = "u=rwx,g=,o=";
} }
]; ];
}); })
]
);
} }