From 6f831d833e0cbd03d7cdbb6fe3cd3bf12209446f Mon Sep 17 00:00:00 2001
From: 0xrsydn <rafayrussani@gmail.com>
Date: Tue, 6 Jan 2026 13:49:42 +0700
Subject: [PATCH] fix: cascade of failling becaus of stupid git overlay

---
 flake.nix                   | 16 +++++++++++++++-
 modules/darwin/homebrew.nix |  1 +
 modules/darwin/system.nix   |  1 -
 modules/home/base.nix       |  3 ++-
 packages/default.nix        |  4 +---
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index d259471..863ae73 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,8 +49,22 @@
         }).git;
       };
 
+      # Overlay to skip syrupy tests (broken in nixpkgs unstable)
+      # Uses pythonPackagesExtensions to apply to all Python versions
+      syrupyOverlay = final: prev: {
+        pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
+          (pyFinal: pyPrev: {
+            syrupy = pyPrev.syrupy.overrideAttrs (old: { doCheck = false; });
+          })
+        ];
+      };
+
       overlaysList =
-        [ ghostty.overlays.default chaotic.overlays.default gitOverlay ];
+        [ ghostty.overlays.default
+          chaotic.overlays.default
+          gitOverlay
+          syrupyOverlay
+        ];
 
       mkPkgs = system:
         import nixpkgs {
diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix
index e96122a..5ba0aa1 100644
--- a/modules/darwin/homebrew.nix
+++ b/modules/darwin/homebrew.nix
@@ -25,6 +25,7 @@ in {
         "bitwarden"
         "brave-browser"
         "firefox"
+        "font-jetbrains-mono"
         "pgadmin4"
         "spotify"
         "vesktop"
diff --git a/modules/darwin/system.nix b/modules/darwin/system.nix
index eb3f8e8..c2c8e08 100644
--- a/modules/darwin/system.nix
+++ b/modules/darwin/system.nix
@@ -2,7 +2,6 @@
   imports = [ ./homebrew.nix ./devtools.nix ];
 
   nix = {
-    package = pkgs.nixVersions.nix_2_28;
     extraOptions = ''
       keep-derivations = true
       keep-outputs = true
diff --git a/modules/home/base.nix b/modules/home/base.nix
index d362487..c52403a 100644
--- a/modules/home/base.nix
+++ b/modules/home/base.nix
@@ -39,11 +39,12 @@
 
     rsydn.devTools = {
       enable = lib.mkDefault true;
+      # Note: jetbrains-mono removed - installed via Homebrew cask (font-jetbrains-mono)
+      # due to nixpkgs-unstable syrupy test failures breaking the font's Python build deps
       packages = with pkgs; [
         cloudflared
         fzf
         htop
-        jetbrains-mono
         jq
         jujutsu
         lazygit
diff --git a/packages/default.nix b/packages/default.nix
index fa7af4b..d809254 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -3,6 +3,4 @@
 let
   system = pkgs.stdenv.hostPlatform.system;
   llmPkgs = llm-agents.packages.${system};
-in {
-  opencode = llmPkgs.opencode;
-}
+in { opencode = llmPkgs.opencode; }