From dc8108a8e4ffd6a0bae5c65d7db91e6aaa23f988 Mon Sep 17 00:00:00 2001
From: david <davidcrompton@duck.com>
Date: Fri, 25 Apr 2025 18:59:25 -0400
Subject: [PATCH 1/4] universeair: minor changes

---
 machines/universeair/configuration.nix       |  1 +
 machines/universeair/libresprite_TODO_PR.nix | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 machines/universeair/libresprite_TODO_PR.nix

diff --git a/machines/universeair/configuration.nix b/machines/universeair/configuration.nix
index 668ab89..459adef 100644
--- a/machines/universeair/configuration.nix
+++ b/machines/universeair/configuration.nix
@@ -141,6 +141,7 @@ in
     
     environment.systemPackages = (with pkgs; [
       me-emacs
+      svgbob
       (aspellWithDicts (p: with p;[
         en
         en-computers
diff --git a/machines/universeair/libresprite_TODO_PR.nix b/machines/universeair/libresprite_TODO_PR.nix
new file mode 100644
index 0000000..222963f
--- /dev/null
+++ b/machines/universeair/libresprite_TODO_PR.nix
@@ -0,0 +1,18 @@
+      (libresprite.overrideAttrs (old: {
+        src = pkgs.fetchFromGitHub {
+          owner = "LibreSprite";
+          repo = "LibreSprite";
+          rev = "c99d3666b17ff731824e3eccc79cf3ec48564ad5";
+          fetchSubmodules = true;
+          sha256 = "sha256-mdMdHQvl6Mt0oisZ4c/Wk6dvklq3Iyz05brbFxSIaj0=";
+        };
+        patches = [];
+        buildInputs = old.buildInputs ++ (with pkgs; [
+          libarchive
+          tinyxml-2
+        ]);
+        postPatch = ''
+          sed -i -e 's/if(''${CMAKE_SYSTEM_NAME} MATCHES "Darwin")/if(FALSE)/' CMakeLists.txt
+        '';
+        meta.broken = false;
+      }))

From 7d7838e43c8bcc8b058274daab200dbcd6142943 Mon Sep 17 00:00:00 2001
From: david <davidcrompton@duck.com>
Date: Wed, 28 May 2025 16:55:51 -0400
Subject: [PATCH 2/4] universeair: Disable native-comp (broken in macOS 15.4+
 nixpkgs issue#395169)

---
 machines/universeair/configuration.nix | 8 ++++++--
 machines/universeair/skhd.nix          | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/machines/universeair/configuration.nix b/machines/universeair/configuration.nix
index 459adef..92acab4 100644
--- a/machines/universeair/configuration.nix
+++ b/machines/universeair/configuration.nix
@@ -55,7 +55,9 @@ in
     services.emacs = {
       # Emacsclient behaving weirdly
       # enable = true;
-      package = pkgs.me-emacs;
+      package = pkgs.me-emacs.override {
+        withNativeCompilation = false;
+      };
     };
 
     environment.variables = {
@@ -140,7 +142,9 @@ in
     ];
     
     environment.systemPackages = (with pkgs; [
-      me-emacs
+      (me-emacs.override {
+        withNativeCompilation = false;
+      })
       svgbob
       (aspellWithDicts (p: with p;[
         en
diff --git a/machines/universeair/skhd.nix b/machines/universeair/skhd.nix
index a5b508f..a6ee379 100644
--- a/machines/universeair/skhd.nix
+++ b/machines/universeair/skhd.nix
@@ -2,7 +2,7 @@
   services.skhd = {
     enable = true;
     skhdConfig = ''
-      cmd + shift - e : open '${pkgs.me-emacs}/Applications/Emacs.app'
+      cmd + shift - e : open '${(pkgs.me-emacs.override {withNativeCompilation = false;})}/Applications/Emacs.app'
       cmd + shift + ctrl - e : kitty -d ~ -1
     '';
   };

From 59631b5d75ce9c01339e55c816b772b93a7444aa Mon Sep 17 00:00:00 2001
From: david <davidcrompton@duck.com>
Date: Tue, 10 Jun 2025 17:11:19 -0400
Subject: [PATCH 3/4] universeair: Add trusted users

---
 machines/universeair/configuration.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/machines/universeair/configuration.nix b/machines/universeair/configuration.nix
index 92acab4..180f7ef 100644
--- a/machines/universeair/configuration.nix
+++ b/machines/universeair/configuration.nix
@@ -13,6 +13,10 @@ in
     nixpkgs.config.allowUnfree = true;
     # nix.package = pkgs.nixUnstable;
     nix.settings.auto-optimise-store = false;
+    nix.settings.trusted-users = [
+      "root"
+      "universelaptop"
+    ];
 
     users.users.universelaptop = {
       name = "universelaptop";

From 485b787d09b24005eddc1838b743a0833efae16f Mon Sep 17 00:00:00 2001
From: david <davidcrompton@duck.com>
Date: Tue, 10 Jun 2025 17:13:34 -0400
Subject: [PATCH 4/4] universeair: disable app-fix hack

---
 machines/universeair/configuration.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/machines/universeair/configuration.nix b/machines/universeair/configuration.nix
index 180f7ef..104c437 100644
--- a/machines/universeair/configuration.nix
+++ b/machines/universeair/configuration.nix
@@ -3,7 +3,7 @@ in
   {
     imports = [
       # Install Apps Detactable by Spotlight
-      ./app-fix.nix
+      # ./app-fix.nix
       # Tiling Window Manager
       ./yabai.nix
       # Shortcuts babe, not Automator