From 558b8f827c7cd41bdf053337804d503097b6ac1d Mon Sep 17 00:00:00 2001 From: Petru Paler Date: Fri, 13 Sep 2024 12:04:10 +0100 Subject: [PATCH] Convert c1 & c2 to disko and cleanup old keys. --- hosts/c1/default.nix | 8 ++++- hosts/c1/hardware.nix | 37 -------------------- nixos-setup/keys/c1.key => hosts/c1/key.bin | Bin hosts/c2/default.nix | 8 ++++- hosts/c2/hardware.nix | 37 -------------------- nixos-setup/keys/c2.key => hosts/c2/key.bin | Bin nixos-setup/keys/c3.key | Bin 4096 -> 0 bytes nixos-setup/keys/zippy.key | Bin 4096 -> 0 bytes 8 files changed, 14 insertions(+), 76 deletions(-) rename nixos-setup/keys/c1.key => hosts/c1/key.bin (100%) rename nixos-setup/keys/c2.key => hosts/c2/key.bin (100%) delete mode 100644 nixos-setup/keys/c3.key delete mode 100644 nixos-setup/keys/zippy.key diff --git a/hosts/c1/default.nix b/hosts/c1/default.nix index 31af965..445f5ff 100644 --- a/hosts/c1/default.nix +++ b/hosts/c1/default.nix @@ -3,10 +3,16 @@ imports = [ ../../common/global ../../common/compute-node.nix + ../../common/encrypted-btrfs-layout.nix ./hardware.nix ]; + diskLayout = { + mainDiskDevice = "/dev/disk/by-id/nvme-SAMSUNG_MZVLW256HEHP-000H1_S340NX0K910298"; + #keyDiskDevice = "/dev/disk/by-id/usb-Intenso_Micro_Line_22080777640496-0:0"; + keyDiskDevice = "/dev/sdb"; + }; + networking.hostName = "c1"; - boot.initrd.luks.devices."luksroot".keyFile = "/dev/sda"; services.tailscaleAutoconnect.authkey = "tskey-auth-kmFvBT3CNTRL-wUbELKSd5yhuuTwTcgJZxhPUTxKgcYKF"; } diff --git a/hosts/c1/hardware.nix b/hosts/c1/hardware.nix index d60c905..e81435b 100644 --- a/hosts/c1/hardware.nix +++ b/hosts/c1/hardware.nix @@ -10,43 +10,6 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/42e95613-29c2-4a47-a3cc-3627f18fdec2"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; - - boot.initrd.luks.devices."luksroot".device = "/dev/disk/by-uuid/7fa539a0-6c91-49ec-9df2-e81708a07662"; - - fileSystems."/persist" = - { device = "/dev/disk/by-uuid/42e95613-29c2-4a47-a3cc-3627f18fdec2"; - fsType = "btrfs"; - options = [ "subvol=persist" ]; - }; - - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/42e95613-29c2-4a47-a3cc-3627f18fdec2"; - fsType = "btrfs"; - options = [ "subvol=nix" ]; - }; - - fileSystems."/var/log" = - { device = "/dev/disk/by-uuid/42e95613-29c2-4a47-a3cc-3627f18fdec2"; - fsType = "btrfs"; - options = [ "subvol=log" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/D8C2-9216"; - fsType = "vfat"; - options = [ "umask=0077" ]; # to avoid the random seed being world readable - }; - - swapDevices = [ { - device = "/dev/disk/by-id/nvme-eui.002538b981b03d98-part2"; - randomEncryption.enable = true; - }]; - nixpkgs.hostPlatform = "x86_64-linux"; hardware.cpu.intel.updateMicrocode = true; } diff --git a/nixos-setup/keys/c1.key b/hosts/c1/key.bin similarity index 100% rename from nixos-setup/keys/c1.key rename to hosts/c1/key.bin diff --git a/hosts/c2/default.nix b/hosts/c2/default.nix index 9a796aa..e787530 100644 --- a/hosts/c2/default.nix +++ b/hosts/c2/default.nix @@ -3,10 +3,16 @@ imports = [ ../../common/global ../../common/compute-node.nix + ../../common/encrypted-btrfs-layout.nix ./hardware.nix ]; + diskLayout = { + mainDiskDevice = "/dev/disk/by-id/nvme-SAMSUNG_MZVLB256HAHQ-000H1_S425NA1M132963"; + #keyDiskDevice = "/dev/disk/by-id/usb-Intenso_Micro_Line_22080777650675-0:0"; + keyDiskDevice = "/dev/sda"; + }; + networking.hostName = "c2"; - boot.initrd.luks.devices."luksroot".keyFile = "/dev/sda"; services.tailscaleAutoconnect.authkey = "tskey-auth-kbYnZK2CNTRL-SpUVCuzS6P3ApJiDaB6RM3M4b8M9TXgS"; } diff --git a/hosts/c2/hardware.nix b/hosts/c2/hardware.nix index bed4683..e81435b 100644 --- a/hosts/c2/hardware.nix +++ b/hosts/c2/hardware.nix @@ -10,43 +10,6 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/2d595dde-975b-498a-acb5-2e22751d3cea"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; - - boot.initrd.luks.devices."luksroot".device = "/dev/disk/by-uuid/03ee7c3b-19d5-491d-bc2e-3b0681e6506f"; - - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/2d595dde-975b-498a-acb5-2e22751d3cea"; - fsType = "btrfs"; - options = [ "subvol=nix" ]; - }; - - fileSystems."/persist" = - { device = "/dev/disk/by-uuid/2d595dde-975b-498a-acb5-2e22751d3cea"; - fsType = "btrfs"; - options = [ "subvol=persist" ]; - }; - - fileSystems."/var/log" = - { device = "/dev/disk/by-uuid/2d595dde-975b-498a-acb5-2e22751d3cea"; - fsType = "btrfs"; - options = [ "subvol=log" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/B543-374F"; - fsType = "vfat"; - options = [ "umask=0077" ]; # to avoid the random seed being world readable - }; - - swapDevices = pkgs.lib.mkForce [ { - device = "/dev/disk/by-id/nvme-eui.002538819102bebe-part2"; - randomEncryption.enable = true; - }]; - nixpkgs.hostPlatform = "x86_64-linux"; hardware.cpu.intel.updateMicrocode = true; } diff --git a/nixos-setup/keys/c2.key b/hosts/c2/key.bin similarity index 100% rename from nixos-setup/keys/c2.key rename to hosts/c2/key.bin diff --git a/nixos-setup/keys/c3.key b/nixos-setup/keys/c3.key deleted file mode 100644 index 14eec7c5e2906b88dbd8abf355c6e9be7ed5a391..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 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