Search for fallback configuration directories

clipcat-menu/src/cli/mod.rs

@@ -140,7 +140,8 @@ impl Cli {
             _ => {}
         }
 
-        let mut config = Config::load_or_default(config_file.unwrap_or_else(Config::default_path));
+        let mut config =
+            Config::load_or_default(config_file.unwrap_or_else(Config::search_config_file_path));
         if let Some(log_level) = log_level {
             config.log.level = log_level;
         }

clipcat-menu/src/config.rs

@@ -38,6 +38,27 @@ pub struct Config {
 }
 
 impl Config {
+    pub fn search_config_file_path() -> PathBuf {
+        let paths = vec![Self::default_path()]
+            .into_iter()
+            .chain(clipcat_base::fallback_project_config_directories().into_iter().map(
+                |mut path| {
+                    path.push(clipcat_base::MENU_CONFIG_NAME);
+                    path
+                },
+            ))
+            .collect::<Vec<_>>();
+        for path in paths {
+            let Ok(exists) = path.try_exists() else {
+                continue;
+            };
+            if exists {
+                return path;
+            }
+        }
+        Self::default_path()
+    }
+
     #[inline]
     pub fn default_path() -> PathBuf {
         [

clipcatctl/src/cli.rs

@@ -193,8 +193,9 @@ impl Default for Cli {
 
 impl Cli {
     fn load_config(&self) -> Config {
-        let mut config =
-            Config::load_or_default(self.config_file.clone().unwrap_or_else(Config::default_path));
+        let mut config = Config::load_or_default(
+            self.config_file.clone().unwrap_or_else(Config::search_config_file_path),
+        );
         if let Some(endpoint) = &self.server_endpoint {
             config.server_endpoint = endpoint.clone();
         }

clipcatctl/src/config.rs

@@ -33,6 +33,27 @@ impl Default for Config {
 }
 
 impl Config {
+    pub fn search_config_file_path() -> PathBuf {
+        let paths = vec![Self::default_path()]
+            .into_iter()
+            .chain(clipcat_base::fallback_project_config_directories().into_iter().map(
+                |mut path| {
+                    path.push(clipcat_base::CTL_CONFIG_NAME);
+                    path
+                },
+            ))
+            .collect::<Vec<_>>();
+        for path in paths {
+            let Ok(exists) = path.try_exists() else {
+                continue;
+            };
+            if exists {
+                return path;
+            }
+        }
+        Self::default_path()
+    }
+
     #[inline]
     pub fn default_path() -> PathBuf {
         [

clipcatd/src/command.rs

@@ -107,7 +107,7 @@ impl Cli {
     }
 
     fn load_config(&self) -> Result<Config, Error> {
-        let config_file = &self.config_file.clone().unwrap_or_else(Config::default_path);
+        let config_file = &self.config_file.clone().unwrap_or_else(Config::search_config_file_path);
         let mut config = Config::load(config_file)?;
 
         config.daemonize = !self.no_daemon;

clipcatd/src/config/mod.rs

@@ -78,6 +78,27 @@ impl Default for Config {
 }
 
 impl Config {
+    pub fn search_config_file_path() -> PathBuf {
+        let paths = vec![Self::default_path()]
+            .into_iter()
+            .chain(clipcat_base::fallback_project_config_directories().into_iter().map(
+                |mut path| {
+                    path.push(clipcat_base::DAEMON_CONFIG_NAME);
+                    path
+                },
+            ))
+            .collect::<Vec<_>>();
+        for path in paths {
+            let Ok(exists) = path.try_exists() else {
+                continue;
+            };
+            if exists {
+                return path;
+            }
+        }
+        Self::default_path()
+    }
+
     #[inline]
     pub fn default_path() -> PathBuf {
         [

crates/base/src/lib.rs

@@ -10,7 +10,7 @@ use std::{
     collections::hash_map::DefaultHasher,
     hash::{Hash, Hasher},
     net::{IpAddr, Ipv4Addr},
-    path::PathBuf,
+    path::{Path, PathBuf},
 };
 
 use bytes::Bytes;
@@ -77,6 +77,17 @@ pub static ref PROJECT_CONFIG_DIR: PathBuf = ProjectDirs::from("", PROJECT_NAME,
             .to_path_buf();
 }
 
+#[must_use]
+pub fn fallback_project_config_directories() -> Vec<PathBuf> {
+    let Some(user_dirs) = directories::UserDirs::new() else {
+        return Vec::new();
+    };
+    vec![
+        [user_dirs.home_dir(), &Path::new(".config"), &Path::new(PROJECT_NAME)].iter().collect(),
+        [user_dirs.home_dir(), &Path::new(&format!(".{PROJECT_NAME}"))].iter().collect(),
+    ]
+}
+
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub enum ClipboardContent {
     Plaintext(String),