From 5c922a0dc1d34149cfca186d4b2beda5aff168cf Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Tue, 10 Sep 2024 15:14:22 +1000 Subject: [PATCH] another-go at, working with disk-o --- hosts/hades/configuration.nix | 22 +++++++++++----------- hosts/hades/disko-config.nix | 8 ++++---- hosts/hades/hardware-configuration.nix | 3 +-- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/hosts/hades/configuration.nix b/hosts/hades/configuration.nix index aa86c3c..202a5db 100644 --- a/hosts/hades/configuration.nix +++ b/hosts/hades/configuration.nix @@ -16,24 +16,24 @@ loader = { systemd-boot = { enable = true; - configurationLimit = 7; + configurationLimit = 10; }; efi = { canTouchEfiVariables = true; - # efiSysMountPoint = "/boot/efi"; + efiSysMountPoint = "/boot/efi"; }; }; initrd = { systemd.enable = true; - # secrets = { - # "crypto_keyfile.bin" = null; + secrets = { + "crypto_keyfile.bin" = null; + }; + luks = { + devices."luks-DISK_UUID" = { + device = "/dev/disk/by-uuid/DISK_UUID"; + keyfile = "/crypto_keyfile.bin"; + }; }; - # luks = { - # devices."luks-DISK_UUID" = { - # device = "/dev/disk/by-uuid/DISK_UUID"; - # keyfile = "/crypto_keyfile.bin"; - # }; - # }; }; }; @@ -66,7 +66,7 @@ gc = { automatic = true; dates = "daily"; - options = "--delete-older-than 3d"; + options = "--delete-older-than 10d"; persistent = true; }; }; diff --git a/hosts/hades/disko-config.nix b/hosts/hades/disko-config.nix index 06b376d..b522a92 100644 --- a/hosts/hades/disko-config.nix +++ b/hosts/hades/disko-config.nix @@ -27,11 +27,11 @@ type = "luks"; name = "pomegranate"; # disable settings.keyFile if you want to use interactive password entry - #passwordFile = "/tmp/secret.key"; # Interactive - settings = { - allowDiscards = true; + passwordFile = "/tmp/secret.key"; # Interactive + # settings = { + # allowDiscards = true; #keyFile = "/tmp/secret.key"; - }; + # }; # additionalKeyFiles = [ "/tmp/additionalSecret.key" ]; content = { diff --git a/hosts/hades/hardware-configuration.nix b/hosts/hades/hardware-configuration.nix index 7ac55ac..5d0c99c 100644 --- a/hosts/hades/hardware-configuration.nix +++ b/hosts/hades/hardware-configuration.nix @@ -7,8 +7,7 @@ imports = [ (modulesPath + "/installer/scan/not-detected.nix") - # ./disko-config.sh - # ./disko-config.nix + ./disko-config.nix ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ];