chore(server): Simplify the database support

7 files changed, 15 insertions, 64 deletions

diff --git a/crates/turtle/src/command/client/init.rs b/crates/turtle/src/command/client/init.rs
index 776100cf..0643cb73 100644
--- a/crates/turtle/src/command/client/init.rs
+++ b/crates/turtle/src/command/client/init.rs
@@ -1,4 +1,4 @@
-use crate::atuin_client::settings::{Settings, Tmux};
+use crate::atuin_client::settings::Settings;
 use clap::{Parser, ValueEnum};
 
 mod bash;
@@ -43,10 +43,9 @@ pub(crate) enum Shell {
 }
 
 impl Cmd {
-    fn init_nu(&self, _tmux: &Tmux) {
+    fn init_nu(&self) {
         let full = include_str!("../../shell/atuin.nu");
 
-        // TODO: tmux popup for Nu
         println!("{full}");
 
         if std::env::var("ATUIN_NOBIND").is_err() {
@@ -91,26 +90,24 @@ $env.config = (
     }
 
     fn static_init(&self, settings: &Settings) {
-        let tmux = &settings.tmux;
-
         match self.shell {
             Shell::Zsh => {
-                zsh::init_static(self.disable_up_arrow, self.disable_ctrl_r, tmux);
+                zsh::init_static(self.disable_up_arrow, self.disable_ctrl_r);
             }
             Shell::Bash => {
-                bash::init_static(self.disable_up_arrow, self.disable_ctrl_r, tmux);
+                bash::init_static(self.disable_up_arrow, self.disable_ctrl_r);
             }
             Shell::Fish => {
-                fish::init_static(self.disable_up_arrow, self.disable_ctrl_r, tmux);
+                fish::init_static(self.disable_up_arrow, self.disable_ctrl_r);
             }
             Shell::Nu => {
-                self.init_nu(tmux);
+                self.init_nu();
             }
             Shell::Xonsh => {
-                xonsh::init_static(self.disable_up_arrow, self.disable_ctrl_r, tmux);
+                xonsh::init_static(self.disable_up_arrow, self.disable_ctrl_r);
             }
             Shell::PowerShell => {
-                powershell::init_static(self.disable_up_arrow, self.disable_ctrl_r, tmux);
+                powershell::init_static(self.disable_up_arrow, self.disable_ctrl_r);
             }
         }
     }
diff --git a/crates/turtle/src/command/client/init/bash.rs b/crates/turtle/src/command/client/init/bash.rs
index a5f6eb8d..c16663e2 100644
--- a/crates/turtle/src/command/client/init/bash.rs
+++ b/crates/turtle/src/command/client/init/bash.rs
@@ -1,15 +1,4 @@
-use crate::atuin_client::settings::Tmux;
-
-fn print_tmux_config(tmux: &Tmux) {
-    if tmux.enabled {
-        println!("export ATUIN_TMUX_POPUP_WIDTH='{}'", tmux.width);
-        println!("export ATUIN_TMUX_POPUP_HEIGHT='{}'", tmux.height);
-    } else {
-        println!("export ATUIN_TMUX_POPUP=false");
-    }
-}
-
-pub(crate) fn init_static(disable_up_arrow: bool, disable_ctrl_r: bool, tmux: &Tmux) {
+pub(crate) fn init_static(disable_up_arrow: bool, disable_ctrl_r: bool) {
     let base = include_str!("../../../shell/atuin.bash");
 
     let (bind_ctrl_r, bind_up_arrow) = if std::env::var("ATUIN_NOBIND").is_ok() {
@@ -18,7 +7,6 @@ pub(crate) fn init_static(disable_up_arrow: bool, disable_ctrl_r: bool, tmux: &T
         (!disable_ctrl_r, !disable_up_arrow)
     };
 
-    print_tmux_config(tmux);
     println!("__atuin_bind_ctrl_r={bind_ctrl_r}");
     println!("__atuin_bind_up_arrow={bind_up_arrow}");
     println!("{base}");
diff --git a/crates/turtle/src/command/client/init/fish.rs b/crates/turtle/src/command/client/init/fish.rs
index 27325bcd..0a992b9c 100644
--- a/crates/turtle/src/command/client/init/fish.rs
+++ b/crates/turtle/src/command/client/init/fish.rs
@@ -1,14 +1,3 @@
-use crate::atuin_client::settings::Tmux;
-
-fn print_tmux_config(tmux: &Tmux) {
-    if tmux.enabled {
-        println!("set -gx ATUIN_TMUX_POPUP_WIDTH '{}'", tmux.width);
-        println!("set -gx ATUIN_TMUX_POPUP_HEIGHT '{}'", tmux.height);
-    } else {
-        println!("set -gx ATUIN_TMUX_POPUP false");
-    }
-}
-
 fn print_bindings(
     indent: &str,
     disable_up_arrow: bool,
@@ -35,12 +24,11 @@ fn print_bindings(
     println!("{indent}end");
 }
 
-pub(crate) fn init_static(disable_up_arrow: bool, disable_ctrl_r: bool, tmux: &Tmux) {
+pub(crate) fn init_static(disable_up_arrow: bool, disable_ctrl_r: bool) {
     let indent = " ".repeat(4);
 
     let base = include_str!("../../../shell/atuin.fish");
 
-    print_tmux_config(tmux);
     println!("{base}");
 
     if std::env::var("ATUIN_NOBIND").is_err() {
diff --git a/crates/turtle/src/command/client/init/powershell.rs b/crates/turtle/src/command/client/init/powershell.rs
index 8deb9a3b..94d89c67 100644
--- a/crates/turtle/src/command/client/init/powershell.rs
+++ b/crates/turtle/src/command/client/init/powershell.rs
@@ -1,6 +1,4 @@
-use crate::atuin_client::settings::Tmux;
-
-pub(crate) fn init_static(disable_up_arrow: bool, disable_ctrl_r: bool, _tmux: &Tmux) {
+pub(crate) fn init_static(disable_up_arrow: bool, disable_ctrl_r: bool) {
     let base = include_str!("../../../shell/atuin.ps1");
 
     let (bind_ctrl_r, bind_up_arrow) = if std::env::var("ATUIN_NOBIND").is_ok() {
@@ -9,7 +7,6 @@ pub(crate) fn init_static(disable_up_arrow: bool, disable_ctrl_r: bool, _tmux: &
         (!disable_ctrl_r, !disable_up_arrow)
     };
 
-    // TODO: tmux popup for Powershell
     println!("{base}");
     println!(
         "Enable-AtuinSearchKeys -CtrlR {} -UpArrow {}",
diff --git a/crates/turtle/src/command/client/init/xonsh.rs b/crates/turtle/src/command/client/init/xonsh.rs
index ccb71880..25f867f7 100644
--- a/crates/turtle/src/command/client/init/xonsh.rs
+++ b/crates/turtle/src/command/client/init/xonsh.rs
@@ -1,6 +1,4 @@
-use crate::atuin_client::settings::Tmux;
-
-pub(crate) fn init_static(disable_up_arrow: bool, disable_ctrl_r: bool, _tmux: &Tmux) {
+pub(crate) fn init_static(disable_up_arrow: bool, disable_ctrl_r: bool) {
     let base = include_str!("../../../shell/atuin.xsh");
 
     let (bind_ctrl_r, bind_up_arrow) = if std::env::var("ATUIN_NOBIND").is_ok() {
@@ -9,7 +7,6 @@ pub(crate) fn init_static(disable_up_arrow: bool, disable_ctrl_r: bool, _tmux: &
         (!disable_ctrl_r, !disable_up_arrow)
     };
 
-    // TODO: tmux popup for xonsh
     println!(
         "_ATUIN_BIND_CTRL_R={}",
         if bind_ctrl_r { "True" } else { "False" }
diff --git a/crates/turtle/src/command/client/init/zsh.rs b/crates/turtle/src/command/client/init/zsh.rs
index 60d0138f..96a817d0 100644
--- a/crates/turtle/src/command/client/init/zsh.rs
+++ b/crates/turtle/src/command/client/init/zsh.rs
@@ -1,18 +1,6 @@
-use crate::atuin_client::settings::Tmux;
-
-fn print_tmux_config(tmux: &Tmux) {
-    if tmux.enabled {
-        println!("export ATUIN_TMUX_POPUP_WIDTH='{}'", tmux.width);
-        println!("export ATUIN_TMUX_POPUP_HEIGHT='{}'", tmux.height);
-    } else {
-        println!("export ATUIN_TMUX_POPUP=false");
-    }
-}
-
-pub(crate) fn init_static(disable_up_arrow: bool, disable_ctrl_r: bool, tmux: &Tmux) {
+pub(crate) fn init_static(disable_up_arrow: bool, disable_ctrl_r: bool) {
     let base = include_str!("../../../shell/atuin.zsh");
 
-    print_tmux_config(tmux);
     println!("{base}");
 
     if std::env::var("ATUIN_NOBIND").is_err() {
diff --git a/crates/turtle/src/command/client/server.rs b/crates/turtle/src/command/client/server.rs
index 4c2036d8..def1dfb3 100644
--- a/crates/turtle/src/command/client/server.rs
+++ b/crates/turtle/src/command/client/server.rs
@@ -1,9 +1,6 @@
 use std::net::SocketAddr;
 
-use crate::atuin_server::{Settings, launch, launch_metrics_server};
-use crate::atuin_server_database::DbType;
-use crate::atuin_server_postgres::Postgres;
-use crate::atuin_server_sqlite::Sqlite;
+use crate::atuin_server::{Settings, database::DbType, launch, launch_metrics_server};
 
 use clap::Subcommand;
 use eyre::{Context, Result, eyre};
@@ -44,8 +41,7 @@ impl Cmd {
                 }
 
                 match settings.db_settings.db_type() {
-                    DbType::Postgres => launch::<Postgres>(settings, addr).await,
-                    DbType::Sqlite => launch::<Sqlite>(settings, addr).await,
+                    DbType::Postgres => launch(settings, addr).await,
                     DbType::Unknown => {
                         Err(eyre!("db_uri must start with postgres:// or sqlite://"))
                     }