diff --git a/hosts/hades/disko-config.nix b/hosts/hades/disko-config.nix index f9c7fc1..7a99201 100644 --- a/hosts/hades/disko-config.nix +++ b/hosts/hades/disko-config.nix @@ -2,6 +2,7 @@ disko.devices = { disk = { + sda = { type = "disk"; device = "/dev/sda"; @@ -27,17 +28,16 @@ type = "luks"; name = "pomegranate"; # disable settings.keyFile if you want to use interactive password entry - passwordFile = "/tmp/secret.key"; # Interactive + #passwordFile = "/tmp/secret.key"; # Interactive settings = { allowDiscards = true; #keyFile = "/tmp/secret.key"; }; - # additionalKeyFiles = [ "/tmp/additionalSecret.key" ]; - + #additionalKeyFiles = [ "/tmp/additionalSecret.key" ]; content = { type = "btrfs"; extraArgs = [ "-f" ]; - subvolumes = { + subvolumes = { "/root" = { mountpoint = "/"; mountOptions = [ "compress=zstd" "noatime" ]; @@ -49,16 +49,16 @@ "/nix" = { mountpoint = "/nix"; mountOptions = [ "compress=zstd" "noatime" ]; + }; "/swap" = { mountpoint = "/.swapvol"; swap.swapfile.size = "8192M"; }; }; + }; - }; }; - }; }; }; diff --git a/hosts/hades/hardware-configuration.nix b/hosts/hades/hardware-configuration.nix index 5d0c99c..29fd4bc 100644 --- a/hosts/hades/hardware-configuration.nix +++ b/hosts/hades/hardware-configuration.nix @@ -7,7 +7,6 @@ imports = [ (modulesPath + "/installer/scan/not-detected.nix") - ./disko-config.nix ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ];