From e6052f7b16fe88e59fffdc61c967ecaf3736d937 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Sun, 28 Apr 2024 17:22:24 +0200
Subject: [PATCH] Reinstall on new hard drive

---
 hosts/north/disko.nix        | 46 ++++++++++++++++--------------------
 hosts/north/hardware.nix     |  2 +-
 modules/system/syncthing.nix |  2 +-
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/hosts/north/disko.nix b/hosts/north/disko.nix
index ac1eb11..4d37241 100644
--- a/hosts/north/disko.nix
+++ b/hosts/north/disko.nix
@@ -1,29 +1,25 @@
 {
-    disko.devices = {
-        disk = {
-            vdb = {
-                device = "/dev/sda";
-                type = "disk";
-                content = {
-                    type = "gpt";
-                    partitions = {
-                        ESP = {
-                            type = "EF00";
-                            size = "500M";
-                            content = {
-                                type = "filesystem";
-                                format = "vfat";
-                                mountpoint = "/boot";
-                            };
-                        };
-                        root = {
-                            size = "100%";
-                            content = {
-                                type = "filesystem";
-                                format = "ext4";
-                                mountpoint = "/";
-                            };
-                        };
+    disko.devices.disk.main = {
+        device = "/dev/nvme0n1";
+        type = "disk";
+        content = {
+            type = "gpt";
+            partitions = {
+                ESP = {
+                    type = "EF00";
+                    size = "500M";
+                    content = {
+                        type = "filesystem";
+                        format = "vfat";
+                        mountpoint = "/boot";
+                    };
+                };
+                root = {
+                    size = "100%";
+                    content = {
+                        type = "filesystem";
+                        format = "ext4";
+                        mountpoint = "/";
                     };
                 };
             };
diff --git a/hosts/north/hardware.nix b/hosts/north/hardware.nix
index 757f1b1..6251bfc 100644
--- a/hosts/north/hardware.nix
+++ b/hosts/north/hardware.nix
@@ -14,6 +14,7 @@
     boot.initrd.availableKernelModules = [
         "xhci_pci"
         "ahci"
+        "nvme"
         "usb_storage"
         "usbhid"
         "sd_mod"
@@ -85,7 +86,6 @@
             MAXTEMP=hwmon1/pwm1=100 hwmon1/pwm2=100 hwmon1/pwm3=100 hwmon1/pwm4=100
             MINSTART=hwmon1/pwm1=16 hwmon1/pwm2=16 hwmon1/pwm3=16 hwmon1/pwm4=30
             MINSTOP=hwmon1/pwm1=16 hwmon1/pwm2=16 hwmon1/pwm3=16 hwmon1/pwm4=30
-            AVERAGE=
         '';
     };
 }
diff --git a/modules/system/syncthing.nix b/modules/system/syncthing.nix
index 848114b..f34ee23 100644
--- a/modules/system/syncthing.nix
+++ b/modules/system/syncthing.nix
@@ -18,7 +18,7 @@
 
             settings = {
                 devices = {
-                    north.id = "DIPH5BN-N2XV57S-23W63KD-UZOZ3UI-RB24QRJ-VVPD4YM-ZMFZIXN-GPX4YA4";
+                    north.id = "ROS2S76-ULQWVFC-7KNQQ6Q-MNIWNKT-2QOPPHY-FFQZNVM-GUJRTHE-NZBM3QY";
                     inspiron.id = "GUXHL6J-J2HWYNN-7JZJ5CN-6LPYGJD-H7GYRLQ-ORZ4PJJ-5K4WT7I-MELMIQO";
                 };