Merge pull request #295350 from khaneliman/catppuccin

Catppuccin: add thunderbird and bump various themes

Artturi 4461faee 847fde41

Changed files
+27 -14
pkgs
data
themes
catppuccin
+27 -14
pkgs/data/themes/catppuccin/default.nix
···
let
-
validThemes = [ "bat" "bottom" "btop" "grub" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "qt5ct" "refind" "rofi" "starship" "waybar" ];
+
validThemes = [ "bat" "bottom" "btop" "grub" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "qt5ct" "refind" "rofi" "starship" "thunderbird" "waybar" ];
in
{ fetchFromGitHub
, lib
···
name = "bat";
owner = "catppuccin";
repo = "bat";
-
rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
-
hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
+
rev = "2bafe4454d8db28491e9087ff3a1382c336e7d27";
+
hash = "sha256-yHt3oIjUnljARaihalcWSNldtaJfVDfmfiecYfbzGs0=";
};
bottom = fetchFromGitHub {
···
name = "k9s";
owner = "catppuccin";
repo = "k9s";
-
rev = "516f44dd1a6680357cb30d96f7e656b653aa5059";
-
hash = "sha256-PtBJRBNbLkj7D2ko7ebpEjbfK9Ywjs7zbE+Y8FQVEfA=";
+
rev = "590a762110ad4b6ceff274265f2fe174c576ce96";
+
hash = "sha256-EBDciL3F6xVFXvND+5duT+OiVDWKkFMWbOOSruQ0lus=";
};
kvantum = fetchFromGitHub {
···
name = "lazygit";
owner = "catppuccin";
repo = "lazygit";
-
rev = "0543c28e8af1a935f8c512ad9451facbcc17d8a8";
-
hash = "sha256-OVihY5E+elPKag2H4RyWiSv+MdIqHtfGNM3/1u2ik6U=";
+
rev = "v2.0.0";
+
hash = "sha256-gM0HplHhcpvtpmIVdlX/p59h0v+ihKEidS1imqPYlBg=";
};
plymouth = fetchFromGitHub {
name = "plymouth";
owner = "catppuccin";
repo = "plymouth";
-
rev = "d4105cf336599653783c34c4a2d6ca8c93f9281c";
-
hash = "sha256-quBSH8hx3gD7y1JNWAKQdTk3CmO4t1kVo4cOGbeWlNE=";
+
rev = "67759fbe15eb9490d096ef8014d9f92fc5748fe7";
+
hash = "sha256-IzoyVOi44Uay7DTfzR9RdRLSjORsdBM4pPrgeXk5YMI=";
};
qt5ct = fetchFromGitHub {
···
hash = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=";
};
+
thunderbird = fetchFromGitHub {
+
name = "thunderbird";
+
owner = "catppuccin";
+
repo = "thunderbird";
+
rev = "d61882ad9fd35909a75da6bb95fca38db552135c";
+
hash = "sha256-wn8//8lHScbbB1nEiDY8DphnLUMKZBFMc1GPaTRjTOY=";
+
};
+
waybar = fetchFromGitHub {
name = "waybar";
owner = "catppuccin";
···
stdenvNoCC.mkDerivation {
inherit pname;
-
version = "unstable-2023-10-09";
+
version = "unstable-2024-03-12";
srcs = selectedSources;
···
'' + lib.optionalString (lib.elem "bat" themeList) ''
mkdir -p $out/bat
-
cp "${sources.bat}/Catppuccin-${variant}.tmTheme" "$out/bat/"
+
cp "${sources.bat}/themes/Catppuccin "$capitalizedVariant".tmTheme" "$out/bat/"
'' + lib.optionalString (lib.elem "btop" themeList) ''
mkdir -p $out/btop
···
'' + lib.optionalString (lib.elem "k9s" themeList) ''
mkdir -p $out/k9s
-
cp "${sources.k9s}/dist/${variant}.yml" "$out/k9s/"
+
cp "${sources.k9s}/dist/catppuccin-${variant}.yaml" "$out/k9s/"
+
cp "${sources.k9s}/dist/catppuccin-${variant}-transparent.yaml" "$out/k9s/"
'' + lib.optionalString (lib.elem "kvantum" themeList) ''
mkdir -p $out/share/Kvantum
···
'' + lib.optionalString (lib.elem "lazygit" themeList) ''
mkdir -p $out/lazygit/{themes,themes-mergable}
-
cp "${sources.lazygit}/themes/${variant}/${variant}-${accent}.yml" "$out/lazygit/themes/"
-
cp "${sources.lazygit}/themes-mergable/${variant}/${variant}-${accent}.yml" "$out/lazygit/themes-mergable/"
+
cp "${sources.lazygit}/themes/${variant}/${accent}.yml" "$out/lazygit/themes/"
+
cp "${sources.lazygit}/themes-mergable/${variant}/${accent}.yml" "$out/lazygit/themes-mergable/"
'' + lib.optionalString (lib.elem "plymouth" themeList) ''
mkdir -p $out/share/plymouth/themes/catppuccin-${variant}
···
'' + lib.optionalString (lib.elem "starship" themeList) ''
mkdir -p $out/starship
cp ${sources.starship}/palettes/${variant}.toml $out/starship/
+
+
'' + lib.optionalString (lib.elem "thunderbird" themeList) ''
+
mkdir -p $out/thunderbird
+
cp ${sources.thunderbird}/themes/${variant}/${variant}-${accent}.xpi $out/thunderbird/
'' + lib.optionalString (lib.elem "waybar" themeList) ''
mkdir -p $out/waybar