From 85fd5ad6f089b73d62b29aae6cf5bee05fa13570 Mon Sep 17 00:00:00 2001 From: Petru Paler Date: Fri, 13 Sep 2024 12:03:25 +0100 Subject: [PATCH] Switch zippy to disko. --- hosts/zippy/default.nix | 8 +++++++- hosts/zippy/hardware.nix | 37 ------------------------------------- hosts/zippy/key.bin | Bin 0 -> 4096 bytes 3 files changed, 7 insertions(+), 38 deletions(-) create mode 100644 hosts/zippy/key.bin diff --git a/hosts/zippy/default.nix b/hosts/zippy/default.nix index 8d47d17..a26b773 100644 --- a/hosts/zippy/default.nix +++ b/hosts/zippy/default.nix @@ -4,10 +4,16 @@ ../../common/global ../../common/compute-node.nix ../../common/dev-node.nix + ../../common/encrypted-btrfs-layout.nix ./hardware.nix ]; + diskLayout = { + mainDiskDevice = "/dev/disk/by-id/ata-KINGSTON_SKC600MS1024G_50026B7785AE0A92"; + #keyDiskDevice = "/dev/disk/by-id/usb-Intenso_Micro_Line_22080777660702-0:0"; + keyDiskDevice = "/dev/sdb"; + }; + networking.hostName = "zippy"; - boot.initrd.luks.devices."luksroot".keyFile = "/dev/sdb"; services.tailscaleAutoconnect.authkey = "tskey-auth-ktKyQ59f2p11CNTRL-ut8E71dLWPXsVtb92hevNX9RTjmk4owBf"; } diff --git a/hosts/zippy/hardware.nix b/hosts/zippy/hardware.nix index 486bb4b..8faabca 100644 --- a/hosts/zippy/hardware.nix +++ b/hosts/zippy/hardware.nix @@ -10,43 +10,6 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/e009eed5-90cd-4756-b56f-149d876ca934"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; - - boot.initrd.luks.devices."luksroot".device = "/dev/disk/by-uuid/3fb5eb41-34d3-4ef6-8f3e-5db5a788ceef"; - - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/e009eed5-90cd-4756-b56f-149d876ca934"; - fsType = "btrfs"; - options = [ "subvol=nix" ]; - }; - - fileSystems."/persist" = - { device = "/dev/disk/by-uuid/e009eed5-90cd-4756-b56f-149d876ca934"; - fsType = "btrfs"; - options = [ "subvol=persist" ]; - }; - - fileSystems."/var/log" = - { device = "/dev/disk/by-uuid/e009eed5-90cd-4756-b56f-149d876ca934"; - fsType = "btrfs"; - options = [ "subvol=log" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/F3C9-A38F"; - fsType = "vfat"; - options = [ "umask=0077" ]; # to avoid the random seed being world readable - }; - - swapDevices = [ { - device = "/dev/disk/by-id/ata-KINGSTON_SKC600MS1024G_50026B7785AE0A92-part2"; - randomEncryption.enable = true; - }]; - nixpkgs.hostPlatform = "x86_64-linux"; hardware.cpu.intel.updateMicrocode = true; } diff --git a/hosts/zippy/key.bin b/hosts/zippy/key.bin new file mode 100644 index 0000000000000000000000000000000000000000..ec0095cdef6cbe1c354b92c09f6fe353c31973bb GIT binary patch literal 4096 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 literal 0 HcmV?d00001