From bf41da3a33865f0be6b4ad34e98fdcdd665cf80a Mon Sep 17 00:00:00 2001
From: Fern Garden <mail@fern.garden>
Date: Sun, 24 Aug 2025 19:38:41 +0800
Subject: [PATCH] Tidy overlay

---
 overlay.nix | 132 +++++++++++++++++++++++++++-------------------------
 1 file changed, 69 insertions(+), 63 deletions(-)

diff --git a/overlay.nix b/overlay.nix
index b00903a..195692d 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -4,71 +4,20 @@
   ...
 }:
 with inputs;
-  final: prev: {
-    # WebOne HTTP proxy.
-    webone = prev.pkgs.callPackage ./packages/webone {};
-
-    # Yazi Gruvbox theme.
-    yazi-flavour-kanagawa-dragon = prev.pkgs.callPackage ./packages/yazi-flavour-kanagawa-dragon {};
-
-    # Dymo label printer drivers.
-    cups-dymo = prev.pkgs.callPackage ./packages/cups-dymo {};
-
-    # Latest protonmail-desktop
-    protonmail-desktop = (import nixpkgs-unstable {inherit system;}).protonmail-desktop;
-
-    # Latest Rockbox Utility.
-    rockbox-utility = (import nixpkgs-unstable {inherit system;}).rockbox-utility;
-
-    # Latest FluffyChat.
-    fluffychat =
-      (import nixpkgs-unstable
-        {
-          inherit system;
-          overlays = [
-            (final: prev: {
-              fluffychat = prev.fluffychat.overrideAttrs (prevAttrs: {
-                desktopItems = [
-                  ((builtins.elemAt prevAttrs.desktopItems 0).override {startupWMClass = "fluffychat";})
-                ];
-              });
-            })
-          ];
-        }).fluffychat;
-
-    # Latest Feishin.
-    feishin =
-      (import nixpkgs-pr-feishin {
-        inherit system;
-        overlays = [
-          (final: prev: {
-            feishin = prev.feishin.overrideAttrs (prevAttrs: rec {
-              pname = "feishin";
-              version = "0.18.0";
-
-              src = prev.fetchFromGitHub {
-                owner = "jeffvli";
-                repo = "feishin";
-                rev = "v${version}";
-                hash = "sha256-4gcS7Vd7LSpEByO2Hlk6nb8V2adBPh5XwWGCu2lwOA4=";
-              };
-
-              pnpmDeps = prev.pnpm_10.fetchDeps {
-                inherit pname version src;
-                hash = "sha256-1MGxrUcfvazxAubaYAsQuulUKm05opWOIC7oaLzjr7o=";
-              };
-            });
-          })
-        ];
-      }).feishin;
-
-    # PrismLauncher with Temurin JRE;
-    prismlauncher = prev.prismlauncher.override {
-      jdks = [
-        prev.pkgs.temurin-jre-bin
-      ];
+  final: prev: let
+    pkgsConfig = {
+      inherit system;
+      config.allowUnfree = true;
     };
 
+    pkgs-unstable = import nixpkgs-unstable pkgsConfig;
+    pkgs-pr-feishin = import nixpkgs-pr-feishin pkgsConfig;
+  in {
+    # My packages.
+    webone = prev.pkgs.callPackage ./packages/webone {}; # WebOne HTTP proxy.
+    yazi-flavour-kanagawa-dragon = prev.pkgs.callPackage ./packages/yazi-flavour-kanagawa-dragon {}; # Kanagawa theme for yazi.
+    cups-dymo = prev.pkgs.callPackage ./packages/cups-dymo {}; # Dymo label printer drivers.
+
     # Kanagawa Dragon theme for tmux.
     tmuxPlugins =
       prev.tmuxPlugins
@@ -86,6 +35,63 @@ with inputs;
         };
       };
 
+    ## Unstable channel. ##
+
+    protonmail-desktop = pkgs-unstable.protonmail-desktop; # Protonmail desktop client.
+    rockbox-utility = pkgs-unstable.rockbox-utility; # Rockbox installer.
+
+    # Fluffychat.
+    fluffychat =
+      (pkgs-unstable
+        // {
+          overlay = [
+            (final: prev: {
+              fluffychat = prev.fluffychat.overrideAttrs (prevAttrs: {
+                desktopItems = [
+                  ((builtins.elemAt prevAttrs.desktopItems 0).override {startupWMClass = "fluffychat";})
+                ];
+              });
+            })
+          ];
+        }).fluffychat;
+
+    ## Pull requests. ##
+
+    # Feishin music player.
+    feishin =
+      (pkgs-pr-feishin
+        // {
+          overlay = [
+            (final: prev: {
+              feishin = prev.feishin.overrideAttrs (prevAttrs: rec {
+                pname = "feishin";
+                version = "0.18.0";
+
+                src = prev.fetchFromGitHub {
+                  owner = "jeffvli";
+                  repo = "feishin";
+                  rev = "v${version}";
+                  hash = "sha256-4gcS7Vd7LSpEByO2Hlk6nb8V2adBPh5XwWGCu2lwOA4=";
+                };
+
+                pnpmDeps = prev.pnpm_10.fetchDeps {
+                  inherit pname version src;
+                  hash = "sha256-1MGxrUcfvazxAubaYAsQuulUKm05opWOIC7oaLzjr7o=";
+                };
+              });
+            })
+          ];
+        }).feishin;
+
+    ## Modifications ##
+
+    # PrismLauncher with Temurin JRE;
+    prismlauncher = prev.prismlauncher.override {
+      jdks = [
+        prev.pkgs.temurin-jre-bin
+      ];
+    };
+
     # Custom iosevka build.
     iosevka = prev.iosevka.override {
       set = "Custom";