From f09d076c3a26cb99aa1b6f4356e3cb8d866f0252 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 30 May 2024 13:01:32 +0530
Subject: [PATCH 1/3] catppuccin-plymouth: move to pkgs/by-name

---
 .../default.nix => by-name/ca/catppuccin-plymouth/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{data/themes/catppuccin-plymouth/default.nix => by-name/ca/catppuccin-plymouth/package.nix} (100%)

diff --git a/pkgs/data/themes/catppuccin-plymouth/default.nix b/pkgs/by-name/ca/catppuccin-plymouth/package.nix
similarity index 100%
rename from pkgs/data/themes/catppuccin-plymouth/default.nix
rename to pkgs/by-name/ca/catppuccin-plymouth/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2f9a1213ff7..01165c972c61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -429,8 +429,6 @@ with pkgs;
 
   catppuccin-papirus-folders = callPackage ../data/icons/catppuccin-papirus-folders { };
 
-  catppuccin-plymouth = callPackage ../data/themes/catppuccin-plymouth { };
-
   btdu = callPackage ../tools/misc/btdu { };
 
   ccal = callPackage ../tools/misc/ccal { };

From 5114e98b1f82ee557c7212db7e02828c008866cc Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 30 May 2024 13:07:49 +0530
Subject: [PATCH 2/3] catppuccin-plymouth: unstable-2022-12-10 ->
 0-unstable-2024-05-28

add update-script
add johnrtitor as maintainer
---
 pkgs/by-name/ca/catppuccin-plymouth/package.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/catppuccin-plymouth/package.nix b/pkgs/by-name/ca/catppuccin-plymouth/package.nix
index 994c5ed0df2c..06281a47001d 100644
--- a/pkgs/by-name/ca/catppuccin-plymouth/package.nix
+++ b/pkgs/by-name/ca/catppuccin-plymouth/package.nix
@@ -1,6 +1,7 @@
 { stdenvNoCC
 , lib
 , fetchFromGitHub
+, unstableGitUpdater
 , variant ? "macchiato"
 }:
 
@@ -12,13 +13,13 @@ lib.checkListOfEnum "${pname}: color variant" validVariants [ variant ]
 
 stdenvNoCC.mkDerivation rec {
   inherit pname;
-  version = "unstable-2022-12-10";
+  version = "0-unstable-2024-05-28";
 
   src = fetchFromGitHub {
     owner = "catppuccin";
     repo = "plymouth";
-    rev = "d4105cf336599653783c34c4a2d6ca8c93f9281c";
-    hash = "sha256-quBSH8hx3gD7y1JNWAKQdTk3CmO4t1kVo4cOGbeWlNE=";
+    rev = "e13c348a0f47772303b2da1e9396027d8cda160d";
+    hash = "sha256-6DliqhRncvdPuKzL9LJec3PJWmK/jo9BrrML7g6YcH0=";
   };
 
   sourceRoot = "${src.name}/themes/catppuccin-${variant}";
@@ -33,11 +34,18 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
+  passthru.updateScript = unstableGitUpdater {
+    hardcodeZeroVersion = true;
+  };
+
   meta = with lib; {
     description = "Soothing pastel theme for Plymouth";
     homepage = "https://github.com/catppuccin/plymouth";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = [ maintainers.spectre256 ];
+    maintainers = with maintainers; [
+      johnrtitor
+      spectre256
+    ];
   };
 }

From 895a9ca48cea67f0f06e1eb9a9c5d0bd930fb984 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 30 May 2024 13:14:14 +0530
Subject: [PATCH 3/3] catppuccin-plymouth: cleanup

move to finalAttrs
use `lib.` explicitly
format with nixfmt-rfc-style
remove hardcodeZeroVersion per #316264
---
 .../ca/catppuccin-plymouth/package.nix        | 79 ++++++++++---------
 1 file changed, 42 insertions(+), 37 deletions(-)

diff --git a/pkgs/by-name/ca/catppuccin-plymouth/package.nix b/pkgs/by-name/ca/catppuccin-plymouth/package.nix
index 06281a47001d..dcd4602705df 100644
--- a/pkgs/by-name/ca/catppuccin-plymouth/package.nix
+++ b/pkgs/by-name/ca/catppuccin-plymouth/package.nix
@@ -1,51 +1,56 @@
-{ stdenvNoCC
-, lib
-, fetchFromGitHub
-, unstableGitUpdater
-, variant ? "macchiato"
+{
+  stdenvNoCC,
+  lib,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  variant ? "macchiato",
 }:
 
 let
   pname = "catppuccin-plymouth";
-  validVariants = [ "latte" "frappe" "macchiato" "mocha" ];
+  validVariants = [
+    "latte"
+    "frappe"
+    "macchiato"
+    "mocha"
+  ];
 in
 lib.checkListOfEnum "${pname}: color variant" validVariants [ variant ]
 
-stdenvNoCC.mkDerivation rec {
-  inherit pname;
-  version = "0-unstable-2024-05-28";
+  stdenvNoCC.mkDerivation
+  (finalAttrs: {
+    inherit pname;
+    version = "0-unstable-2024-05-28";
 
-  src = fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "plymouth";
-    rev = "e13c348a0f47772303b2da1e9396027d8cda160d";
-    hash = "sha256-6DliqhRncvdPuKzL9LJec3PJWmK/jo9BrrML7g6YcH0=";
-  };
+    src = fetchFromGitHub {
+      owner = "catppuccin";
+      repo = "plymouth";
+      rev = "e13c348a0f47772303b2da1e9396027d8cda160d";
+      hash = "sha256-6DliqhRncvdPuKzL9LJec3PJWmK/jo9BrrML7g6YcH0=";
+    };
 
-  sourceRoot = "${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 {
-    hardcodeZeroVersion = true;
-  };
+    passthru.updateScript = unstableGitUpdater { };
 
-  meta = with lib; {
-    description = "Soothing pastel theme for Plymouth";
-    homepage = "https://github.com/catppuccin/plymouth";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with 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
+      ];
+    };
+  })