diff --git a/database/src/lib.rs b/database/src/lib.rs
index 104bcc6..66cada5 100644
--- a/database/src/lib.rs
+++ b/database/src/lib.rs
@@ -2,7 +2,8 @@
 
 mod sqlite;
 
-pub use homedisk_types::database::User;
-pub use homedisk_types::errors::DatabaseError as Error;
-pub use homedisk_types::errors::DatabaseResult as Result;
+pub use homedisk_types::{
+    database::User,
+    errors::{DatabaseError as Error, DatabaseResult as Result},
+};
 pub use sqlite::*;
diff --git a/rustfmt.toml b/rustfmt.toml
index 280836a..03f625c 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,3 +1,11 @@
+# https://rust-lang.github.io/rustfmt
+
+# stable
 edition = "2021"
 newline_style = "Unix"
 match_block_trailing_comma = true
+
+# nightly
+group_imports = "StdExternalCrate"
+imports_granularity = "Crate"
+format_code_in_doc_comments = true
diff --git a/server/src/fs/download.rs b/server/src/fs/download.rs
index 74ed17e..e808cec 100644
--- a/server/src/fs/download.rs
+++ b/server/src/fs/download.rs
@@ -3,9 +3,11 @@ use std::fs;
 use axum::{extract::Query, Extension};
 use axum_auth::AuthBearer;
 use homedisk_database::Database;
-use homedisk_types::errors::FsError;
-use homedisk_types::fs::upload::Pagination;
-use homedisk_types::{config::Config, errors::ServerError};
+use homedisk_types::{
+    config::Config,
+    errors::{FsError, ServerError},
+    fs::upload::Pagination,
+};
 
 use crate::middleware::{find_user, validate_jwt, validate_path};
 
diff --git a/server/src/fs/list.rs b/server/src/fs/list.rs
index 0154fac..3dfef25 100644
--- a/server/src/fs/list.rs
+++ b/server/src/fs/list.rs
@@ -1,5 +1,4 @@
-use std::path::PathBuf;
-use std::{fs, io};
+use std::{fs, io, path::PathBuf};
 
 use axum::{extract::rejection::JsonRejection, Extension, Json};
 use axum_auth::AuthBearer;
diff --git a/server/src/fs/upload.rs b/server/src/fs/upload.rs
index d9dd326..4a189a8 100644
--- a/server/src/fs/upload.rs
+++ b/server/src/fs/upload.rs
@@ -1,5 +1,4 @@
-use std::io::Write;
-use std::{fs, path::Path};
+use std::{fs, io::Write, path::Path};
 
 use axum::{
     extract::{Multipart, Query},
diff --git a/server/src/middleware/auth.rs b/server/src/middleware/auth.rs
index f4d8c55..f5310ae 100644
--- a/server/src/middleware/auth.rs
+++ b/server/src/middleware/auth.rs
@@ -15,9 +15,8 @@ pub fn validate_jwt(secret: &[u8], token: &str) -> Result<TokenData, ServerError
 mod tests {
     use homedisk_database::User;
 
-    use crate::middleware::create_token;
-
     use super::validate_jwt;
+    use crate::middleware::create_token;
 
     const USERNAME: &str = "username";
     const PASSWORD: &str = "password";
diff --git a/types/src/errors/mod.rs b/types/src/errors/mod.rs
index ce6cb39..1ad6912 100644
--- a/types/src/errors/mod.rs
+++ b/types/src/errors/mod.rs
@@ -7,7 +7,6 @@ mod fs;
 mod server;
 
 pub use auth::Error as AuthError;
-pub use database::Error as DatabaseError;
-pub use database::Result as DatabaseResult;
+pub use database::{Error as DatabaseError, Result as DatabaseResult};
 pub use fs::Error as FsError;
 pub use server::Error as ServerError;