chore: Separate daemon, client, server, and lib into crates

11 files changed, 21 insertions, 31 deletions

diff --git a/crates/turtle/src/atuin_server/database/db/mod.rs b/crates/server/src/database/db/mod.rs
index 77bd0c61..77bd0c61 100644
--- a/crates/turtle/src/atuin_server/database/db/mod.rs
+++ b/crates/server/src/database/db/mod.rs
diff --git a/crates/turtle/src/atuin_server/database/db/wrappers.rs b/crates/server/src/database/db/wrappers.rs
index 0315e331..0315e331 100644
--- a/crates/turtle/src/atuin_server/database/db/wrappers.rs
+++ b/crates/server/src/database/db/wrappers.rs
diff --git a/crates/turtle/src/atuin_server/database/mod.rs b/crates/server/src/database/mod.rs
index 43fe5c3b..43fe5c3b 100644
--- a/crates/turtle/src/atuin_server/database/mod.rs
+++ b/crates/server/src/database/mod.rs
diff --git a/crates/turtle/src/atuin_server/database/models.rs b/crates/server/src/database/models.rs
index 3fa6f471..3fa6f471 100644
--- a/crates/turtle/src/atuin_server/database/models.rs
+++ b/crates/server/src/database/models.rs
diff --git a/crates/turtle/src/atuin_server/handlers/mod.rs b/crates/server/src/handlers/mod.rs
index b73df27b..c4332f80 100644
--- a/crates/turtle/src/atuin_server/handlers/mod.rs
+++ b/crates/server/src/handlers/mod.rs
@@ -1,7 +1,7 @@
 use crate::atuin_common::api::{ErrorResponse, IndexResponse};
 use axum::{Json, extract::State, http, response::IntoResponse};
 
-use crate::atuin_server::router::AppState;
+use crate::router::AppState;
 
 pub(crate) mod v0;
 
diff --git a/crates/turtle/src/atuin_server/handlers/v0/mod.rs b/crates/server/src/handlers/v0/mod.rs
index 78fb47b8..78fb47b8 100644
--- a/crates/turtle/src/atuin_server/handlers/v0/mod.rs
+++ b/crates/server/src/handlers/v0/mod.rs
diff --git a/crates/turtle/src/atuin_server/handlers/v0/record.rs b/crates/server/src/handlers/v0/record.rs
index 9350e1c8..0381ded8 100644
--- a/crates/turtle/src/atuin_server/handlers/v0/record.rs
+++ b/crates/server/src/handlers/v0/record.rs
@@ -3,7 +3,7 @@ use metrics::counter;
 use serde::Deserialize;
 use tracing::{error, instrument};
 
-use crate::atuin_server::{
+use crate::{
     handlers::{ErrorResponse, ErrorResponseStatus, RespExt},
     router::{AppState, UserAuth},
 };
diff --git a/crates/turtle/src/atuin_server/mod.rs b/crates/server/src/lib.rs
index a4b10acf..a4b10acf 100644
--- a/crates/turtle/src/atuin_server/mod.rs
+++ b/crates/server/src/lib.rs
diff --git a/crates/turtle/src/atuin_server/metrics.rs b/crates/server/src/metrics.rs
index 6380bef1..6380bef1 100644
--- a/crates/turtle/src/atuin_server/metrics.rs
+++ b/crates/server/src/metrics.rs
diff --git a/crates/turtle/src/atuin_server/router.rs b/crates/server/src/router.rs
index d6fe9482..2a5c5f15 100644
--- a/crates/turtle/src/atuin_server/router.rs
+++ b/crates/server/src/router.rs
@@ -16,7 +16,7 @@ use tower_http::trace::TraceLayer;
 use uuid::Uuid;
 
 use super::handlers;
-use crate::atuin_server::{
+use crate::{
     handlers::{ErrorResponseStatus, RespExt},
     metrics,
     settings::Settings,
diff --git a/crates/turtle/src/atuin_server/settings.rs b/crates/server/src/settings.rs
index 73fc5e42..6a32fb9b 100644
--- a/crates/turtle/src/atuin_server/settings.rs
+++ b/crates/server/src/settings.rs
@@ -6,7 +6,7 @@ use fs_err::create_dir_all;
 use serde::{Deserialize, Serialize};
 use tracing::info;
 
-use crate::atuin_server::database::DbSettings;
+use crate::database::DbSettings;
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub(crate) struct Metrics {
@@ -50,18 +50,6 @@ pub(crate) struct Settings {
 
 impl Settings {
     pub(crate) fn new() -> Result<Self> {
-        let mut config_file = std::env::var("ATUIN_CONFIG_DIR").map_or_else(
-            |_| {
-                let mut config_file = PathBuf::new();
-                let config_dir = crate::atuin_common::utils::config_dir();
-                config_file.push(config_dir);
-                config_file
-            },
-            PathBuf::from,
-        );
-
-        config_file.push("server.toml");
-
         // create the config file if it does not exist
         let mut config_builder = Config::builder()
             .set_default("host", "127.0.0.1")?
@@ -79,23 +67,25 @@ impl Settings {
                     .separator("__"),
             );
 
-        config_builder = if config_file.exists() {
-            config_builder.add_source(ConfigFile::new(
-                config_file.to_str().unwrap(),
-                FileFormat::Toml,
-            ))
-        } else {
-            // TODO(@bpeetz): Rework the config handling, so that we can actually auto-write a
-            // file with defaults. <2026-06-13>
-            create_dir_all(config_file.parent().unwrap())?;
+        if let Ok(mut config_file) = std::env::var("TURTLE_SERVER_CONFIG").map(PathBuf::from) {
+            config_builder = if config_file.exists() {
+                config_builder.add_source(ConfigFile::new(
+                    config_file.to_str().unwrap(),
+                    FileFormat::Toml,
+                ))
+            } else {
+                // TODO(@bpeetz): Rework the config handling, so that we can actually auto-write a
+                // file with defaults. <2026-06-13>
+                create_dir_all(config_file.parent().unwrap())?;
 
-            info!(
-                "No config file at: `{}`. Not adding one.",
-                config_file.display()
-            );
+                info!(
+                    "No config file at: `{}`. Not adding one.",
+                    config_file.display()
+                );
 
-            config_builder
-        };
+                config_builder
+            };
+        }
 
         let config = config_builder.build()?;