Merge branch 'main' into refactor/extract-settings-crate

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 =

settings/src/lib.rs

@@ -144,24 +144,39 @@ 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,
 }
 
 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(),
         }
     }
 }