sparky autoupgrade and change home persistence

This commit is contained in:
Sam 2025-01-24 10:58:35 +00:00
parent 4308e476fb
commit c5d3d7c7df
2 changed files with 9 additions and 22 deletions

View File

@ -21,7 +21,6 @@ in {
extraGroups = [ extraGroups = [
"scanner" "scanner"
"lp" "lp"
"wheel"
]; ];
packages = with pkgs; [ packages = with pkgs; [
@ -31,22 +30,9 @@ in {
}; };
environment.persistence."/persist" = { environment.persistence."/persist" = {
hideMounts = true; directories = [
users.${username} = { "/home/${username}"
directories = [ ];
"Sync"
"Keep"
".ssh"
".config"
".mozilla"
".local"
".zotero"
".var"
".steam"
];
files = [
];
};
}; };
sops.secrets = { sops.secrets = {

View File

@ -15,6 +15,7 @@
then "/dev/mapper/crypted" then "/dev/mapper/crypted"
else "/dev/root_vg/root"; else "/dev/root_vg/root";
impermanence = true; impermanence = true;
merlinIp = configVars.networking.addresses.merlin.ip;
piholeIp = configVars.networking.addresses.pihole.ip; piholeIp = configVars.networking.addresses.pihole.ip;
gatewayIp = configVars.networking.addresses.gateway.ip; gatewayIp = configVars.networking.addresses.gateway.ip;
in { in {
@ -44,9 +45,9 @@ in {
# Import optional options # Import optional options
../common/optional/openssh.nix ../common/optional/openssh.nix
../common/optional/persistence.nix ../common/optional/persistence.nix
# ../common/optional/fileserver/media.nix ../common/optional/fileserver/nfs-client/media.nix
../common/optional/gaming.nix # ../common/optional/printing.nix
../common/optional/printing.nix ../common/optional/distributed-builds/local-machine.nix
outputs.nixosModules.nixosAutoUpgrade outputs.nixosModules.nixosAutoUpgrade
]; ];
@ -80,11 +81,11 @@ in {
system.services.nixosAutoUpgrade = { system.services.nixosAutoUpgrade = {
enable = true; enable = true;
persistent = true; persistent = true;
remote = "remotebuild@${merlinIp}";
reboot = false; reboot = false;
pushUpdates = false; pushUpdates = false;
configDir = "/etc/nixos"; configDir = "/etc/nixos";
onCalendar = "*-*-* 07:00:00"; onCalendar = "*-*-* 06:00:00";
user = "media";
}; };
services.xserver = { services.xserver = {