From 26ecfe79eb05976bdaba57308c2970fd6d66d553 Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Tue, 19 Aug 2025 20:49:06 -0500
Subject: [PATCH] macos

---
 modules/nixos/sops/default.nix                |   4 +-
 .../macbook-pro-nixos/default.nix             |   1 -
 .../hardware-configuration.nix                | 121 ++++++------------
 3 files changed, 43 insertions(+), 83 deletions(-)

diff --git a/modules/nixos/sops/default.nix b/modules/nixos/sops/default.nix
index 9bd827a..972367e 100644
--- a/modules/nixos/sops/default.nix
+++ b/modules/nixos/sops/default.nix
@@ -1,7 +1,7 @@
 { lib, ... }:
 let
-  defaultSops = (lib.snowfall.fs.get-file "secrets/pi4-secrets.yaml");
-  # sharedSops = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
+  # defaultSops = (lib.snowfall.fs.get-file "secrets/pi4-secrets.yaml");
+  defaultSops = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
 in
 {
   # Permission modes are in octal representation (same as chmod),
diff --git a/systems/aarch64-linux/macbook-pro-nixos/default.nix b/systems/aarch64-linux/macbook-pro-nixos/default.nix
index 4d851ed..515b3fb 100755
--- a/systems/aarch64-linux/macbook-pro-nixos/default.nix
+++ b/systems/aarch64-linux/macbook-pro-nixos/default.nix
@@ -21,7 +21,6 @@ in
 
   hardware.asahi = {
     enable = true;
-    useExperimentalGPUDriver = true;
     peripheralFirmwareDirectory = ./firmware;
     setupAsahiSound = true;
   };
diff --git a/systems/aarch64-linux/macbook-pro-nixos/hardware-configuration.nix b/systems/aarch64-linux/macbook-pro-nixos/hardware-configuration.nix
index 92c0ac4..43c0021 100644
--- a/systems/aarch64-linux/macbook-pro-nixos/hardware-configuration.nix
+++ b/systems/aarch64-linux/macbook-pro-nixos/hardware-configuration.nix
@@ -1,100 +1,61 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ lib, modulesPath, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [
-    "uas"
-    "sdhci_pci"
-  ];
+  boot.initrd.availableKernelModules = [ "usb_storage" "sdhci_pci" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "none";
-    fsType = "tmpfs";
-  };
+  fileSystems."/" =
+    { device = "none";
+      fsType = "tmpfs";
+      options = [ "mode=755" ];
+    };
 
-  fileSystems."/root" = {
-    device = "/dev/disk/by-uuid/adcc14fa-8bf7-4b4b-a9e4-b038993b96cc";
-    fsType = "btrfs";
-    options = [
-      "compress=zstd"
-      "noatime"
-      "subvol=root"
-    ];
-  };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/E66E-1A03";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
 
-  fileSystems."/etc" = {
-    device = "/dev/disk/by-uuid/adcc14fa-8bf7-4b4b-a9e4-b038993b96cc";
-    fsType = "btrfs";
-    options = [
-      "compress=zstd"
-      "noatime"
-      "subvol=etc"
-    ];
-  };
+  fileSystems."/root" =
+    { device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
+      fsType = "btrfs";
+      options = [ "subvol=root" ];
+    };
 
-  fileSystems."/tmp" = {
-    device = "/dev/disk/by-uuid/adcc14fa-8bf7-4b4b-a9e4-b038993b96cc";
-    fsType = "btrfs";
-    options = [
-      "compress=zstd"
-      "noatime"
-      "subvol=tmp"
-    ];
-  };
+  fileSystems."/etc" =
+    { device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
+      fsType = "btrfs";
+      options = [ "subvol=etc" ];
+    };
 
-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/adcc14fa-8bf7-4b4b-a9e4-b038993b96cc";
-    fsType = "btrfs";
-    options = [
-      "compress=zstd"
-      "noatime"
-      "subvol=nix"
-    ];
-  };
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
+      fsType = "btrfs";
+      options = [ "subvol=nix" ];
+    };
 
-  fileSystems."/var/log" = {
-    device = "/dev/disk/by-uuid/adcc14fa-8bf7-4b4b-a9e4-b038993b96cc";
-    fsType = "btrfs";
-    options = [
-      "compress=zstd"
-      "noatime"
-      "subvol=log"
-    ];
-  };
+  fileSystems."/var/log" =
+    { device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
+      fsType = "btrfs";
+      options = [ "subvol=log" ];
+    };
 
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/adcc14fa-8bf7-4b4b-a9e4-b038993b96cc";
-    fsType = "btrfs";
-    options = [
-      "compress=zstd"
-      "subvol=home"
-    ];
-  };
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
+      fsType = "btrfs";
+      options = [ "subvol=home" ];
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/23FA-AD3E";
-    fsType = "vfat";
-    options = [
-      "fmask=0022"
-      "dmask=0022"
-    ];
-  };
-
-  # swapDevices = [
-  #   {
-  #     device = "/tmp/swapfile";
-  #     randomEncryption.enable = true;
-  #   }
-  # ];
+  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