11 files changed, 43 insertions, 48 deletions
diff --git a/src/command/client.rs b/src/command/client.rs
index 4858e2ba..80316ed9 100644
--- a/src/command/client.rs
+++ b/src/command/client.rs
@@ -1,11 +1,10 @@
-use clap::CommandFactory;
-use clap::Subcommand;
-use clap_complete::Shell;
-use clap_complete::{generate, generate_to};
+use std::path::PathBuf;
+
+use clap::{CommandFactory, Subcommand};
+use clap_complete::{generate, generate_to, Shell};
 use eyre::{Result, WrapErr};
 
-use atuin_client::database::Sqlite;
-use atuin_client::settings::Settings;
+use atuin_client::{database::Sqlite, settings::Settings};
 use atuin_common::utils::uuid_v4;
 
 #[cfg(feature = "sync")]
@@ -18,8 +17,6 @@ mod init;
 mod search;
 mod stats;
 
-use std::path::PathBuf;
-
 #[derive(Subcommand)]
 #[clap(infer_subcommands = true)]
 pub enum Cmd {
diff --git a/src/command/client/event.rs b/src/command/client/event.rs
index f09752d6..189d9e73 100644
--- a/src/command/client/event.rs
+++ b/src/command/client/event.rs
@@ -1,9 +1,7 @@
-use std::thread;
-use std::time::Duration;
+use std::{thread, time::Duration};
 
 use crossbeam_channel::unbounded;
-use termion::event::Key;
-use termion::input::TermRead;
+use termion::{event::Key, input::TermRead};
 
 pub enum Event<I> {
     Input(I),
diff --git a/src/command/client/history.rs b/src/command/client/history.rs
index 6e265e30..d001658c 100644
--- a/src/command/client/history.rs
+++ b/src/command/client/history.rs
@@ -1,13 +1,17 @@
-use std::env;
-use std::io::{StdoutLock, Write};
-use std::time::Duration;
+use std::{
+    env,
+    io::{StdoutLock, Write},
+    time::Duration,
+};
 
 use clap::Subcommand;
 use eyre::Result;
 
-use atuin_client::database::{current_context, Database};
-use atuin_client::history::History;
-use atuin_client::settings::Settings;
+use atuin_client::{
+    database::{current_context, Database},
+    history::History,
+    settings::Settings,
+};
 
 #[cfg(feature = "sync")]
 use atuin_client::sync;
diff --git a/src/command/client/import.rs b/src/command/client/import.rs
index a4964c51..c70446d5 100644
--- a/src/command/client/import.rs
+++ b/src/command/client/import.rs
@@ -1,14 +1,15 @@
 use std::{env, path::PathBuf};
 
-use atuin_client::import::fish::Fish;
 use clap::Parser;
 use eyre::{eyre, Result};
-
-use atuin_client::import::{bash::Bash, zsh::Zsh};
-use atuin_client::{database::Database, import::Importer};
-use atuin_client::{history::History, import::resh::Resh};
 use indicatif::ProgressBar;
 
+use atuin_client::{
+    database::Database,
+    history::History,
+    import::{bash::Bash, fish::Fish, resh::Resh, zsh::Zsh, Importer},
+};
+
 #[derive(Parser)]
 #[clap(infer_subcommands = true)]
 pub enum Cmd {
diff --git a/src/command/client/search.rs b/src/command/client/search.rs
index 45b1f978..21f07716 100644
--- a/src/command/client/search.rs
+++ b/src/command/client/search.rs
@@ -1,8 +1,8 @@
+use std::{env, io::stdout, ops::Sub, time::Duration};
+
 use chrono::Utc;
 use clap::Parser;
 use eyre::Result;
-use std::env;
-use std::{io::stdout, ops::Sub, time::Duration};
 use termion::{event::Key, input::MouseTerminal, raw::IntoRawMode, screen::AlternateScreen};
 use tui::{
     backend::{Backend, TermionBackend},
@@ -22,8 +22,10 @@ use atuin_client::{
     settings::{FilterMode, SearchMode, Settings},
 };
 
-use super::event::{Event, Events};
-use super::history::ListMode;
+use super::{
+    event::{Event, Events},
+    history::ListMode,
+};
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 
diff --git a/src/command/client/stats.rs b/src/command/client/stats.rs
index 85c58cc0..5f1bab50 100644
--- a/src/command/client/stats.rs
+++ b/src/command/client/stats.rs
@@ -1,16 +1,16 @@
 use std::collections::HashMap;
 
-use chrono::prelude::*;
-use chrono::Duration;
+use chrono::{prelude::*, Duration};
 use chrono_english::parse_date_string;
-
 use clap::Parser;
 use cli_table::{format::Justify, print_stdout, Cell, Style, Table};
 use eyre::{bail, Result};
 
-use atuin_client::database::{current_context, Database};
-use atuin_client::history::History;
-use atuin_client::settings::{FilterMode, Settings};
+use atuin_client::{
+    database::{current_context, Database},
+    history::History,
+    settings::{FilterMode, Settings},
+};
 
 #[derive(Parser)]
 #[clap(infer_subcommands = true)]
diff --git a/src/command/client/sync.rs b/src/command/client/sync.rs
index 8e80310a..6fbf8dfc 100644
--- a/src/command/client/sync.rs
+++ b/src/command/client/sync.rs
@@ -1,8 +1,7 @@
-use atuin_client::database::Database;
 use clap::Subcommand;
 use eyre::{Result, WrapErr};
 
-use atuin_client::settings::Settings;
+use atuin_client::{database::Database, settings::Settings};
 
 mod login;
 mod logout;
diff --git a/src/command/client/sync/login.rs b/src/command/client/sync/login.rs
index efc9c590..8056d1bb 100644
--- a/src/command/client/sync/login.rs
+++ b/src/command/client/sync/login.rs
@@ -1,13 +1,11 @@
 use std::io;
 
-use atuin_common::api::LoginRequest;
-use clap::AppSettings;
-use clap::Parser;
+use clap::{AppSettings, Parser};
 use eyre::Result;
 use tokio::{fs::File, io::AsyncWriteExt};
 
-use atuin_client::api_client;
-use atuin_client::settings::Settings;
+use atuin_client::{api_client, settings::Settings};
+use atuin_common::api::LoginRequest;
 
 #[derive(Parser)]
 #[clap(setting(AppSettings::DeriveDisplayOrder))]
diff --git a/src/command/client/sync/register.rs b/src/command/client/sync/register.rs
index 2c60a2e9..fe126237 100644
--- a/src/command/client/sync/register.rs
+++ b/src/command/client/sync/register.rs
@@ -1,10 +1,8 @@
-use clap::AppSettings;
-use clap::Parser;
+use clap::{AppSettings, Parser};
 use eyre::Result;
 use tokio::{fs::File, io::AsyncWriteExt};
 
-use atuin_client::api_client;
-use atuin_client::settings::Settings;
+use atuin_client::{api_client, settings::Settings};
 
 #[derive(Parser)]
 #[clap(setting(AppSettings::DeriveDisplayOrder))]
diff --git a/src/command/server.rs b/src/command/server.rs
index c5af9ae5..1d514bb2 100644
--- a/src/command/server.rs
+++ b/src/command/server.rs
@@ -3,8 +3,7 @@ use tracing_subscriber::{fmt, prelude::*, EnvFilter};
 use clap::Parser;
 use eyre::{Context, Result};
 
-use atuin_server::launch;
-use atuin_server::settings::Settings;
+use atuin_server::{launch, settings::Settings};
 
 #[derive(Parser)]
 #[clap(infer_subcommands = true)]
diff --git a/src/main.rs b/src/main.rs
index e5c81bbb..00028cd9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,7 @@
 #![warn(clippy::pedantic, clippy::nursery)]
 #![allow(clippy::use_self)] // not 100% reliable
 
-use clap::AppSettings;
-use clap::Parser;
+use clap::{AppSettings, Parser};
 use eyre::Result;
 
 #[macro_use]