diff --git a/hm/shell/atuin.nix b/hm/shell/atuin.nix
new file mode 100644
index 0000000..7d8b5c6
--- /dev/null
+++ b/hm/shell/atuin.nix
@@ -0,0 +1,19 @@
+{ pkgs, lib, config, ... }:
+{
+  config = {
+    programs.atuin = {
+      enable = true;
+      enableBashIntegration = true;
+      enableZshIntegration = true;
+      settings = {
+        auto_sync = true;
+        sync_frequency = "5m";
+        sync_address = "https://atuin.frogeye.fr";
+        ctrl_n_shortcuts = true; # Cranberry uses Alt for i3
+      };
+      flags = [
+        "--disable-up-arrow"
+      ];
+    };
+  };
+}
diff --git a/hm/shell/default.nix b/hm/shell/default.nix
index d9f53ad..dffeba1 100644
--- a/hm/shell/default.nix
+++ b/hm/shell/default.nix
@@ -14,7 +14,6 @@ in
         historySize = 100000;
         historyFile = "${config.xdg.stateHome}/shell_history";
         historyFileSize = 100000;
-        # TODO Check out Atuin
         historyControl = [ "erasedups" "ignoredups" "ignorespace" ];
       };
       zsh = {
@@ -35,4 +34,7 @@ in
       };
     };
   };
+  imports = [
+    ./atuin.nix
+  ]; 
 }