diff --git a/hostconfig/ZeNixComputa/hardware-configuration.nix b/hostconfig/ZeNixComputa/hardware-configuration.nix index b4eaed2..07f4463 100644 --- a/hostconfig/ZeNixComputa/hardware-configuration.nix +++ b/hostconfig/ZeNixComputa/hardware-configuration.nix @@ -18,7 +18,7 @@ boot.extraModulePackages = []; fileSystems."/" = { - device = "/dev/disk/by-uuid/62ddc566-fac0-4461-be44-0deb96c40b34"; + device = "/dev/disk/by-uuid/618a4ff8-5bbc-4d61-8c0f-0d963ac0931b"; fsType = "btrfs"; }; @@ -28,18 +28,14 @@ }; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/564B-4D0E"; + device = "/dev/disk/by-uuid/477A-15F5"; fsType = "vfat"; }; - fileSystems."/longstorage" = { - device = "/dev/disk/by-uuid/15a593ec-7197-46f8-aeeb-004f1f3322e2"; - fsType = "btrfs"; - }; - fileSystems."/oldhome" = { - device = "/dev/disk/by-uuid/611ae8bc-1f5a-4be8-86b6-fae42d183c0f"; - fsType = "ext4"; - }; + # fileSystems."/longstorage" = { + # device = "/dev/disk/by-uuid/15a593ec-7197-46f8-aeeb-004f1f3322e2"; + # fsType = "btrfs"; + # }; swapDevices = [ {device = "/dev/disk/by-uuid/91c2f707-02a2-4b0b-a683-42d70751e5b9";} diff --git a/hostconfig/ZeNixComputa/nixos.nix b/hostconfig/ZeNixComputa/nixos.nix index 720c57a..3848529 100644 --- a/hostconfig/ZeNixComputa/nixos.nix +++ b/hostconfig/ZeNixComputa/nixos.nix @@ -2,34 +2,6 @@ boot.initrd = { enable = true; availableKernelModules = ["amdgpu" "r8169"]; - luks = { - yubikeySupport = true; - - devices = let - yubikey = { - slot = 2; - twoFactor = false; - storage.device = "/dev/disk/by-uuid/564B-4D0E"; - }; - in { - nixos-root = { - device = "/dev/disk/by-uuid/cca61c58-e022-47ad-b9fd-9af9d2fa8abb"; - preLVM = true; - }; - nixos-home = { - device = "/dev/disk/by-uuid/c21561bf-5714-4cd2-8f37-d5880f76910d"; - preLVM = true; - }; - long-storage = { - device = "/dev/disk/by-uuid/670bf56f-fd3d-4127-b598-6bde4d2f2c27"; - preLVM = true; - }; - old-ssd = { - device = "/dev/disk/by-uuid/35326fe8-b0ce-4939-bdf1-5b3e180ed057"; - preLVM = true; - }; - }; - }; # secrets = { # "/etc/secrets/initrd/keyfile" = "/etc/secrets/initrd/keyfile";