some changes reverted

This commit is contained in:
2026-06-10 00:26:43 -05:00
parent 1384fccf88
commit 5f3e317cde
3 changed files with 51 additions and 32 deletions
+23 -20
View File
@@ -64,7 +64,7 @@
useDHCP = true;
networkmanager.enable = false;
wireless = {
userControlled.enable = true;
userControlled = true;
enable = true;
secretsFile = config.sops.secrets."networkPasswords".path;
networks = {
@@ -125,26 +125,29 @@
shell = pkgs.fish;
};
# Delete root on reboot
boot.initrd.systemd.services = {
rollback = {
description = "Rollback root zfs dataset to blank snapshot";
wantedBy = [ "initrd.target" ];
before = [ "sysroot.mount" ];
after = [ "zfs-import-zroot.service" ];
path = with pkgs; [
zfs
];
boot.zfs.forceImportRoot = false;
/*
# Delete root on reboot disable for now while broken
boot.initrd.systemd.services = {
rollback = {
description = "Rollback root zfs dataset to blank snapshot";
wantedBy = [ "initrd.target" ];
before = [ "sysroot.mount" ];
after = [ "zfs-import-zroot.service" ];
path = with pkgs; [
zfs
];
serviceConfig = {
Type = "oneshot";
ExecStart = ''
zfs rollback -r zroot/root@blank && echo "blank rollback complete"
'';
serviceConfig = {
Type = "oneshot";
ExecStart = ''
zfs rollback -r zroot/root@blank && echo "blank rollback complete"
'';
};
};
};
};
};
*/
nix = {
settings.experimental-features = [
@@ -156,7 +159,7 @@
automatic = true;
persistent = true;
dates = [ "daily" ];
options = "--delete-older-than 7d";
options = "--delete-older-than 30d";
};
};