move daemon crate

atuinsh · May 6, 2024 · 6412adc · 6412adc
1 parent 7f0f49a
commit 6412adc
Show file tree

Hide file tree

Showing 12 changed files with 105 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,6 @@
 [workspace]
 members = [
   "crates/*",
-  "./atuin-daemon"
 ]
 
 resolver = "2"

diff --git a/crates/atuin-client/src/settings.rs b/crates/atuin-client/src/settings.rs
@@ -342,13 +342,12 @@ pub struct Preview {
     pub strategy: PreviewStrategy,
 }
 
-#[derive(Clone, Debug, Deserialize)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Daemon {
     pub enabled: bool,
     pub socket_path: String,
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
 impl Default for Preview {
     fn default() -> Self {
         Self {
@@ -357,7 +356,6 @@ impl Default for Preview {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
 impl Default for Daemon {
     fn default() -> Self {
         Self {

diff --git a/atuin-daemon/Cargo.toml → crates/atuin-daemon/Cargo.toml b/atuin-daemon/Cargo.toml → crates/atuin-daemon/Cargo.toml
diff --git a/atuin-daemon/build.rs → crates/atuin-daemon/build.rs b/atuin-daemon/build.rs → crates/atuin-daemon/build.rs
diff --git a/atuin-daemon/proto/history.proto → crates/atuin-daemon/proto/history.proto b/atuin-daemon/proto/history.proto → crates/atuin-daemon/proto/history.proto
diff --git a/atuin-daemon/src/client.rs → crates/atuin-daemon/src/client.rs b/atuin-daemon/src/client.rs → crates/atuin-daemon/src/client.rs
diff --git a/atuin-daemon/src/history.rs → crates/atuin-daemon/src/history.rs b/atuin-daemon/src/history.rs → crates/atuin-daemon/src/history.rs
diff --git a/atuin-daemon/src/lib.rs → crates/atuin-daemon/src/lib.rs b/atuin-daemon/src/lib.rs → crates/atuin-daemon/src/lib.rs
diff --git a/atuin-daemon/src/server.rs → crates/atuin-daemon/src/server.rs b/atuin-daemon/src/server.rs → crates/atuin-daemon/src/server.rs
diff --git a/atuin-daemon/src/server/sync.rs → crates/atuin-daemon/src/server/sync.rs b/atuin-daemon/src/server/sync.rs → crates/atuin-daemon/src/server/sync.rs
diff --git a/ui/.gitignore b/ui/.gitignore
@@ -22,5 +22,6 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+.vite
 
 gen