From 2a4f92d952ad86142a72d71bbe3e873d146cdb1d Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Sat, 10 Aug 2024 20:39:01 +0200 Subject: [PATCH] Reinstall inspiron --- hosts/inspiron/disko.nix | 95 +++++++++++++++++------------------- modules/system/syncthing.nix | 2 +- 2 files changed, 47 insertions(+), 50 deletions(-) diff --git a/hosts/inspiron/disko.nix b/hosts/inspiron/disko.nix index b04af09..4eafc11 100644 --- a/hosts/inspiron/disko.nix +++ b/hosts/inspiron/disko.nix @@ -1,63 +1,60 @@ { disko.devices = { - disk = { - main = { - type = "disk"; - device = "/dev/nvme0n1"; - content = { - type = "gpt"; - partitions = { - ESP = { - type = "EF00"; - size = "512M"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "defaults" ]; - }; + disk.main = { + type = "disk"; + device = "/dev/nvme0n1"; + content = { + type = "gpt"; + partitions = { + ESP = { + type = "EF00"; + size = "512M"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ "defaults" ]; }; - luks = { - size = "100%"; + }; + luks = { + size = "100%"; + content = { + name = "cryptroot"; + type = "luks"; + settings = { + allowDiscards = true; + bypassWorkqueues = true; + keyFile = "/dev/disk/by-id/usb-SCSI_DISK-0:0"; + keyFileSize = 512; + keyFileTimeout = 5; + }; + additionalKeyFiles = [ "/tmp/secret.key" ]; content = { - name = "cryptroot"; - type = "luks"; - settings = { - allowDiscards = true; - keyFile = "/dev/disk/by-id/usb-SMI_USB_DISK-0:0"; - keyFileSize = 4096; - keyFileTimeout = 5; - }; - additionalKeyFiles = [ "/tmp/secret.key" ]; - content = { - type = "lvm_pv"; - vg = "pool"; - }; + type = "lvm_pv"; + vg = "pool"; }; }; }; }; }; }; - lvm_vg = { - pool = { - type = "lvm_vg"; - lvs = { - swap = { - size = "20G"; - content = { - type = "swap"; - resumeDevice = true; - }; + lvm_vg.pool = { + type = "lvm_vg"; + lvs = { + swap = { + size = "20G"; + content = { + type = "swap"; + resumeDevice = true; }; - root = { - size = "100%FREE"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - mountOptions = [ "defaults" ]; - }; + }; + root = { + size = "100%FREE"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; + mountOptions = [ "defaults" ]; }; }; }; diff --git a/modules/system/syncthing.nix b/modules/system/syncthing.nix index ae331ee..cddf286 100644 --- a/modules/system/syncthing.nix +++ b/modules/system/syncthing.nix @@ -16,7 +16,7 @@ settings = { devices = { north.id = "ROS2S76-ULQWVFC-7KNQQ6Q-MNIWNKT-2QOPPHY-FFQZNVM-GUJRTHE-NZBM3QY"; - inspiron.id = "K7V6PJV-3HLR6FI-VTFRJRN-ECG2ZYI-TNT4F5G-2WVQBDW-S77CHYL-VCAATAV"; + inspiron.id = "DLFGFCF-MTYXA23-F235RKL-QFZ4GB6-BUHTYMX-DJCTFRA-NVMAE5Y-R63NMQY"; }; folders =