diff --git a/trantor.nix b/trantor.nix index cf674f8..e968b1e 100644 --- a/trantor.nix +++ b/trantor.nix @@ -26,12 +26,12 @@ # [ "nfsvers=4" "x-systemd.automount" "x-systemd.idle-timeout=1min" ]; #}; - "/home/rilla/calibre" = { - device = "narwhal:/calibre"; - fsType = "nfs"; - options = - [ "nfsvers=4" "x-systemd.automount" "x-systemd.idle-timeout=1min" ]; - }; + #"/home/rilla/calibre" = { + # device = "narwhal:/calibre"; + # fsType = "nfs"; + # options = + # [ "nfsvers=4" "x-systemd.automount" "x-systemd.idle-timeout=1min" ]; + #}; }; @@ -58,16 +58,42 @@ }; }; initrd = { - luks.devices = { - "system" = { - device = "/dev/disk/by-uuid/b9778e01-a86c-4c6b-beb3-f97888d4a6eb"; - keyFile = "/system_keyfile.bin"; - allowDiscards = true; - }; - "user" = { - device = "/dev/disk/by-uuid/d8e9b35d-704a-4f66-bc19-0dd3e158de36"; - keyFile = "/user_keyfile.bin"; - allowDiscards = true; + luks = { + #yubikeySupport = true; + devices = { + "system" = { + device = "/dev/disk/by-uuid/b9778e01-a86c-4c6b-beb3-f97888d4a6eb"; + keyFile = "/system_keyfile.bin"; + allowDiscards = true; + # yubikey = { + # slot = 2; + # twoFactor = false; + # gracePeriod = 30; + # keyLength = 64; + # saltLength = 16; + # storage = { + # device = "/dev/nvme0n1p1"; + # fsType = "vfat"; + # path = "/crypt-storage/default"; + # }; + # }; + }; + "user" = { + device = "/dev/disk/by-uuid/d8e9b35d-704a-4f66-bc19-0dd3e158de36"; + keyFile = "/user_keyfile.bin"; + # yubikey = { + # slot = 2; + # twoFactor = false; + # gracePeriod = 30; + # keyLength = 64; + # saltLength = 16; + # storage = { + # device = "/dev/nvme0n1p1"; + # fsType = "vfat"; + # path = "/crypt-storage/default"; + # }; + # }; + }; }; }; secrets = {