From fe36dca74a1de1e5eb4170fc24d2b66d44749044 Mon Sep 17 00:00:00 2001
From: david <davidcrompton@duck.com>
Date: Sat, 14 Dec 2024 10:09:00 -0500
Subject: [PATCH] universeair: catchup

---
 machines/universeair/configuration.nix | 82 +++++++++++++++++++++++++-
 1 file changed, 80 insertions(+), 2 deletions(-)

diff --git a/machines/universeair/configuration.nix b/machines/universeair/configuration.nix
index df08216..22787d6 100644
--- a/machines/universeair/configuration.nix
+++ b/machines/universeair/configuration.nix
@@ -65,6 +65,82 @@ in
       VISUAL = "emacs";
     };
 
+    nixpkgs.overlays = [
+      (final: prev: {
+        skia-aseprite = prev.skia-aseprite.overrideAttrs (old: {
+          postPatch = (old.postPatch or "") + ''
+            sed -i -e 's/"-march=armv7-a",//g' gn/skia/BUILD.gn
+          '';
+          buildInputs = old.buildInputs ++ [
+            final.xcbuild
+            final.darwin.apple_sdk.frameworks.ApplicationServices
+          ];
+          meta.maintainers = with pkgs.lib.maintainers; [
+            davidcromp
+          ];
+        });
+        aseprite = prev.aseprite.overrideAttrs (old: {
+          cmakeFlags = [
+            "-DENABLE_DESKTOP_INTEGRATION=OFF"
+            "-DENABLE_UPDATER=OFF"
+            "-DUSE_SHARED_CMARK=ON"
+            "-DUSE_SHARED_CURL=ON"
+            "-DUSE_SHARED_FMT=ON"
+            "-DUSE_SHARED_FREETYPE=ON"
+            "-DUSE_SHARED_GIFLIB=ON"
+            "-DUSE_SHARED_HARFBUZZ=ON"
+            "-DUSE_SHARED_JPEGLIB=ON"
+            "-DUSE_SHARED_LIBPNG=ON"
+            "-DPNG_ARM_NEON:STRING=on"
+            "-DUSE_SHARED_LIBWEBP=ON"
+            "-DUSE_SHARED_PIXMAN=ON"
+            "-DUSE_SHARED_TINYXML=ON"
+            "-DUSE_SHARED_WEBP=ON"
+            "-DUSE_SHARED_ZLIB=ON"
+            # Disable libarchive programs.
+            "-DENABLE_CAT=OFF"
+            "-DENABLE_CPIO=OFF"
+            "-DENABLE_TAR=OFF"
+            # UI backend.
+            "-DLAF_OS_BACKEND=skia"
+            "-DLAF_WITH_EXAMPLES=OFF"
+            "-DSKIA_DIR=${final.skia-aseprite}"
+            "-DSKIA_LIBRARY_DIR=${final.skia-aseprite}/lib"
+            "-DSKIA_LIBRARYR=${final.skia-aseprite}/lib/libskia.a"
+          ];
+          buildInputs = with pkgs; [
+            cmark
+            curl
+            fmt
+            fontconfig
+            freetype
+            giflib
+            glib
+            harfbuzzFull
+            libjpeg
+            libpng
+            libwebp
+            pcre2
+            pixman
+            skia-aseprite
+            tinyxml-2
+            zlib
+            
+            # MacOS:
+          ] ++ (with darwin.apple_sdk.frameworks; [
+            Cocoa
+            QuickLook
+            Quartz
+          ]);
+          
+          hardeningDisable = [
+            "format" # Darwin Specific
+          ];
+          meta.broken = false;
+        });
+      })
+    ];
+    
     environment.systemPackages = (with pkgs; [
       me-emacs
       (aspellWithDicts (p: with p;[
@@ -92,6 +168,7 @@ in
       slack
       inkscape
       gimp
+      # aseprite
       # TODO: Consider using Yabai??
     ]);
 
@@ -110,10 +187,10 @@ in
         "bitwarden"
         "zoom-for-it-admins"
         "libreoffice"
-        "microsoft-office"
         "kicad"
         "tailscale"
-        "r" "rstudio"
+        "godot"
+        "pixelorama"
       ];
       # Apps to install outside of nix for when wanting to test/run
       # things that... aren't used by other people who use nix, like
@@ -121,6 +198,7 @@ in
       brews = [
         "poetry"
         "python@3.11"
+        "python@3.10"
         "pygments"
         # sudo ln -sfn /opt/homebrew/opt/openjdk/libexec/openjdk.jdk \
 	# /Library/Java/JavaVirtualMachines/openjdk.jdk