Merge branch 'master' into update_sysinfo_0.26.2

Cargo.toml

@@ -41,13 +41,17 @@ opt-level = 3
 codegen-units = 1
 
 [features]
-default = ["fern", "log", "battery", "gpu", "zfs"]
 battery = ["starship-battery"]
-deploy = ["battery", "gpu"]
 gpu = ["nvidia"]
 nvidia = ["nvml-wrapper"]
 zfs = ["sysctl"]
 
+# The features we use by default.
+default = ["fern", "log", "battery", "gpu", "zfs"]
+
+# The features we use on deploy. Logging is not included as that is primarily (for now) just for debugging locally.
+deploy = ["battery", "gpu", "zfs"]
+
 [dependencies]
 anyhow = "1.0.57"
 backtrace = "0.3.65"
@@ -56,7 +60,6 @@ clap = { version = "3.1.12", features = ["default", "cargo", "wrap_help"] }
 concat-string = "1.0.1"
 crossterm = "0.18.2"
 ctrlc = { version = "3.1.9", features = ["termination"] }
-# const_format = "0.2.23"
 dirs = "4.0.0"
 
 fern = { version = "0.6.1", optional = true }