From d71402645d131a704aa70dc1d36bfaf2c7d11d4b Mon Sep 17 00:00:00 2001
From: palumbou <palumbo.u+github@gmail.com>
Date: Thu, 15 May 2025 19:46:02 +0200
Subject: [PATCH 1/3] catppuccin-plymouth: fix variant selection

The package previously had an issue where it defined valid variants but did
not properly connect the validation to the derivation. This resulted in only
the default "macchiato" variant being accessible.

Fixed by replacing `lib.checkListOfEnum` with `assert lib.assertOneOf`
to properly validate and allow selection of all defined variants:
"latte", "frappe", "macchiato" and "mocha".

Tested by successfully building the package with each variant.
---
 pkgs/by-name/ca/catppuccin-plymouth/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ca/catppuccin-plymouth/package.nix b/pkgs/by-name/ca/catppuccin-plymouth/package.nix
index f863353db247..1cfd20d9dcbe 100644
--- a/pkgs/by-name/ca/catppuccin-plymouth/package.nix
+++ b/pkgs/by-name/ca/catppuccin-plymouth/package.nix
@@ -15,9 +15,9 @@ let
     "mocha"
   ];
 in
-lib.checkListOfEnum "${pname}: color variant" validVariants [ variant ]
+assert lib.assertOneOf "${pname}: color variant" variant validVariants;
 
-  stdenvNoCC.mkDerivation
+stdenvNoCC.mkDerivation
   (finalAttrs: {
     inherit pname;
     version = "0-unstable-2024-10-19";

From 203e62674242242dca4c1504f5cbc10d1edc904d Mon Sep 17 00:00:00 2001
From: palumbou <palumbo.u+github@gmail.com>
Date: Thu, 15 May 2025 20:10:28 +0200
Subject: [PATCH 2/3] catppuccin-plymouth: fix formatting using nixpkgs-fmt and
 statix

---
 pkgs/by-name/ca/catppuccin-plymouth/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ca/catppuccin-plymouth/package.nix b/pkgs/by-name/ca/catppuccin-plymouth/package.nix
index 1cfd20d9dcbe..77b52ef5970d 100644
--- a/pkgs/by-name/ca/catppuccin-plymouth/package.nix
+++ b/pkgs/by-name/ca/catppuccin-plymouth/package.nix
@@ -1,9 +1,9 @@
-{
-  stdenvNoCC,
-  lib,
-  fetchFromGitHub,
-  unstableGitUpdater,
-  variant ? "macchiato",
+{ stdenvNoCC
+, lib
+, fetchFromGitHub
+, unstableGitUpdater
+, variant ? "macchiato"
+,
 }:
 
 let

From def8389c97748118172e7d273fcba8c2e00c2178 Mon Sep 17 00:00:00 2001
From: palumbou <palumbo.u+github@gmail.com>
Date: Fri, 16 May 2025 18:21:05 +0200
Subject: [PATCH 3/3] catppuccin-plymouth: fix formatting using "nix fmt" as
 written in the CONTRIBUTING.md documentation

---
 .../ca/catppuccin-plymouth/package.nix        | 71 +++++++++----------
 1 file changed, 35 insertions(+), 36 deletions(-)

diff --git a/pkgs/by-name/ca/catppuccin-plymouth/package.nix b/pkgs/by-name/ca/catppuccin-plymouth/package.nix
index 77b52ef5970d..590c55241455 100644
--- a/pkgs/by-name/ca/catppuccin-plymouth/package.nix
+++ b/pkgs/by-name/ca/catppuccin-plymouth/package.nix
@@ -1,9 +1,9 @@
-{ stdenvNoCC
-, lib
-, fetchFromGitHub
-, unstableGitUpdater
-, variant ? "macchiato"
-,
+{
+  stdenvNoCC,
+  lib,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  variant ? "macchiato",
 }:
 
 let
@@ -17,40 +17,39 @@ let
 in
 assert lib.assertOneOf "${pname}: color variant" variant validVariants;
 
-stdenvNoCC.mkDerivation
-  (finalAttrs: {
-    inherit pname;
-    version = "0-unstable-2024-10-19";
+stdenvNoCC.mkDerivation (finalAttrs: {
+  inherit pname;
+  version = "0-unstable-2024-10-19";
 
-    src = fetchFromGitHub {
-      owner = "catppuccin";
-      repo = "plymouth";
-      rev = "e0f58d6fcf3dbc2d35dfc4fec394217fbfa92666";
-      hash = "sha256-He6ER1QNrJCUthFoBBGHBINouW/tozxQy3R79F5tsuo=";
-    };
+  src = fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "plymouth";
+    rev = "e0f58d6fcf3dbc2d35dfc4fec394217fbfa92666";
+    hash = "sha256-He6ER1QNrJCUthFoBBGHBINouW/tozxQy3R79F5tsuo=";
+  };
 
-    sourceRoot = "${finalAttrs.src.name}/themes/catppuccin-${variant}";
+  sourceRoot = "${finalAttrs.src.name}/themes/catppuccin-${variant}";
 
-    installPhase = ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' catppuccin-${variant}.plymouth
-      mkdir -p $out/share/plymouth/themes/catppuccin-${variant}
-      cp * $out/share/plymouth/themes/catppuccin-${variant}
+    sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' catppuccin-${variant}.plymouth
+    mkdir -p $out/share/plymouth/themes/catppuccin-${variant}
+    cp * $out/share/plymouth/themes/catppuccin-${variant}
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
-    passthru.updateScript = unstableGitUpdater { };
+  passthru.updateScript = unstableGitUpdater { };
 
-    meta = {
-      description = "Soothing pastel theme for Plymouth";
-      homepage = "https://github.com/catppuccin/plymouth";
-      license = lib.licenses.mit;
-      platforms = lib.platforms.linux;
-      maintainers = with lib.maintainers; [
-        johnrtitor
-        spectre256
-      ];
-    };
-  })
+  meta = {
+    description = "Soothing pastel theme for Plymouth";
+    homepage = "https://github.com/catppuccin/plymouth";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      johnrtitor
+      spectre256
+    ];
+  };
+})