overlay.nix

@@ -4,47 +4,28 @@
   ...
 }:
 with inputs;
-  final: prev: let
-    pkgsConfig = {
-      inherit system;
-      config.allowUnfree = true;
-    };
+  final: prev: {
+    # WebOne HTTP proxy.
+    webone = prev.pkgs.callPackage ./packages/webone {};
 
-    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.
+    # Yazi Gruvbox theme.
+    yazi-flavour-kanagawa-dragon = prev.pkgs.callPackage ./packages/yazi-flavour-kanagawa-dragon {};
 
-    # Kanagawa Dragon theme for tmux.
-    tmuxPlugins =
-      prev.tmuxPlugins
-      // {
-        kanagawa = prev.tmuxPlugins.mkTmuxPlugin {
-          pluginName = "kanagawa";
-          rtpFilePath = "kanagawa.tmux";
-          version = "2025-06-01";
-          src = prev.fetchFromGitHub {
-            owner = "Nybkox";
-            repo = "tmux-kanagawa";
-            rev = "9124a8887587f784aaec94b97631255a4e70b8a0";
-            hash = "sha256-ZueH5KjPD0SaReuWJOq1FGpjEFXg216BzeXL64o74MU=";
-          };
-        };
-      };
+    # Dymo label printer drivers.
+    cups-dymo = prev.pkgs.callPackage ./packages/cups-dymo {};
 
-    ## Unstable channel. ##
+    # Latest protonmail-desktop
+    protonmail-desktop = (import nixpkgs-unstable {inherit system;}).protonmail-desktop;
 
-    protonmail-desktop = pkgs-unstable.protonmail-desktop; # Protonmail desktop client.
-    rockbox-utility = pkgs-unstable.rockbox-utility; # Rockbox installer.
+    # Latest Rockbox Utility.
+    rockbox-utility = (import nixpkgs-unstable {inherit system;}).rockbox-utility;
 
-    # Fluffychat.
+    # Latest FluffyChat.
     fluffychat =
-      (pkgs-unstable
-        // {
-          overlay = [
+      (import nixpkgs-unstable
+        {
+          inherit system;
+          overlays = [
             (final: prev: {
               fluffychat = prev.fluffychat.overrideAttrs (prevAttrs: {
                 desktopItems = [
@@ -55,13 +36,11 @@ with inputs;
           ];
         }).fluffychat;
 
-    ## Pull requests. ##
-
-    # Feishin music player.
+    # Latest Feishin.
     feishin =
-      (pkgs-pr-feishin
-        // {
-          overlay = [
+      (import nixpkgs-pr-feishin {
+        inherit system;
+        overlays = [
           (final: prev: {
             feishin = prev.feishin.overrideAttrs (prevAttrs: rec {
               pname = "feishin";
@@ -83,8 +62,6 @@ with inputs;
         ];
       }).feishin;
 
-    ## Modifications ##
-
     # PrismLauncher with Temurin JRE;
     prismlauncher = prev.prismlauncher.override {
       jdks = [
@@ -92,6 +69,23 @@ with inputs;
       ];
     };
 
+    # Kanagawa Dragon theme for tmux.
+    tmuxPlugins =
+      prev.tmuxPlugins
+      // {
+        kanagawa = prev.tmuxPlugins.mkTmuxPlugin {
+          pluginName = "kanagawa";
+          rtpFilePath = "kanagawa.tmux";
+          version = "2025-06-01";
+          src = prev.fetchFromGitHub {
+            owner = "Nybkox";
+            repo = "tmux-kanagawa";
+            rev = "9124a8887587f784aaec94b97631255a4e70b8a0";
+            hash = "sha256-ZueH5KjPD0SaReuWJOq1FGpjEFXg216BzeXL64o74MU=";
+          };
+        };
+      };
+
     # Custom iosevka build.
     iosevka = prev.iosevka.override {
       set = "Custom";

suites/default.nix

@@ -33,12 +33,6 @@ with lib; {
   # Enable firmware updates.
   services.fwupd.enable = true;
 
-  # Enable zram swap.
-  zramSwap = {
-    enable = true;
-    algorithm = "lz4";
-  };
-
   # Set time zone.
   time.timeZone = "Australia/Perth";
 

suites/desktop/default.nix

@@ -31,6 +31,9 @@ with lib; {
     binfmt.emulatedSystems = ["aarch64-linux"];
   };
 
+  # Enable zram swap.
+  zramSwap.enable = true;
+
   # Enable smart card support (for YubiKey).
   services.pcscd.enable = true;