From 575b7bc370d91094dea925b7470b417feaaa4f80 Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Thu, 13 Nov 2025 14:35:05 +0100 Subject: [PATCH 1/3] catppuccin: add palette --- pkgs/by-name/ca/catppuccin/package.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/by-name/ca/catppuccin/package.nix b/pkgs/by-name/ca/catppuccin/package.nix index d6ae9a5e091a..083d24891109 100644 --- a/pkgs/by-name/ca/catppuccin/package.nix +++ b/pkgs/by-name/ca/catppuccin/package.nix @@ -11,6 +11,7 @@ let "kvantum" "lazygit" "lxqt" + "palette" "plymouth" "qt5ct" "refind" @@ -144,6 +145,14 @@ let hash = "sha256-3TuUkOwk6BSc7BnLnTowGAkSlNTOtGTRlEcjJ6MNJ5g="; }; + palette = fetchFromGitHub { + name = "palette"; + owner = "catppuccin"; + repo = "palette"; + rev = "0df7db6fe201b437d91e7288fa22807bb0e44701"; + hash = "sha256-R52Q1FVAclvBk7xNgj/Jl+GPCIbORNf6YbJ1nxH3Gzs="; + }; + plymouth = fetchFromGitHub { name = "plymouth"; owner = "catppuccin"; @@ -287,6 +296,11 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO mkdir -p "$out/share/lxqt/themes/catppuccin-${variant}" cp -r "${sources.lxqt}/src/catppuccin-${variant}/"* "$out/share/lxqt/themes/catppuccin-${variant}" + '' + + lib.optionalString (lib.elem "palette" themeList) '' + mkdir -p "$out/palette" + cp "${sources.palette}/palette.json" "$out/palette" + '' + lib.optionalString (lib.elem "plymouth" themeList) '' mkdir -p "$out/share/plymouth/themes/catppuccin-${variant}" From e86d9f0d5d2b903c8b79098e7b68be3a9effbeac Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Thu, 13 Nov 2025 14:38:16 +0100 Subject: [PATCH 2/3] catppuccin: order parts in installPhase --- pkgs/by-name/ca/catppuccin/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ca/catppuccin/package.nix b/pkgs/by-name/ca/catppuccin/package.nix index 083d24891109..412ffa42f47d 100644 --- a/pkgs/by-name/ca/catppuccin/package.nix +++ b/pkgs/by-name/ca/catppuccin/package.nix @@ -312,17 +312,17 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO mkdir -p "$out/qt5ct" cp "${sources.qt5ct}/themes/catppuccin-${variant}-${accent}.conf" "$out/qt5ct" - '' - + lib.optionalString (lib.elem "rofi" themeList) '' - mkdir -p "$out/rofi" - cp "${sources.rofi}/themes/catppuccin-${variant}.rasi" "$out/rofi" - '' + lib.optionalString (lib.elem "refind" themeList) '' mkdir -p "$out/refind/assets" cp "${sources.refind}/${variant}.conf" "$out/refind" cp -r "${sources.refind}/assets/${variant}" "$out/refind/assets" + '' + + lib.optionalString (lib.elem "rofi" themeList) '' + mkdir -p "$out/rofi" + cp "${sources.rofi}/themes/catppuccin-${variant}.rasi" "$out/rofi" + '' + lib.optionalString (lib.elem "starship" themeList) '' mkdir -p "$out/starship" From a3d34ae77c1ad2200bb073d769ba41a7ab35a811 Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Thu, 13 Nov 2025 15:10:56 +0100 Subject: [PATCH 3/3] catppuccin: cleanup installPhase --- pkgs/by-name/ca/catppuccin/package.nix | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ca/catppuccin/package.nix b/pkgs/by-name/ca/catppuccin/package.nix index 412ffa42f47d..bc95ed1db7c3 100644 --- a/pkgs/by-name/ca/catppuccin/package.nix +++ b/pkgs/by-name/ca/catppuccin/package.nix @@ -242,43 +242,43 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO '' + lib.optionalString (lib.elem "alacritty" themeList) '' mkdir -p "$out/alacritty" - cp "${sources.alacritty}/catppuccin-${variant}.toml" "$out/alacritty/" + cp "${sources.alacritty}/catppuccin-${variant}.toml" "$out/alacritty" '' + lib.optionalString (lib.elem "bat" themeList) '' mkdir -p "$out/bat" - cp "${sources.bat}/themes/Catppuccin "$capitalizedVariant".tmTheme" "$out/bat/" + cp "${sources.bat}/themes/Catppuccin $capitalizedVariant.tmTheme" "$out/bat" '' + lib.optionalString (lib.elem "btop" themeList) '' mkdir -p "$out/btop" - cp "${sources.btop}/themes/catppuccin_${variant}.theme" "$out/btop/" + cp "${sources.btop}/themes/catppuccin_${variant}.theme" "$out/btop" '' + lib.optionalString (lib.elem "bottom" themeList) '' mkdir -p "$out/bottom" - cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom/" + cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom" '' + lib.optionalString (lib.elem "element" themeList) '' mkdir -p "$out/element" - cp -r "${sources.element}/themes/${variant}/${accent}.json" "$out/element/" + cp -r "${sources.element}/themes/${variant}/${accent}.json" "$out/element" '' + lib.optionalString (lib.elem "grub" themeList) '' mkdir -p "$out/grub" - cp -r "${sources.grub}/src/catppuccin-${variant}-grub-theme/"* "$out/grub/" + cp -r "${sources.grub}/src/catppuccin-${variant}-grub-theme"/* "$out/grub" '' + lib.optionalString (lib.elem "hyprland" themeList) '' mkdir -p "$out/hyprland" - cp "${sources.hyprland}/themes/${variant}.conf" "$out/hyprland/" + cp "${sources.hyprland}/themes/${variant}.conf" "$out/hyprland" '' + lib.optionalString (lib.elem "k9s" themeList) '' mkdir -p "$out/k9s" - cp "${sources.k9s}/dist/catppuccin-${variant}.yaml" "$out/k9s/" - cp "${sources.k9s}/dist/catppuccin-${variant}-transparent.yaml" "$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) '' @@ -287,14 +287,14 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO '' + lib.optionalString (lib.elem "lazygit" themeList) '' - mkdir -p "$out/lazygit/"{themes,themes-mergable} - cp "${sources.lazygit}/themes/${variant}/${accent}.yml" "$out/lazygit/themes/" - cp "${sources.lazygit}/themes-mergable/${variant}/${accent}.yml" "$out/lazygit/themes-mergable/" + mkdir -p "$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 "lxqt" themeList) '' mkdir -p "$out/share/lxqt/themes/catppuccin-${variant}" - cp -r "${sources.lxqt}/src/catppuccin-${variant}/"* "$out/share/lxqt/themes/catppuccin-${variant}" + cp -r "${sources.lxqt}/src/catppuccin-${variant}"/* "$out/share/lxqt/themes/catppuccin-${variant}" '' + lib.optionalString (lib.elem "palette" themeList) '' @@ -304,8 +304,8 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO '' + lib.optionalString (lib.elem "plymouth" themeList) '' mkdir -p "$out/share/plymouth/themes/catppuccin-${variant}" - cp ${sources.plymouth}/themes/catppuccin-${variant}/* $out/share/plymouth/themes/catppuccin-${variant} - sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' $out/share/plymouth/themes/catppuccin-${variant}/catppuccin-${variant}.plymouth + cp "${sources.plymouth}/themes/catppuccin-${variant}"/* "$out/share/plymouth/themes/catppuccin-${variant}" + sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' "$out/share/plymouth/themes/catppuccin-${variant}/catppuccin-${variant}.plymouth" '' + lib.optionalString (lib.elem "qt5ct" themeList) ''