diff --git a/pkgs/by-name/ca/catppuccin-plymouth/package.nix b/pkgs/by-name/ca/catppuccin-plymouth/package.nix new file mode 100644 index 000000000000..dcd4602705df --- /dev/null +++ b/pkgs/by-name/ca/catppuccin-plymouth/package.nix @@ -0,0 +1,56 @@ +{ + stdenvNoCC, + lib, + fetchFromGitHub, + unstableGitUpdater, + variant ? "macchiato", +}: + +let + pname = "catppuccin-plymouth"; + validVariants = [ + "latte" + "frappe" + "macchiato" + "mocha" + ]; +in +lib.checkListOfEnum "${pname}: color variant" validVariants [ variant ] + + stdenvNoCC.mkDerivation + (finalAttrs: { + inherit pname; + version = "0-unstable-2024-05-28"; + + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "plymouth"; + rev = "e13c348a0f47772303b2da1e9396027d8cda160d"; + hash = "sha256-6DliqhRncvdPuKzL9LJec3PJWmK/jo9BrrML7g6YcH0="; + }; + + sourceRoot = "${finalAttrs.src.name}/themes/catppuccin-${variant}"; + + 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} + + runHook postInstall + ''; + + 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 + ]; + }; + }) diff --git a/pkgs/data/themes/catppuccin-plymouth/default.nix b/pkgs/data/themes/catppuccin-plymouth/default.nix deleted file mode 100644 index 994c5ed0df2c..000000000000 --- a/pkgs/data/themes/catppuccin-plymouth/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenvNoCC -, lib -, fetchFromGitHub -, variant ? "macchiato" -}: - -let - pname = "catppuccin-plymouth"; - validVariants = [ "latte" "frappe" "macchiato" "mocha" ]; -in -lib.checkListOfEnum "${pname}: color variant" validVariants [ variant ] - -stdenvNoCC.mkDerivation rec { - inherit pname; - version = "unstable-2022-12-10"; - - src = fetchFromGitHub { - owner = "catppuccin"; - repo = "plymouth"; - rev = "d4105cf336599653783c34c4a2d6ca8c93f9281c"; - hash = "sha256-quBSH8hx3gD7y1JNWAKQdTk3CmO4t1kVo4cOGbeWlNE="; - }; - - sourceRoot = "${src.name}/themes/catppuccin-${variant}"; - - 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} - - runHook postInstall - ''; - - meta = with lib; { - description = "Soothing pastel theme for Plymouth"; - homepage = "https://github.com/catppuccin/plymouth"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.spectre256 ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec20a7961b6c..f2d263511eab 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 { };