114 files changed, 21 insertions, 31 deletions
diff --git a/crates/turtle/src/atuin_client/api_client.rs b/crates/client/src/atuin_client/api_client.rs
index bd5bf59e..bd5bf59e 100644
--- a/crates/turtle/src/atuin_client/api_client.rs
+++ b/crates/client/src/atuin_client/api_client.rs
diff --git a/crates/turtle/src/atuin_client/database.rs b/crates/client/src/atuin_client/database.rs
index a9eb2058..a9eb2058 100644
--- a/crates/turtle/src/atuin_client/database.rs
+++ b/crates/client/src/atuin_client/database.rs
diff --git a/crates/turtle/src/atuin_client/encryption.rs b/crates/client/src/atuin_client/encryption.rs
index f1c921cb..f1c921cb 100644
--- a/crates/turtle/src/atuin_client/encryption.rs
+++ b/crates/client/src/atuin_client/encryption.rs
diff --git a/crates/turtle/src/atuin_client/history.rs b/crates/client/src/atuin_client/history.rs
index c38d8ccc..c38d8ccc 100644
--- a/crates/turtle/src/atuin_client/history.rs
+++ b/crates/client/src/atuin_client/history.rs
diff --git a/crates/turtle/src/atuin_client/history/builder.rs b/crates/client/src/atuin_client/history/builder.rs
index daa4ef49..daa4ef49 100644
--- a/crates/turtle/src/atuin_client/history/builder.rs
+++ b/crates/client/src/atuin_client/history/builder.rs
diff --git a/crates/turtle/src/atuin_client/history/store.rs b/crates/client/src/atuin_client/history/store.rs
index 9c7771cc..9c7771cc 100644
--- a/crates/turtle/src/atuin_client/history/store.rs
+++ b/crates/client/src/atuin_client/history/store.rs
diff --git a/crates/turtle/src/atuin_client/meta.rs b/crates/client/src/atuin_client/meta.rs
index 079c9926..079c9926 100644
--- a/crates/turtle/src/atuin_client/meta.rs
+++ b/crates/client/src/atuin_client/meta.rs
diff --git a/crates/turtle/src/atuin_client/mod.rs b/crates/client/src/atuin_client/mod.rs
index 851dfbdb..851dfbdb 100644
--- a/crates/turtle/src/atuin_client/mod.rs
+++ b/crates/client/src/atuin_client/mod.rs
diff --git a/crates/turtle/src/atuin_client/ordering.rs b/crates/client/src/atuin_client/ordering.rs
index 84001f52..84001f52 100644
--- a/crates/turtle/src/atuin_client/ordering.rs
+++ b/crates/client/src/atuin_client/ordering.rs
diff --git a/crates/turtle/src/atuin_client/record/encryption.rs b/crates/client/src/atuin_client/record/encryption.rs
index d8587cf6..d8587cf6 100644
--- a/crates/turtle/src/atuin_client/record/encryption.rs
+++ b/crates/client/src/atuin_client/record/encryption.rs
diff --git a/crates/turtle/src/atuin_client/record/mod.rs b/crates/client/src/atuin_client/record/mod.rs
index 4e5774ea..4e5774ea 100644
--- a/crates/turtle/src/atuin_client/record/mod.rs
+++ b/crates/client/src/atuin_client/record/mod.rs
diff --git a/crates/turtle/src/atuin_client/record/sqlite_store.rs b/crates/client/src/atuin_client/record/sqlite_store.rs
index 18f5c869..18f5c869 100644
--- a/crates/turtle/src/atuin_client/record/sqlite_store.rs
+++ b/crates/client/src/atuin_client/record/sqlite_store.rs
diff --git a/crates/turtle/src/atuin_client/record/sync.rs b/crates/client/src/atuin_client/record/sync.rs
index da05533c..da05533c 100644
--- a/crates/turtle/src/atuin_client/record/sync.rs
+++ b/crates/client/src/atuin_client/record/sync.rs
diff --git a/crates/turtle/src/atuin_client/secrets.rs b/crates/client/src/atuin_client/secrets.rs
index 74d47ea6..74d47ea6 100644
--- a/crates/turtle/src/atuin_client/secrets.rs
+++ b/crates/client/src/atuin_client/secrets.rs
diff --git a/crates/turtle/src/atuin_client/settings.rs b/crates/client/src/atuin_client/settings.rs
index 9e14c4c8..9e14c4c8 100644
--- a/crates/turtle/src/atuin_client/settings.rs
+++ b/crates/client/src/atuin_client/settings.rs
diff --git a/crates/turtle/src/atuin_client/settings/meta.rs b/crates/client/src/atuin_client/settings/meta.rs
index cc5afcf7..cc5afcf7 100644
--- a/crates/turtle/src/atuin_client/settings/meta.rs
+++ b/crates/client/src/atuin_client/settings/meta.rs
diff --git a/crates/turtle/src/atuin_client/settings/watcher.rs b/crates/client/src/atuin_client/settings/watcher.rs
index 5eec3692..5eec3692 100644
--- a/crates/turtle/src/atuin_client/settings/watcher.rs
+++ b/crates/client/src/atuin_client/settings/watcher.rs
diff --git a/crates/turtle/src/atuin_client/theme.rs b/crates/client/src/atuin_client/theme.rs
index ec0538e9..ec0538e9 100644
--- a/crates/turtle/src/atuin_client/theme.rs
+++ b/crates/client/src/atuin_client/theme.rs
diff --git a/crates/turtle/src/atuin_client/utils.rs b/crates/client/src/atuin_client/utils.rs
index 989f9fc1..989f9fc1 100644
--- a/crates/turtle/src/atuin_client/utils.rs
+++ b/crates/client/src/atuin_client/utils.rs
diff --git a/crates/turtle/src/atuin_common/api.rs b/crates/client/src/atuin_common/api.rs
index 0868943d..0868943d 100644
--- a/crates/turtle/src/atuin_common/api.rs
+++ b/crates/client/src/atuin_common/api.rs
diff --git a/crates/turtle/src/atuin_common/mod.rs b/crates/client/src/atuin_common/mod.rs
index 635c9fc3..635c9fc3 100644
--- a/crates/turtle/src/atuin_common/mod.rs
+++ b/crates/client/src/atuin_common/mod.rs
diff --git a/crates/turtle/src/atuin_common/record.rs b/crates/client/src/atuin_common/record.rs
index f8f9f8a7..f8f9f8a7 100644
--- a/crates/turtle/src/atuin_common/record.rs
+++ b/crates/client/src/atuin_common/record.rs
diff --git a/crates/turtle/src/atuin_common/shell.rs b/crates/client/src/atuin_common/shell.rs
index 880ff00f..880ff00f 100644
--- a/crates/turtle/src/atuin_common/shell.rs
+++ b/crates/client/src/atuin_common/shell.rs
diff --git a/crates/turtle/src/atuin_common/tls.rs b/crates/client/src/atuin_common/tls.rs
index 3736f878..3736f878 100644
--- a/crates/turtle/src/atuin_common/tls.rs
+++ b/crates/client/src/atuin_common/tls.rs
diff --git a/crates/turtle/src/atuin_common/utils.rs b/crates/client/src/atuin_common/utils.rs
index dbe9dfbc..dbe9dfbc 100644
--- a/crates/turtle/src/atuin_common/utils.rs
+++ b/crates/client/src/atuin_common/utils.rs
diff --git a/crates/turtle/src/atuin_history/mod.rs b/crates/client/src/atuin_history/mod.rs
index 41336a14..41336a14 100644
--- a/crates/turtle/src/atuin_history/mod.rs
+++ b/crates/client/src/atuin_history/mod.rs
diff --git a/crates/turtle/src/atuin_history/sort.rs b/crates/client/src/atuin_history/sort.rs
index 3143fa68..3143fa68 100644
--- a/crates/turtle/src/atuin_history/sort.rs
+++ b/crates/client/src/atuin_history/sort.rs
diff --git a/crates/turtle/src/atuin_history/stats.rs b/crates/client/src/atuin_history/stats.rs
index c53dafb2..c53dafb2 100644
--- a/crates/turtle/src/atuin_history/stats.rs
+++ b/crates/client/src/atuin_history/stats.rs
diff --git a/crates/turtle/src/atuin_pty_proxy/capture.rs b/crates/client/src/atuin_pty_proxy/capture.rs
index 55bc1788..55bc1788 100644
--- a/crates/turtle/src/atuin_pty_proxy/capture.rs
+++ b/crates/client/src/atuin_pty_proxy/capture.rs
diff --git a/crates/turtle/src/atuin_pty_proxy/debug.rs b/crates/client/src/atuin_pty_proxy/debug.rs
index c2a1691c..c2a1691c 100644
--- a/crates/turtle/src/atuin_pty_proxy/debug.rs
+++ b/crates/client/src/atuin_pty_proxy/debug.rs
diff --git a/crates/turtle/src/atuin_pty_proxy/mod.rs b/crates/client/src/atuin_pty_proxy/mod.rs
index e1d01c83..e1d01c83 100644
--- a/crates/turtle/src/atuin_pty_proxy/mod.rs
+++ b/crates/client/src/atuin_pty_proxy/mod.rs
diff --git a/crates/turtle/src/atuin_pty_proxy/osc133.rs b/crates/client/src/atuin_pty_proxy/osc133.rs
index f2a796f1..f2a796f1 100644
--- a/crates/turtle/src/atuin_pty_proxy/osc133.rs
+++ b/crates/client/src/atuin_pty_proxy/osc133.rs
diff --git a/crates/turtle/src/atuin_pty_proxy/pty_proxy.rs b/crates/client/src/atuin_pty_proxy/pty_proxy.rs
index ef4b0c37..ef4b0c37 100644
--- a/crates/turtle/src/atuin_pty_proxy/pty_proxy.rs
+++ b/crates/client/src/atuin_pty_proxy/pty_proxy.rs
diff --git a/crates/turtle/src/atuin_pty_proxy/runtime.rs b/crates/client/src/atuin_pty_proxy/runtime.rs
index 69b3a075..69b3a075 100644
--- a/crates/turtle/src/atuin_pty_proxy/runtime.rs
+++ b/crates/client/src/atuin_pty_proxy/runtime.rs
diff --git a/crates/turtle/src/atuin_pty_proxy/screen.rs b/crates/client/src/atuin_pty_proxy/screen.rs
index 58ebd2eb..58ebd2eb 100644
--- a/crates/turtle/src/atuin_pty_proxy/screen.rs
+++ b/crates/client/src/atuin_pty_proxy/screen.rs
diff --git a/crates/turtle/src/command/CONTRIBUTORS b/crates/client/src/command/CONTRIBUTORS
index 1ca4115a..1ca4115a 120000
--- a/crates/turtle/src/command/CONTRIBUTORS
+++ b/crates/client/src/command/CONTRIBUTORS
diff --git a/crates/turtle/src/command/client.rs b/crates/client/src/command/client.rs
index 6c0e70e8..6c0e70e8 100644
--- a/crates/turtle/src/command/client.rs
+++ b/crates/client/src/command/client.rs
diff --git a/crates/turtle/src/command/client/config.rs b/crates/client/src/command/client/config.rs
index 73d1c35e..73d1c35e 100644
--- a/crates/turtle/src/command/client/config.rs
+++ b/crates/client/src/command/client/config.rs
diff --git a/crates/turtle/src/command/client/daemon.rs b/crates/client/src/command/client/daemon.rs
index 39aa1b1e..39aa1b1e 100644
--- a/crates/turtle/src/command/client/daemon.rs
+++ b/crates/client/src/command/client/daemon.rs
diff --git a/crates/turtle/src/command/client/default_config.rs b/crates/client/src/command/client/default_config.rs
index 4b03c909..4b03c909 100644
--- a/crates/turtle/src/command/client/default_config.rs
+++ b/crates/client/src/command/client/default_config.rs
diff --git a/crates/turtle/src/command/client/history.rs b/crates/client/src/command/client/history.rs
index 9f383a08..9f383a08 100644
--- a/crates/turtle/src/command/client/history.rs
+++ b/crates/client/src/command/client/history.rs
diff --git a/crates/turtle/src/command/client/info.rs b/crates/client/src/command/client/info.rs
index 49c92193..49c92193 100644
--- a/crates/turtle/src/command/client/info.rs
+++ b/crates/client/src/command/client/info.rs
diff --git a/crates/turtle/src/command/client/init.rs b/crates/client/src/command/client/init.rs
index 0db9b143..0db9b143 100644
--- a/crates/turtle/src/command/client/init.rs
+++ b/crates/client/src/command/client/init.rs
diff --git a/crates/turtle/src/command/client/init/bash.rs b/crates/client/src/command/client/init/bash.rs
index c16663e2..c16663e2 100644
--- a/crates/turtle/src/command/client/init/bash.rs
+++ b/crates/client/src/command/client/init/bash.rs
diff --git a/crates/turtle/src/command/client/init/fish.rs b/crates/client/src/command/client/init/fish.rs
index 0a992b9c..0a992b9c 100644
--- a/crates/turtle/src/command/client/init/fish.rs
+++ b/crates/client/src/command/client/init/fish.rs
diff --git a/crates/turtle/src/command/client/init/powershell.rs b/crates/client/src/command/client/init/powershell.rs
index 94d89c67..94d89c67 100644
--- a/crates/turtle/src/command/client/init/powershell.rs
+++ b/crates/client/src/command/client/init/powershell.rs
diff --git a/crates/turtle/src/command/client/init/xonsh.rs b/crates/client/src/command/client/init/xonsh.rs
index 25f867f7..25f867f7 100644
--- a/crates/turtle/src/command/client/init/xonsh.rs
+++ b/crates/client/src/command/client/init/xonsh.rs
diff --git a/crates/turtle/src/command/client/init/zsh.rs b/crates/client/src/command/client/init/zsh.rs
index 96a817d0..96a817d0 100644
--- a/crates/turtle/src/command/client/init/zsh.rs
+++ b/crates/client/src/command/client/init/zsh.rs
diff --git a/crates/turtle/src/command/client/search.rs b/crates/client/src/command/client/search.rs
index 359864cb..359864cb 100644
--- a/crates/turtle/src/command/client/search.rs
+++ b/crates/client/src/command/client/search.rs
diff --git a/crates/turtle/src/command/client/search/cursor.rs b/crates/client/src/command/client/search/cursor.rs
index e13e52b3..e13e52b3 100644
--- a/crates/turtle/src/command/client/search/cursor.rs
+++ b/crates/client/src/command/client/search/cursor.rs
diff --git a/crates/turtle/src/command/client/search/duration.rs b/crates/client/src/command/client/search/duration.rs
index 0d70353a..0d70353a 100644
--- a/crates/turtle/src/command/client/search/duration.rs
+++ b/crates/client/src/command/client/search/duration.rs
diff --git a/crates/turtle/src/command/client/search/engines.rs b/crates/client/src/command/client/search/engines.rs
index 9fbff278..9fbff278 100644
--- a/crates/turtle/src/command/client/search/engines.rs
+++ b/crates/client/src/command/client/search/engines.rs
diff --git a/crates/turtle/src/command/client/search/engines/daemon.rs b/crates/client/src/command/client/search/engines/daemon.rs
index ee92ebaf..ee92ebaf 100644
--- a/crates/turtle/src/command/client/search/engines/daemon.rs
+++ b/crates/client/src/command/client/search/engines/daemon.rs
diff --git a/crates/turtle/src/command/client/search/engines/db.rs b/crates/client/src/command/client/search/engines/db.rs
index 0eb86878..0eb86878 100644
--- a/crates/turtle/src/command/client/search/engines/db.rs
+++ b/crates/client/src/command/client/search/engines/db.rs
diff --git a/crates/turtle/src/command/client/search/engines/skim.rs b/crates/client/src/command/client/search/engines/skim.rs
index e090e40d..e090e40d 100644
--- a/crates/turtle/src/command/client/search/engines/skim.rs
+++ b/crates/client/src/command/client/search/engines/skim.rs
diff --git a/crates/turtle/src/command/client/search/history_list.rs b/crates/client/src/command/client/search/history_list.rs
index e46f37b7..e46f37b7 100644
--- a/crates/turtle/src/command/client/search/history_list.rs
+++ b/crates/client/src/command/client/search/history_list.rs
diff --git a/crates/turtle/src/command/client/search/inspector.rs b/crates/client/src/command/client/search/inspector.rs
index 186dcd3a..186dcd3a 100644
--- a/crates/turtle/src/command/client/search/inspector.rs
+++ b/crates/client/src/command/client/search/inspector.rs
diff --git a/crates/turtle/src/command/client/search/interactive.rs b/crates/client/src/command/client/search/interactive.rs
index b8cf53db..b8cf53db 100644
--- a/crates/turtle/src/command/client/search/interactive.rs
+++ b/crates/client/src/command/client/search/interactive.rs
diff --git a/crates/turtle/src/command/client/search/keybindings/actions.rs b/crates/client/src/command/client/search/keybindings/actions.rs
index 2842d618..2842d618 100644
--- a/crates/turtle/src/command/client/search/keybindings/actions.rs
+++ b/crates/client/src/command/client/search/keybindings/actions.rs
diff --git a/crates/turtle/src/command/client/search/keybindings/conditions.rs b/crates/client/src/command/client/search/keybindings/conditions.rs
index fd993f2b..fd993f2b 100644
--- a/crates/turtle/src/command/client/search/keybindings/conditions.rs
+++ b/crates/client/src/command/client/search/keybindings/conditions.rs
diff --git a/crates/turtle/src/command/client/search/keybindings/defaults.rs b/crates/client/src/command/client/search/keybindings/defaults.rs
index 4d00b475..4d00b475 100644
--- a/crates/turtle/src/command/client/search/keybindings/defaults.rs
+++ b/crates/client/src/command/client/search/keybindings/defaults.rs
diff --git a/crates/turtle/src/command/client/search/keybindings/key.rs b/crates/client/src/command/client/search/keybindings/key.rs
index 5e772238..5e772238 100644
--- a/crates/turtle/src/command/client/search/keybindings/key.rs
+++ b/crates/client/src/command/client/search/keybindings/key.rs
diff --git a/crates/turtle/src/command/client/search/keybindings/keymap.rs b/crates/client/src/command/client/search/keybindings/keymap.rs
index 067d9403..067d9403 100644
--- a/crates/turtle/src/command/client/search/keybindings/keymap.rs
+++ b/crates/client/src/command/client/search/keybindings/keymap.rs
diff --git a/crates/turtle/src/command/client/search/keybindings/mod.rs b/crates/client/src/command/client/search/keybindings/mod.rs
index cdca0406..cdca0406 100644
--- a/crates/turtle/src/command/client/search/keybindings/mod.rs
+++ b/crates/client/src/command/client/search/keybindings/mod.rs
diff --git a/crates/turtle/src/command/client/server.rs b/crates/client/src/command/client/server.rs
index 88b12a7a..88b12a7a 100644
--- a/crates/turtle/src/command/client/server.rs
+++ b/crates/client/src/command/client/server.rs
diff --git a/crates/turtle/src/command/client/stats.rs b/crates/client/src/command/client/stats.rs
index 9ea5e283..9ea5e283 100644
--- a/crates/turtle/src/command/client/stats.rs
+++ b/crates/client/src/command/client/stats.rs
diff --git a/crates/turtle/src/command/client/store.rs b/crates/client/src/command/client/store.rs
index bc57488d..bc57488d 100644
--- a/crates/turtle/src/command/client/store.rs
+++ b/crates/client/src/command/client/store.rs
diff --git a/crates/turtle/src/command/client/store/pull.rs b/crates/client/src/command/client/store/pull.rs
index 3a0865be..3a0865be 100644
--- a/crates/turtle/src/command/client/store/pull.rs
+++ b/crates/client/src/command/client/store/pull.rs
diff --git a/crates/turtle/src/command/client/store/purge.rs b/crates/client/src/command/client/store/purge.rs
index a23f1886..a23f1886 100644
--- a/crates/turtle/src/command/client/store/purge.rs
+++ b/crates/client/src/command/client/store/purge.rs
diff --git a/crates/turtle/src/command/client/store/push.rs b/crates/client/src/command/client/store/push.rs
index 9d66b5b2..9d66b5b2 100644
--- a/crates/turtle/src/command/client/store/push.rs
+++ b/crates/client/src/command/client/store/push.rs
diff --git a/crates/turtle/src/command/client/store/rebuild.rs b/crates/client/src/command/client/store/rebuild.rs
index 6be67cd0..6be67cd0 100644
--- a/crates/turtle/src/command/client/store/rebuild.rs
+++ b/crates/client/src/command/client/store/rebuild.rs
diff --git a/crates/turtle/src/command/client/store/rekey.rs b/crates/client/src/command/client/store/rekey.rs
index 2b379327..2b379327 100644
--- a/crates/turtle/src/command/client/store/rekey.rs
+++ b/crates/client/src/command/client/store/rekey.rs
diff --git a/crates/turtle/src/command/client/store/verify.rs b/crates/client/src/command/client/store/verify.rs
index a39227f9..a39227f9 100644
--- a/crates/turtle/src/command/client/store/verify.rs
+++ b/crates/client/src/command/client/store/verify.rs
diff --git a/crates/turtle/src/command/client/sync.rs b/crates/client/src/command/client/sync.rs
index c29a82fc..c29a82fc 100644
--- a/crates/turtle/src/command/client/sync.rs
+++ b/crates/client/src/command/client/sync.rs
diff --git a/crates/turtle/src/command/client/sync/status.rs b/crates/client/src/command/client/sync/status.rs
index caf3b90f..caf3b90f 100644
--- a/crates/turtle/src/command/client/sync/status.rs
+++ b/crates/client/src/command/client/sync/status.rs
diff --git a/crates/turtle/src/command/client/wrapped.rs b/crates/client/src/command/client/wrapped.rs
index 2ce19bf7..2ce19bf7 100644
--- a/crates/turtle/src/command/client/wrapped.rs
+++ b/crates/client/src/command/client/wrapped.rs
diff --git a/crates/turtle/src/command/contributors.rs b/crates/client/src/command/contributors.rs
index b2a41522..b2a41522 100644
--- a/crates/turtle/src/command/contributors.rs
+++ b/crates/client/src/command/contributors.rs
diff --git a/crates/turtle/src/command/gen_completions.rs b/crates/client/src/command/gen_completions.rs
index 9f13bffc..9f13bffc 100644
--- a/crates/turtle/src/command/gen_completions.rs
+++ b/crates/client/src/command/gen_completions.rs
diff --git a/crates/turtle/src/command/mod.rs b/crates/client/src/command/mod.rs
index 9a648254..9a648254 100644
--- a/crates/turtle/src/command/mod.rs
+++ b/crates/client/src/command/mod.rs
diff --git a/crates/turtle/src/main.rs b/crates/client/src/main.rs
index 12858140..12858140 100644
--- a/crates/turtle/src/main.rs
+++ b/crates/client/src/main.rs
diff --git a/crates/turtle/src/print_error.rs b/crates/client/src/print_error.rs
index 0a6303dd..0a6303dd 100644
--- a/crates/turtle/src/print_error.rs
+++ b/crates/client/src/print_error.rs
diff --git a/crates/turtle/src/shell/.gitattributes b/crates/client/src/shell/.gitattributes
index fae8897c..fae8897c 100644
--- a/crates/turtle/src/shell/.gitattributes
+++ b/crates/client/src/shell/.gitattributes
diff --git a/crates/turtle/src/shell/atuin.bash b/crates/client/src/shell/atuin.bash
index 703e8fe2..703e8fe2 100644
--- a/crates/turtle/src/shell/atuin.bash
+++ b/crates/client/src/shell/atuin.bash
diff --git a/crates/turtle/src/shell/atuin.fish b/crates/client/src/shell/atuin.fish
index 2b469383..2b469383 100644
--- a/crates/turtle/src/shell/atuin.fish
+++ b/crates/client/src/shell/atuin.fish
diff --git a/crates/turtle/src/shell/atuin.nu b/crates/client/src/shell/atuin.nu
index d37457e4..d37457e4 100644
--- a/crates/turtle/src/shell/atuin.nu
+++ b/crates/client/src/shell/atuin.nu
diff --git a/crates/turtle/src/shell/atuin.ps1 b/crates/client/src/shell/atuin.ps1
index 431ee2c3..431ee2c3 100644
--- a/crates/turtle/src/shell/atuin.ps1
+++ b/crates/client/src/shell/atuin.ps1
diff --git a/crates/turtle/src/shell/atuin.xsh b/crates/client/src/shell/atuin.xsh
index a0283402..a0283402 100644
--- a/crates/turtle/src/shell/atuin.xsh
+++ b/crates/client/src/shell/atuin.xsh
diff --git a/crates/turtle/src/shell/atuin.zsh b/crates/client/src/shell/atuin.zsh
index 7e7fef27..7e7fef27 100644
--- a/crates/turtle/src/shell/atuin.zsh
+++ b/crates/client/src/shell/atuin.zsh
diff --git a/crates/turtle/src/sync.rs b/crates/client/src/sync.rs
index abe1a201..abe1a201 100644
--- a/crates/turtle/src/sync.rs
+++ b/crates/client/src/sync.rs
diff --git a/crates/turtle/src/atuin_daemon/client.rs b/crates/daemon/src/client.rs
index 2ea7ffc5..2ea7ffc5 100644
--- a/crates/turtle/src/atuin_daemon/client.rs
+++ b/crates/daemon/src/client.rs
diff --git a/crates/turtle/src/atuin_daemon/components/history.rs b/crates/daemon/src/components/history.rs
index b4f91b06..b4f91b06 100644
--- a/crates/turtle/src/atuin_daemon/components/history.rs
+++ b/crates/daemon/src/components/history.rs
diff --git a/crates/turtle/src/atuin_daemon/components/mod.rs b/crates/daemon/src/components/mod.rs
index 5a93fbc1..5a93fbc1 100644
--- a/crates/turtle/src/atuin_daemon/components/mod.rs
+++ b/crates/daemon/src/components/mod.rs
diff --git a/crates/turtle/src/atuin_daemon/components/search.rs b/crates/daemon/src/components/search.rs
index bcd60cc4..bcd60cc4 100644
--- a/crates/turtle/src/atuin_daemon/components/search.rs
+++ b/crates/daemon/src/components/search.rs
diff --git a/crates/turtle/src/atuin_daemon/components/semantic.rs b/crates/daemon/src/components/semantic.rs
index e1d376de..e1d376de 100644
--- a/crates/turtle/src/atuin_daemon/components/semantic.rs
+++ b/crates/daemon/src/components/semantic.rs
diff --git a/crates/turtle/src/atuin_daemon/components/sync.rs b/crates/daemon/src/components/sync.rs
index 20d49839..20d49839 100644
--- a/crates/turtle/src/atuin_daemon/components/sync.rs
+++ b/crates/daemon/src/components/sync.rs
diff --git a/crates/turtle/src/atuin_daemon/control/mod.rs b/crates/daemon/src/control/mod.rs
index 79398d61..79398d61 100644
--- a/crates/turtle/src/atuin_daemon/control/mod.rs
+++ b/crates/daemon/src/control/mod.rs
diff --git a/crates/turtle/src/atuin_daemon/daemon.rs b/crates/daemon/src/daemon.rs
index 80aaeef8..80aaeef8 100644
--- a/crates/turtle/src/atuin_daemon/daemon.rs
+++ b/crates/daemon/src/daemon.rs
diff --git a/crates/turtle/src/atuin_daemon/events.rs b/crates/daemon/src/events.rs
index d379277d..d379277d 100644
--- a/crates/turtle/src/atuin_daemon/events.rs
+++ b/crates/daemon/src/events.rs
diff --git a/crates/turtle/src/atuin_daemon/generated.rs b/crates/daemon/src/generated.rs
index a3ea4d9d..a3ea4d9d 100644
--- a/crates/turtle/src/atuin_daemon/generated.rs
+++ b/crates/daemon/src/generated.rs
diff --git a/crates/turtle/src/atuin_daemon/mod.rs b/crates/daemon/src/lib.rs
index 5f0f489e..5f0f489e 100644
--- a/crates/turtle/src/atuin_daemon/mod.rs
+++ b/crates/daemon/src/lib.rs
diff --git a/crates/turtle/src/atuin_daemon/search/mod.rs b/crates/daemon/src/search/mod.rs
index 02c79c9c..02c79c9c 100644
--- a/crates/turtle/src/atuin_daemon/search/mod.rs
+++ b/crates/daemon/src/search/mod.rs
diff --git a/crates/turtle/src/atuin_daemon/server.rs b/crates/daemon/src/server.rs
index 36954cca..36954cca 100644
--- a/crates/turtle/src/atuin_daemon/server.rs
+++ b/crates/daemon/src/server.rs
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()?;
 
diff --git a/crates/turtle/src/lib.rs b/crates/turtle/src/lib.rs
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/crates/turtle/src/lib.rs