From a88092202ccfdb981c6aef3270bdef20e7530f5f Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Wed, 10 Jul 2024 14:02:06 +0300
Subject: 2024-07-10

---
 modules/common/nix.nix    | 13 ++++---------
 modules/common/stylix.nix |  8 ++++++--
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'modules/common')

diff --git a/modules/common/nix.nix b/modules/common/nix.nix
index aad7106..fec9b80 100644
--- a/modules/common/nix.nix
+++ b/modules/common/nix.nix
@@ -43,7 +43,7 @@ in
             inherit rev hash;
           }
         );
-      pkgsPr = pr: pkgsRev "refs/pull/${toString pr}/head";
+      pkgsPR = pr: pkgsRev "refs/pull/${toString pr}/head";
     in
     {
       _module.args = {
@@ -52,7 +52,7 @@ in
           pkgsMaster
           pkgsStable
           pkgsRev
-          pkgsPr
+          pkgsPR
           ;
       };
 
@@ -126,16 +126,11 @@ in
 
         overlays = with inputs; [
           self.overlays.default
-          (_: prev: {
+          (_: _prev: {
             # Global PR package overrides go here. Example:
             # ```
-            # inherit (pkgsPr 309018 "sha256-x3ATxjrTVdaX5eo9P6pz+8/W6D2TNYzvjZpOBa3ZRI8=") endlessh-go;
+            # inherit (pkgsPR 309018 "sha256-x3ATxjrTVdaX5eo9P6pz+8/W6D2TNYzvjZpOBa3ZRI8=") endlessh-go;
             # ```
-
-            spf-engine = prev.spf-engine.override {
-              # FIXME https://nixpk.gs/pr-tracker.html?pr=321940
-              inherit (pkgsMaster.python311.pkgs) pymilter;
-            };
           })
         ];
       };
diff --git a/modules/common/stylix.nix b/modules/common/stylix.nix
index c7409b5..f1e0417 100644
--- a/modules/common/stylix.nix
+++ b/modules/common/stylix.nix
@@ -27,7 +27,6 @@ with lib;
       source-han-mono
       source-han-sans
       source-han-serif
-      twitter-color-emoji
     ];
     readOnly = true;
   };
@@ -63,6 +62,11 @@ with lib;
           name = "Iosevka Aile";
         };
 
+        emoji = {
+          package = pkgs.twitter-color-emoji;
+          name = "Twitter Color Emoji";
+        };
+
         sizes = {
           desktop = 10;
           applications = 10;
@@ -103,7 +107,7 @@ with lib;
             "Noto Sans Mono"
           ];
           emoji = mkForce [
-            "Twitter Color Emoji"
+            emoji.name
             "Noto Color Emoji"
           ];
         };
-- 
cgit 1.4.1