Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Flake: backport catppuccin grub theme to nixos 23.11

Browse source
This commit is contained in:
Toast 2024-01-23 10:37:01 +01:00
parent 14fa5aff15
commit 7056d6f597
3 changed files with 58 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
flake.nix
View file

@ -82,7 +82,8 @@
name = "patched-nixpkgs";
src = nixpkgs-raw;
patches = [
./nixpkgs-patches/0001-catppuccin-add-starship-theme.patch
./nixpkgs-patches/0001-catppuccin-add-grub-theme.patch
./nixpkgs-patches/0002-catppuccin-add-starship-theme.patch
];
};
# https://discourse.nixos.org/t/proper-way-of-applying-patch-to-system-managed-via-flake/21073/26

49
nixpkgs-patches/0001-catppuccin-add-grub-theme.patch Normal file
View file

@ -0,0 +1,49 @@
From 316d5e8f356d6817626bca5a37dd587418afc856 Mon Sep 17 00:00:00 2001
From: BlankParticle <blankparticle@gmail.com>
Date: Tue, 21 Nov 2023 18:14:15 +0530
Subject: [PATCH 1/2] catppuccin: add grub theme
---
pkgs/data/themes/catppuccin/default.nix | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/pkgs/data/themes/catppuccin/default.nix b/pkgs/data/themes/catppuccin/default.nix
index 59e030eb9e0e..e8cdb0456d17 100644
--- a/pkgs/data/themes/catppuccin/default.nix
+++ b/pkgs/data/themes/catppuccin/default.nix
@@ -1,5 +1,5 @@
let
- validThemes = [ "bat" "bottom" "btop" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "refind" "rofi" "waybar" ];
+ validThemes = [ "bat" "bottom" "btop" "grub" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "refind" "rofi" "waybar" ];
in
{ fetchFromGitHub
, lib
@@ -40,6 +40,14 @@ let
hash = "sha256-J3UezOQMDdxpflGax0rGBF/XMiKqdqZXuX4KMVGTxFk=";
};
+ grub = fetchFromGitHub {
+ name = "grub";
+ owner = "catppuccin";
+ repo = "grub";
+ rev = "v1.0.0";
+ hash = "sha256-/bSolCta8GCZ4lP0u5NVqYQ9Y3ZooYCNdTwORNvR7M0=";
+ };
+
hyprland = fetchFromGitHub {
name = "hyprland";
owner = "catppuccin";
@@ -140,6 +148,10 @@ stdenvNoCC.mkDerivation {
mkdir -p $out/bottom
cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom/"
+ '' + lib.optionalString (lib.elem "grub" themeList) ''
+ mkdir -p $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/"
--
2.42.0

15
nixpkgs-patches/0001-catppuccin-add-starship-theme.patch → nixpkgs-patches/0002-catppuccin-add-starship-theme.patch
View file

@ -1,25 +1,24 @@
From 8a73b27f67158e8161fc33a61cae2ebd3aa6c625 Mon Sep 17 00:00:00 2001
From 93af02433861cd32221164ddb4fc03b19cbf776b Mon Sep 17 00:00:00 2001
From: Toast <39011842+toast003@users.noreply.github.com>
Date: Sat, 13 Jan 2024 18:41:51 +0100
Subject: [PATCH] catppuccin: add starship theme
Subject: [PATCH 2/2] catppuccin: add starship theme
(cherry picked from commit cf1dfaa32a0201cc14801ebb93b5ef865d42522a)
---
pkgs/data/themes/catppuccin/default.nix | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/pkgs/data/themes/catppuccin/default.nix b/pkgs/data/themes/catppuccin/default.nix
index 59e030eb9e0e..6db2679a9d72 100644
index e8cdb0456d17..6ac8cc541ad3 100644
--- a/pkgs/data/themes/catppuccin/default.nix
+++ b/pkgs/data/themes/catppuccin/default.nix
@@ -1,5 +1,5 @@
let
- validThemes = [ "bat" "bottom" "btop" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "refind" "rofi" "waybar" ];
+ 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" "refind" "rofi" "waybar" ];
+ validThemes = [ "bat" "bottom" "btop" "grub" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "refind" "rofi" "starship" "waybar" ];
in
{ fetchFromGitHub
, lib
@@ -96,6 +96,14 @@ let
@@ -104,6 +104,14 @@ let
hash = "sha256-DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY=";
};
@ -34,7 +33,7 @@ index 59e030eb9e0e..6db2679a9d72 100644
waybar = fetchFromGitHub {
name = "waybar";
owner = "catppuccin";
@@ -171,6 +179,10 @@ stdenvNoCC.mkDerivation {
@@ -183,6 +191,10 @@ stdenvNoCC.mkDerivation {
cp ${sources.refind}/${variant}.conf $out/refind/
cp -r ${sources.refind}/assets/${variant} $out/refind/assets/