diff --git a/home-manager/bash.nix b/home-manager/bash.nix
index 3ade0038..b71f7a2a 100644
--- a/home-manager/bash.nix
+++ b/home-manager/bash.nix
@@ -6,6 +6,7 @@
   programs.zoxide.enableBashIntegration = true;
   programs.fzf.enableBashIntegration = true;
   programs.rtx.enableBashIntegration = true;
+  programs.atuin.enableBashIntegration = true;
 
   # Used only in bash - https://unix.stackexchange.com/a/689403
   # https://github.com/nix-community/home-manager/blob/master/modules/programs/readline.nix
diff --git a/home-manager/fish.nix b/home-manager/fish.nix
index 7dedb798..dcbc8499 100644
--- a/home-manager/fish.nix
+++ b/home-manager/fish.nix
@@ -7,6 +7,7 @@
   programs.zoxide.enableFishIntegration = true;
   programs.fzf.enableFishIntegration = true;
   programs.rtx.enableFishIntegration = true;
+  programs.atuin.enableFishIntegration = true;
 
   xdg.configFile."fish/fish_variables".source = ../home/.config/fish/fish_variables;
   xdg.configFile."fish/functions/fish_prompt.fish".source = ../home/.config/fish/functions/fish_prompt.fish;
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 170e6fe7..91295a08 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -150,4 +150,18 @@
 
   # https://github.com/nix-community/home-manager/blob/master/modules/programs/rtx.nix
   programs.rtx.enable = true;
+
+  # https://github.com/nix-community/home-manager/blob/master/modules/programs/atuin.nix
+  programs.atuin = {
+    enable = true;
+
+    flags = [
+      # https://github.com/atuinsh/atuin/issues/51
+      "--disable-up-arrow"
+    ];
+
+    settings = {
+      sync_address = "https://127.0.0.1";
+    };
+  };
 }
diff --git a/home-manager/packages.nix b/home-manager/packages.nix
index c04e3a8e..d8de44f0 100644
--- a/home-manager/packages.nix
+++ b/home-manager/packages.nix
@@ -13,6 +13,7 @@
     direnv
     zoxide
     fzf
+    atuin
 
     # Used in anywhere
     coreutils
diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix
index 730f1e2c..18be6879 100644
--- a/home-manager/zsh.nix
+++ b/home-manager/zsh.nix
@@ -6,6 +6,7 @@
   programs.zoxide.enableZshIntegration = true;
   programs.fzf.enableZshIntegration = true;
   programs.rtx.enableZshIntegration = true;
+  programs.atuin.enableZshIntegration = true;
 
   # https://nixos.wiki/wiki/Zsh
   # https://github.com/nix-community/home-manager/blob/master/modules/programs/zsh.nix