From 0374b37e55cac158ad5ac63808f01e7b338f9cce Mon Sep 17 00:00:00 2001
From: Sean Kovacs <kovacsmillio@gmail.com>
Date: Wed, 28 Jan 2026 00:04:13 -0500
Subject: [PATCH] updates for peach reinstall

---
 hardware/peach/default.nix     | 46 ++++++++++++++++++++++++++++++----
 home/tiling/noctalia.nix       |  2 +-
 system/hosts/peach/default.nix | 14 ++++-------
 3 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/hardware/peach/default.nix b/hardware/peach/default.nix
index 5b49211..549cdc3 100644
--- a/hardware/peach/default.nix
+++ b/hardware/peach/default.nix
@@ -2,24 +2,56 @@
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 {
+  config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }:
+
 {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "sdhci_pci" ];
+  boot.initrd.availableKernelModules = [
+    "usb_storage"
+    "sdhci_pci"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-label/NixOS";
-    fsType = "ext4";
+    device = "/dev/disk/by-uuid/1fd2c838-5fc7-4d52-ab92-9d9de545021b";
+    fsType = "btrfs";
+    options = [
+      "subvol=root"
+      "compress=zstd"
+    ];
+  };
+
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/1fd2c838-5fc7-4d52-ab92-9d9de545021b";
+    fsType = "btrfs";
+    options = [
+      "subvol=home"
+      "compress=zstd"
+    ];
+  };
+
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-uuid/1fd2c838-5fc7-4d52-ab92-9d9de545021b";
+    fsType = "btrfs";
+    options = [
+      "subvol=nix"
+      "compress=zstd"
+      "noatime"
+    ];
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-label/EFI";
+    device = "/dev/disk/by-uuid/4039-19F6";
     fsType = "vfat";
     options = [
       "fmask=0022"
@@ -27,7 +59,11 @@
     ];
   };
 
-  swapDevices = [ ];
+  swapDevices = [
+    {
+      device = "/dev/disk/by-uuid/7abc3359-f379-4f7f-9da1-77a81ba748e4";
+    }
+  ];
 
   nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
 }
diff --git a/home/tiling/noctalia.nix b/home/tiling/noctalia.nix
index e68fdc6..6bd281d 100644
--- a/home/tiling/noctalia.nix
+++ b/home/tiling/noctalia.nix
@@ -32,7 +32,7 @@
       mError = base12;
       mOnError = base00;
       mSurface = base00;
-      mOnSurface = base06;
+      mOnSurface = base05;
       mSurfaceVariant = base01;
       mOnSurfaceVariant = base05;
       mOutline = base02;
diff --git a/system/hosts/peach/default.nix b/system/hosts/peach/default.nix
index 219ae68..e355c70 100644
--- a/system/hosts/peach/default.nix
+++ b/system/hosts/peach/default.nix
@@ -37,19 +37,15 @@
     peripheralFirmwareDirectory = pkgs.requireFile {
       name = "firmware";
       hashMode = "recursive";
-      hash = "sha256-lw8tJHRUSBwqu82ys4rZIYH0sEb+dDjQkXg1wt1afZI=";
+      hash = "sha256-ooBrgsZ+B6Fmoy6Ze5ppP9oKQzMIk1orvx+ldxY6bQs=";
       message = ''
-        nix-store --add-fixed sha256 --recursive ./firmware
+        you need to add the firmware to the store:
+        mkdir system/hosts/peach/firmware
+        sudo cp -r /mnt/boot/asahi/{all_firmware.tar.gz,kernelcache*} system/hosts/peach/firmware
+        nix-store --add-fixed sha256 --recursive ./system/hosts/peach/firmware
       '';
     };
   };
 
-  swapDevices = [
-    {
-      device = "/swapfile";
-      size = 8000; # 8GB
-    }
-  ];
-
   security.sudo.wheelNeedsPassword = false;
 }