From a816f0d20403009996f1d2f97da38040717a50d5 Mon Sep 17 00:00:00 2001
From: willifan <willifan@pm.me>
Date: Thu, 15 May 2025 22:47:07 +0200
Subject: [PATCH 1/3] update iso flake

---
 hosts/Lenni/hardware-configuration.nix | 25 ++-----------------------
 iso/flake.lock                         | 13 +++++++------
 iso/flake.nix                          |  4 ++--
 3 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/hosts/Lenni/hardware-configuration.nix b/hosts/Lenni/hardware-configuration.nix
index 6d4c1f3..1c41d6d 100644
--- a/hosts/Lenni/hardware-configuration.nix
+++ b/hosts/Lenni/hardware-configuration.nix
@@ -8,38 +8,17 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/e09e7d80-9d85-49e6-8b0e-1f31aea83840";
-      fsType = "btrfs";
-      options = [ "subvol=@" ];
-    };
-
-  boot.initrd.luks.devices."luks-a2f76baf-2f27-42a4-ae48-1963c566a9ab".device = "/dev/disk/by-uuid/a2f76baf-2f27-42a4-ae48-1963c566a9ab";
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/2A99-D7CC";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  fileSystems."/mnt/nfs" =
-    { device = "/nix/store/8zm9gh07p3rx8b3vqiwa1qb7zsml17sk-auto.nfs";
-      fsType = "autofs";
-    };
-
-  swapDevices = [ ];
-
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp195s0f3u1c2.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp195s0f4u1c2.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
diff --git a/iso/flake.lock b/iso/flake.lock
index 4dc7cd4..d92becd 100644
--- a/iso/flake.lock
+++ b/iso/flake.lock
@@ -2,17 +2,18 @@
   "nodes": {
     "nixos": {
       "locked": {
-        "lastModified": 1717179513,
-        "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=",
+        "lastModified": 1747209494,
+        "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0",
+        "rev": "5d736263df906c5da72ab0f372427814de2f52f8",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "ref": "24.05",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "root": {
diff --git a/iso/flake.nix b/iso/flake.nix
index fedcff7..ada99f0 100644
--- a/iso/flake.nix
+++ b/iso/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "Minimal NixOS installation media";
 
-  inputs.nixos.url = "nixpkgs/24.05";
+  inputs.nixos.url = "github:NixOS/nixpkgs/nixos-24.11";
 
   outputs = { self, nixos }: {
     nixosConfigurations = {
@@ -27,4 +27,4 @@
       };
     };
   };
-}
\ No newline at end of file
+}

From dc559c377b033b65d7913d7b4ec15d76598281ad Mon Sep 17 00:00:00 2001
From: willifan <willifan@pm.me>
Date: Thu, 15 May 2025 23:15:41 +0200
Subject: [PATCH 2/3] added Lenni encryption key

---
 hosts/Lenni/disko.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hosts/Lenni/disko.nix b/hosts/Lenni/disko.nix
index 89316a3..1a2b238 100644
--- a/hosts/Lenni/disko.nix
+++ b/hosts/Lenni/disko.nix
@@ -24,6 +24,8 @@
               content = {
                 type = "luks";
                 name = "cryptroot";
+                settings.allowDiscards = true;
+                passwordFile = "/tmp/secret.key";
                 content = {
                   type = "btrfs";
                   extraArgs = [ "-f" ];

From 4f76fc71c8fce5c675b7e504801ea02d7edfcafb Mon Sep 17 00:00:00 2001
From: willifan <willifan@pm.me>
Date: Fri, 16 May 2025 23:03:32 +0200
Subject: [PATCH 3/3] added initial password for willifan

---
 modules/default/nixos/users.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/default/nixos/users.nix b/modules/default/nixos/users.nix
index d619cb6..646db83 100644
--- a/modules/default/nixos/users.nix
+++ b/modules/default/nixos/users.nix
@@ -4,6 +4,7 @@
     isNormalUser = true;
     linger = true;
     description = "willifan";
+    initialPassword = "temp";
     extraGroups = [ "networkmanager" "wheel" "video" ];
     shell = pkgs.bash;
   };