improve & fix macos

src/config/config.rs

@@ -1,4 +1,7 @@
-use serde::{Deserialize, Serialize};
+use serde::{
+    Deserialize,
+    Serialize,
+};
 
 #[derive(Deserialize, Serialize)]
 pub struct Config {

src/config/mod.rs

@@ -1,8 +1,9 @@
-use std::{
-    env::{self, VarError},
-    error::Error,
-    fs,
+use std::env::{
+    self,
+    VarError,
 };
+use std::error::Error;
+use std::fs;
 
 pub mod config;
 
@@ -11,7 +12,8 @@ pub fn config_dir() -> Result<String, VarError> {
         let root = env::var("USERPROFILE")?;
         Ok(format!("{}\\.ftch", root))
     } else {
-        let root = env::var("XDG_CONFIG_HOME")?;
+        let root = env::var("XDG_CONFIG_HOME")
+            .or_else(|_| env::var("HOME").map(|h| format!("{}/.config", h)))?;
         Ok(format!("{}/ftch", root))
     }
 }

src/data/os.rs

@@ -41,7 +41,42 @@ fn windows() -> Option<String> {
 }
 
 fn mac() -> Option<String> {
-    let output = Command::new("sw_vers").arg("-productName").output().ok()?;
+    let output = Command::new("sw_vers")
+        .arg("-productVersion")
+        .output()
+        .ok()?;
 
-    Some(String::from_utf8_lossy(&output.stdout).trim().to_string())
+    let version = String::from_utf8_lossy(&output.stdout).trim().to_string();
+    let codename = version_to_codename(&version);
+
+    Some(format!("macOS {codename}"))
+}
+
+fn version_to_codename(version: &str) -> String {
+    let major = version
+        .split('.')
+        .next()
+        .and_then(|v| v.parse::<u32>().ok())
+        .unwrap_or(0);
+
+    match major {
+        26 | 25 => "Tahoe",
+        24 => "Sequoia",
+        23 => "Sonoma",
+        22 => "Ventura",
+        21 => "Monterey",
+        20 => "Big Sur",
+        19 => "Catalina",
+        18 => "Mojave",
+        17 => "High Sierra",
+        16 => "Sierra",
+        15 => "El Capitan",
+        14 => "Yosemite",
+        13 => "Mavericks",
+        12 => "Mountain Lion",
+        11 => "Lion",
+        10 => "Snow Leopard",
+        _ => return version.to_string(),
+    }
+    .to_string()
 }

src/main.rs

@@ -1,4 +1,5 @@
-use std::{collections::VecDeque, error::Error};
+use std::collections::VecDeque;
+use std::error::Error;
 
 mod ascii;
 mod config;