Bugfixes, show time ago, perf improvements

Also allow unique listing and more ergonomic cwd usage

1 files changed, 3 insertions, 2 deletions

diff --git a/atuin-server/src/settings.rs b/atuin-server/src/settings.rs
index 596b9018..e51b6b2a 100644
--- a/atuin-server/src/settings.rs
+++ b/atuin-server/src/settings.rs
@@ -23,15 +23,16 @@ impl Settings {
 
         create_dir_all(config_dir)?;
 
-        let config_file = if let Ok(p) = std::env::var("ATUIN_CONFIG") {
+        let mut config_file = if let Ok(p) = std::env::var("ATUIN_CONFIG_DIR") {
             PathBuf::from(p)
         } else {
             let mut config_file = PathBuf::new();
             config_file.push(config_dir);
-            config_file.push("server.toml");
             config_file
         };
 
+        config_file.push("server.toml");
+
         // create the config file if it does not exist
 
         let mut s = Config::new();