mirror of
https://github.com/Gerg-L/nixos.git
synced 2025-12-10 00:43:56 -05:00
fixed sops not decrypting at boot
This commit is contained in:
parent
ca82a01644
commit
04f7e566b4
2 changed files with 4 additions and 8 deletions
|
|
@ -2,7 +2,6 @@
|
||||||
pkgs,
|
pkgs,
|
||||||
self,
|
self,
|
||||||
config,
|
config,
|
||||||
lib,
|
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -13,6 +12,6 @@
|
||||||
];
|
];
|
||||||
sops = {
|
sops = {
|
||||||
defaultSopsFile = "${self}/systems/${config.networking.hostName}/secrets.yaml";
|
defaultSopsFile = "${self}/systems/${config.networking.hostName}/secrets.yaml";
|
||||||
age.sshKeyPaths = lib.mkForce ["/etc/ssh/ssh_host_ed25519_key"];
|
age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,13 +6,10 @@ _: {lib, ...}: {
|
||||||
"L+ /etc/nixos - - - - /persist/nixos"
|
"L+ /etc/nixos - - - - /persist/nixos"
|
||||||
];
|
];
|
||||||
boot.initrd.postDeviceCommands = lib.mkAfter ''
|
boot.initrd.postDeviceCommands = lib.mkAfter ''
|
||||||
zfs snapshot destroy rpool/root@prev
|
|
||||||
zfs snapshot destroy rpool/var@prev
|
|
||||||
|
|
||||||
zfs snapshot create rpool/root@prev
|
|
||||||
zfs snapshot create rpool/var@prev
|
|
||||||
|
|
||||||
zfs rollback -r rpool/root@empty
|
zfs rollback -r rpool/root@empty
|
||||||
zfs rollback -r rpool/var@empty
|
zfs rollback -r rpool/var@empty
|
||||||
'';
|
'';
|
||||||
|
#make sure the sopskey is found
|
||||||
|
sops.age.sshKeyPaths = lib.mkForce ["/persist/ssh/ssh_host_ed25519_key"];
|
||||||
|
fileSystems."/persist".neededForBoot = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue