From 60481e9dfa56ec78bae3e39f817799dcdf788914 Mon Sep 17 00:00:00 2001
From: kenji <aks.kenji@protonmail.com>
Date: Fri, 11 Oct 2024 13:31:57 +0200
Subject: [PATCH 1/2] =?UTF-8?q?=E2=9E=96=20Remove=20nixpkgs=20follow=20for?=
 =?UTF-8?q?=20crane=20input=20(#199)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove nixpkgs follow for `crane` flake inputs.

`crane` doesn't depend on `nixpkgs` anymore.
---
 flake.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index 2f418c7..ddce9a5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,10 +10,7 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     home-manager.url = "github:nix-community/home-manager";
     treefmt-nix.url = "github:numtide/treefmt-nix/";
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    crane.url = "github:ipetkov/crane";
   };
 
   outputs =

From 56697f1c36397c24b4378e71eb357cf2f020c088 Mon Sep 17 00:00:00 2001
From: Christian Friedow <christian@friedow.com>
Date: Tue, 15 Oct 2024 21:18:31 +0200
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=9A=A8=20fix=20missing=20surface=20co?=
 =?UTF-8?q?lor=20default=20(#200)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/settings.rs | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/client/src/settings.rs b/client/src/settings.rs
index ad0500c..3c5ac71 100644
--- a/client/src/settings.rs
+++ b/client/src/settings.rs
@@ -116,14 +116,29 @@ pub struct GitRepositoriesPluginSettings {
     pub commands: Vec<Vec<String>>,
 }
 
+fn default_white() -> String {
+    "#ffffff".into()
+}
+
+fn default_black() -> String {
+    "#000000".into()
+}
+
+fn default_deprecated() -> String {
+    "deprecated".into()
+}
+
 #[derive(Debug, Deserialize)]
 pub struct ColorSettings {
+    #[serde(default = "default_white")]
     pub text: String,
+    #[serde(default = "default_black")]
     pub background: String,
     #[deprecated(
         since = "1.2.0",
         note = "color.surface has been replaced by automatic shading of the background color. Please remove this field from your configuration."
     )]
+    #[serde(default = "default_deprecated")]
     pub surface: String,
 }
 
@@ -131,9 +146,9 @@ impl Default for ColorSettings {
     fn default() -> Self {
         #[allow(deprecated)]
         Self {
-            text: "#ffffff".to_string(),
-            background: "#000000".to_string(),
-            surface: "deprecated".to_string(),
+            text: default_white(),
+            background: default_black(),
+            surface: default_deprecated(),
         }
     }
 }