diff --git a/home/lander/features/cli/atuin.nix b/home/lander/features/cli/atuin.nix
deleted file mode 100644
index dfe099e..0000000
--- a/home/lander/features/cli/atuin.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ ... }:
-{
-  programs.atuin = {
-    enable = true;
-    enableZshIntegration = true;
-
-    settings = {
-      auto_sync = true;
-      sync_address = "http://atuin.escapeangle.com";
-      sync_frequency = "30m";
-      update_check = false;
-    };
-  };
-}
diff --git a/home/lander/features/cli/default.nix b/home/lander/features/cli/default.nix
index 0219eb7..4cd9937 100644
--- a/home/lander/features/cli/default.nix
+++ b/home/lander/features/cli/default.nix
@@ -4,7 +4,6 @@
   imports = [
     ./git
 
-    ./atuin.nix
     ./bat.nix
     ./btop.nix
     ./starship.nix
diff --git a/hosts/hosting-01/default.nix b/hosts/hosting-01/default.nix
index b1e0a7c..e061474 100644
--- a/hosts/hosting-01/default.nix
+++ b/hosts/hosting-01/default.nix
@@ -139,23 +139,6 @@ in
     };
   };
 
-  services.atuin = {
-    enable = true;
-    openRegistration = false;
-    database = {
-      uri = "postgresql://atuin@db-01.tailnet.escapeangle.com:5432/atuin";
-      createLocally = false;
-    };
-  };
-
-  services.nginx.virtualHosts."atuin.escapeangle.com" = {
-    forceSSL = true;
-    enableACME = true;
-    locations."/" = {
-      proxyPass = "http://localhost:${toString config.services.atuin.port}";
-    };
-  };
-
   security.acme.defaults.email = "landervandenbulcke@gmail.com";
   security.acme.acceptTerms = true;
 
diff --git a/hosts/servers/db-01.nix b/hosts/servers/db-01.nix
index 1fcaef4..8484249 100644
--- a/hosts/servers/db-01.nix
+++ b/hosts/servers/db-01.nix
@@ -9,17 +9,12 @@
       host all all 100.64.0.0/24 trust # trust tailnet
     '';
     ensureDatabases = [
-      "atuin"
       "authelia"
       "forgejo"
       "lldap"
       "mealie"
     ];
     ensureUsers = [
-      {
-        name = "atuin";
-        ensureDBOwnership = true;
-      }
       {
         name = "authelia";
         ensureDBOwnership = true;
@@ -43,7 +38,6 @@
     enable = true;
     startAt = "*-*-* 02:00:00";
     databases = [
-      "atuin"
       "authelia"
       "forgejo"
       "lldap"