Flake: store nixpkgs patches in repo

flake.lock

@@ -284,18 +284,6 @@
         "type": "indirect"
       }
     },
-    "nixpkgs-pr280779": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-MnUPeXecesXaBF4x9/+LCiANjzX9KVtl0JalyWAucYk=",
-        "type": "file",
-        "url": "https://github.com/NixOS/nixpkgs/pull/280779.patch"
-      },
-      "original": {
-        "type": "file",
-        "url": "https://github.com/NixOS/nixpkgs/pull/280779.patch"
-      }
-    },
     "nixpkgs-unstable-raw": {
       "locked": {
         "lastModified": 1704722960,
@@ -347,7 +335,6 @@
         "nix-index-db-unstable": "nix-index-db-unstable",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-pr280779": "nixpkgs-pr280779",
         "nixpkgs-unstable-raw": "nixpkgs-unstable-raw",
         "plasma-manager": "plasma-manager",
         "vscode-extensions": "vscode-extensions"

flake.nix

@@ -5,11 +5,6 @@
 		nixpkgs.url = "nixpkgs/nixos-23.11";
 		nixpkgs-unstable-raw.url = "nixpkgs/nixos-unstable";
 
-		nixpkgs-pr280779 = {
-			url = "file+https://github.com/NixOS/nixpkgs/pull/280779.patch";
-			flake = false;
-		};
-
 		agenix = {
 			url = "github:ryantm/agenix";
 			inputs = {
@@ -77,7 +72,7 @@
 		nixpkgs-unstable-patched = nixpkgs.legacyPackages.x86_64-linux.applyPatches {
 			name = "patched-nixpkgs-unstable";
 			src = nixpkgs-unstable-raw;
-			patches = [ nixpkgs-pr280779 ];
+			patches = [ ./nixpkgs-patches/pr280779.patch ];
 		};
 		# https://discourse.nixos.org/t/proper-way-of-applying-patch-to-system-managed-via-flake/21073/26
 		nixpkgs-unstable = (import "${nixpkgs-unstable-patched}/flake.nix").outputs { self = inputs.self; };

nixpkgs-patches/pr280779.patch

@@ -0,0 +1,46 @@
+From cf1dfaa32a0201cc14801ebb93b5ef865d42522a 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
+
+---
+ 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 c9a51ba241d482..25794c9e67d7cd 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" "qt5ct" "refind" "rofi" "waybar" ];
++  validThemes = [ "bat" "bottom" "btop" "grub" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "qt5ct" "refind" "rofi" "starship" "waybar" ];
+ in
+ { fetchFromGitHub
+ , lib
+@@ -112,6 +112,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";
+@@ -195,6 +203,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/