Merge branch 'main' of https://git.syzygial.cc/Syzygial/NixMachines

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
@@ -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";
@@ -55,7 +59,9 @@ in
     services.emacs = {
       # Emacsclient behaving weirdly
       # enable = true;
-      package = pkgs.me-emacs;
+      package = pkgs.me-emacs.override {
+        withNativeCompilation = false;
+      };
     };
 
     environment.variables = {
@@ -140,7 +146,10 @@ in
     ];
     
     environment.systemPackages = (with pkgs; [
-      me-emacs
+      (me-emacs.override {
+        withNativeCompilation = false;
+      })
+      svgbob
       (aspellWithDicts (p: with p;[
         en
         en-computers

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;
+      }))

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
     '';
   };