From 60bc1af8c4063643077f3aaeb77c9c95df562b17 Mon Sep 17 00:00:00 2001 From: Petru Paler Date: Tue, 6 Aug 2024 07:38:58 +0100 Subject: [PATCH] Re-setup c3. --- hosts/c3/default.nix | 9 +++++++-- hosts/c3/hardware.nix | 36 ------------------------------------ hosts/c3/key.bin | Bin 0 -> 4096 bytes 3 files changed, 7 insertions(+), 38 deletions(-) create mode 100644 hosts/c3/key.bin diff --git a/hosts/c3/default.nix b/hosts/c3/default.nix index 2c0658e..a035941 100644 --- a/hosts/c3/default.nix +++ b/hosts/c3/default.nix @@ -3,10 +3,15 @@ imports = [ ../../common/global ../../common/compute-node.nix + ../../common/encrypted-btrfs-layout.nix ./hardware.nix ]; + diskLayout = { + mainDiskDevice = "/dev/disk/by-id/nvme-INTENSO_SSD_1782403017002453"; + keyDiskDevice = "/dev/disk/by-id/usb-Intenso_Micro_Line_22080777650050-0:0"; + }; + networking.hostName = "c3"; - boot.initrd.luks.devices."luksroot".keyFile = "/dev/sda"; - services.tailscaleAutoconnect.authkey = "tskey-auth-kDNknU5CNTRL-iEGHyo8GDZBCVLaMutJjZBHH7wCuCDyFb"; + services.tailscaleAutoconnect.authkey = "tskey-auth-kReCuA7E8M11CNTRL-DBGsB3YLBvQwCdWcviQQtQ1zV23pQpQP4"; } diff --git a/hosts/c3/hardware.nix b/hosts/c3/hardware.nix index ae97a38..8b1428c 100644 --- a/hosts/c3/hardware.nix +++ b/hosts/c3/hardware.nix @@ -10,42 +10,6 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/2b96989f-cec5-40bd-afa8-e5ca0b8f30e9"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; - - boot.initrd.luks.devices."luksroot".device = "/dev/disk/by-uuid/c4a43a18-b480-43ed-87f2-f78a50f03976"; - - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/2b96989f-cec5-40bd-afa8-e5ca0b8f30e9"; - fsType = "btrfs"; - options = [ "subvol=nix" ]; - }; - - fileSystems."/persist" = - { device = "/dev/disk/by-uuid/2b96989f-cec5-40bd-afa8-e5ca0b8f30e9"; - fsType = "btrfs"; - options = [ "subvol=persist" ]; - }; - - fileSystems."/var/log" = - { device = "/dev/disk/by-uuid/2b96989f-cec5-40bd-afa8-e5ca0b8f30e9"; - fsType = "btrfs"; - options = [ "subvol=log" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/3051-C478"; - fsType = "vfat"; - }; - - swapDevices = pkgs.lib.mkForce [ { - device = "/dev/disk/by-id/nvme-eui.000000000000001000080d020035fefd-part2"; - randomEncryption.enable = true; - }]; - nixpkgs.hostPlatform = "x86_64-linux"; hardware.cpu.intel.updateMicrocode = true; } diff --git a/hosts/c3/key.bin b/hosts/c3/key.bin new file mode 100644 index 0000000000000000000000000000000000000000..f6f9bb6f066bbe35779b9f12834284732b1abaa3 GIT binary patch literal 4096 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 literal 0 HcmV?d00001