From b9905ef8244ef70c87d51fd5cdc2c48d9ff0276a Mon Sep 17 00:00:00 2001
From: outfoxxed <outfoxxed@outfoxxed.me>
Date: Sun, 28 Sep 2025 20:24:43 -0700
Subject: [PATCH] nix: add overlay

---
 ci/variations.nix |  4 ++--
 default.nix       |  4 ++--
 flake.nix         | 17 +++++++++++------
 overlay.nix       |  5 +++++
 shell.nix         |  3 ++-
 5 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 overlay.nix

diff --git a/ci/variations.nix b/ci/variations.nix
index b0889be..b1d2947 100644
--- a/ci/variations.nix
+++ b/ci/variations.nix
@@ -2,6 +2,6 @@
   clangStdenv,
   gccStdenv,
 }: {
-  clang = { buildStdenv = clangStdenv; };
-  gcc = { buildStdenv = gccStdenv; };
+  clang = { stdenv = clangStdenv; };
+  gcc = { stdenv = gccStdenv; };
 }
diff --git a/default.nix b/default.nix
index 2cb3ac8..3908e3c 100644
--- a/default.nix
+++ b/default.nix
@@ -2,8 +2,8 @@
   lib,
   nix-gitignore,
   pkgs,
+  stdenv,
   keepDebugInfo,
-  buildStdenv ? pkgs.clangStdenv,
 
   pkg-config,
   cmake,
@@ -44,7 +44,7 @@
   withHyprland ? true,
   withI3 ? true,
 }: let
-  unwrapped = buildStdenv.mkDerivation {
+  unwrapped = stdenv.mkDerivation {
     pname = "quickshell${lib.optionalString debug "-debug"}";
     version = "0.2.0";
     src = nix-gitignore.gitignoreSource "/default.nix\n" ./.;
diff --git a/flake.nix b/flake.nix
index 5de9c96..8edda2c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,23 +4,28 @@
   };
 
   outputs = { self, nixpkgs }: let
+    overlayPkgs = p: p.appendOverlays [ self.overlays.default ];
+
     forEachSystem = fn:
       nixpkgs.lib.genAttrs
         nixpkgs.lib.platforms.linux
-        (system: fn system nixpkgs.legacyPackages.${system});
+        (system: fn system (overlayPkgs nixpkgs.legacyPackages.${system}));
   in {
-    packages = forEachSystem (system: pkgs: rec {
-      quickshell = pkgs.callPackage ./default.nix {
-        gitRev = self.rev or self.dirtyRev;
-      };
+    overlays.default = import ./overlay.nix {
+      rev = self.rev or self.dirtyRev;
+    };
 
+    packages = forEachSystem (system: pkgs: rec {
+      quickshell = pkgs.quickshell;
       default = quickshell;
     });
 
     devShells = forEachSystem (system: pkgs: rec {
       default = import ./shell.nix {
         inherit pkgs;
-        inherit (self.packages.${system}) quickshell;
+        quickshell = self.packages.${system}.quickshell.override {
+          stdenv = pkgs.clangStdenv;
+        };
       };
     });
   };
diff --git a/overlay.nix b/overlay.nix
new file mode 100644
index 0000000..d8ea137
--- /dev/null
+++ b/overlay.nix
@@ -0,0 +1,5 @@
+{ rev ? null }: (final: prev: {
+  quickshell = final.callPackage ./default.nix {
+    gitRev = rev;
+  };
+})
diff --git a/shell.nix b/shell.nix
index 82382f9..b768862 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,6 +1,7 @@
 {
   pkgs ? import <nixpkgs> {},
-  quickshell ? pkgs.callPackage ./default.nix {},
+  stdenv ? pkgs.clangStdenv, # faster compiles than gcc
+  quickshell ? pkgs.callPackage ./default.nix { inherit stdenv; },
   ...
 }: let
   tidyfox = import (pkgs.fetchFromGitea {