From cbe312d15564d9c94b368e94fda5a4dc2ffc8f1b Mon Sep 17 00:00:00 2001
From: thiloho <123883702+thiloho@users.noreply.github.com>
Date: Wed, 1 Jan 2025 18:47:37 +0000
Subject: [PATCH] Update Laptop configuration for LUKS

---
 nixos-configurations/laptop/default.nix              |  8 ++++++++
 .../laptop/hardware-configuration.nix                | 12 ++++++------
 nixos-configurations/shared.nix                      |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/nixos-configurations/laptop/default.nix b/nixos-configurations/laptop/default.nix
index e56b228..6fc5ea8 100644
--- a/nixos-configurations/laptop/default.nix
+++ b/nixos-configurations/laptop/default.nix
@@ -10,6 +10,14 @@
 
   networking.hostName = "laptop";
 
+  boot.initrd = {
+    luks.devices = {
+      cryptroot = {
+        device = "/dev/disk/by-uuid/82ba475d-faa1-488f-82c4-77c1b7bb48da";
+      };
+    };
+  };
+
   services.mysql = {
     enable = true;
     package = pkgs.mariadb;
diff --git a/nixos-configurations/laptop/hardware-configuration.nix b/nixos-configurations/laptop/hardware-configuration.nix
index c0a5a80..b102195 100644
--- a/nixos-configurations/laptop/hardware-configuration.nix
+++ b/nixos-configurations/laptop/hardware-configuration.nix
@@ -8,24 +8,24 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/97d3683d-3dee-4697-8f5a-21dc6a77a31b";
+    { device = "/dev/disk/by-uuid/2f426371-a6be-48c1-8823-7f7006217817";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/77D7-539D";
+    { device = "/dev/disk/by-uuid/9C3E-6FAA";
       fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
+      options = [ "fmask=0022" "dmask=0022" ];
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/61297121-2875-49c7-a974-5cc7203b991c"; }
+    [ { device = "/dev/disk/by-uuid/7cc6bc72-3ce2-451a-ba46-2b937a6e3269"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
diff --git a/nixos-configurations/shared.nix b/nixos-configurations/shared.nix
index b7ac64a..120198f 100644
--- a/nixos-configurations/shared.nix
+++ b/nixos-configurations/shared.nix
@@ -14,7 +14,7 @@
     "flakes"
   ];
 
-  time.timeZone = "Europe/Amsterdam";
+  time.timeZone = "Europe/Berlin";
 
   nixpkgs.config.allowUnfree = true;