Flake: remove unneeded nixpkgs patches

2024-06-03 00:52:22 +02:00 · 2024-06-03 00:52:22 +02:00 · 6ac0973357
commit 6ac0973357
parent 2f3eafb1de
2 changed files with 0 additions and 98 deletions
--- a/nixpkgs-patches/0001-catppuccin-add-grub-theme.patch
+++ b/nixpkgs-patches/0001-catppuccin-add-grub-theme.patch
@ -1,49 +0,0 @@
-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
-
--- a/nixpkgs-patches/0002-catppuccin-add-starship-theme.patch
+++ b/nixpkgs-patches/0002-catppuccin-add-starship-theme.patch
@ -1,49 +0,0 @@
-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 2/2] catppuccin: add starship 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 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" "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
-@@ -104,6 +104,14 @@ let
-       hash = "sha256-DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY=";
-     };
- 
-+    starship = fetchFromGitHub {
-+      name = "starship";
-+      owner = "catppuccin";
-+      repo = "starship";
-+      rev = "5629d2356f62a9f2f8efad3ff37476c19969bd4f";
-+      hash = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=";
-+    };
-+
-     waybar = fetchFromGitHub {
-       name = "waybar";
-       owner = "catppuccin";
-@@ -183,6 +191,10 @@ stdenvNoCC.mkDerivation {
-     cp ${sources.refind}/${variant}.conf $out/refind/
-     cp -r ${sources.refind}/assets/${variant} $out/refind/assets/
- 
-+  '' + lib.optionalString (lib.elem "starship" themeList) ''
-+    mkdir -p $out/starship
-+    cp ${sources.starship}/palettes/${variant}.toml $out/starship/
-+
-   '' + lib.optionalString (lib.elem "waybar" themeList) ''
-     mkdir -p $out/waybar
-     cp ${sources.waybar}/${variant}.css $out/waybar/
-- 
-2.42.0
-