From 60a74a81681506d17e3c936a62870259416d4081 Mon Sep 17 00:00:00 2001 From: Ellis Gibbons Date: Fri, 19 May 2023 13:37:06 -0400 Subject: [PATCH 1/2] add spectre256 as a maintainer --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8065425973f9..504c0a1d6038 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14782,6 +14782,12 @@ githubId = 2825204; name = "Steven Pease"; }; + spectre256 = { + name = "Ellis Gibbons"; + email = "egibbons256@gmail.com"; + github = "spectre256"; + githubId = 72505298; + }; spencerjanssen = { email = "spencerjanssen@gmail.com"; matrix = "@sjanssen:matrix.org"; From 7924b821f7dd2f5cc7e0c626919b3908ec419c3f Mon Sep 17 00:00:00 2001 From: Ellis Gibbons Date: Fri, 19 May 2023 13:39:46 -0400 Subject: [PATCH 2/2] catppuccin-plymouth: init at unstable-2022-12-10 --- .../themes/catppuccin-plymouth/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/data/themes/catppuccin-plymouth/default.nix diff --git a/pkgs/data/themes/catppuccin-plymouth/default.nix b/pkgs/data/themes/catppuccin-plymouth/default.nix new file mode 100644 index 000000000000..69a07f46d0df --- /dev/null +++ b/pkgs/data/themes/catppuccin-plymouth/default.nix @@ -0,0 +1,43 @@ +{ 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 = "source/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 feac7c4a2d94..1fc952b015e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -399,6 +399,8 @@ 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 { };