diff --git a/home/shell/atuin.nix b/home/shell/atuin.nix
index 49b77d5..1cc2da2 100644
--- a/home/shell/atuin.nix
+++ b/home/shell/atuin.nix
@@ -1,8 +1,10 @@
 {...}: {
   programs.atuin = {
     enable = true;
-    enableZshIntegration = true;
+    enableFishIntegration = true;
+
     settings = {
+      enter_accept = false;
       sync_address = "https://atuin.fainsin.bzh";
     };
   };
diff --git a/home/shell/bat.nix b/home/shell/bat.nix
index a5f0250..d8a8f4d 100644
--- a/home/shell/bat.nix
+++ b/home/shell/bat.nix
@@ -16,7 +16,7 @@
     extraPackages = with pkgs.bat-extras; [batman];
   };
 
-  programs.zsh.shellAliases = {
+  programs.fish.shellAliases = {
     cat = "bat";
     man = "batman";
   };
diff --git a/home/shell/btop.nix b/home/shell/btop.nix
index b0153d6..9f6f3e0 100644
--- a/home/shell/btop.nix
+++ b/home/shell/btop.nix
@@ -11,5 +11,5 @@
     };
   };
 
-  programs.zsh.shellAliases.htop = "btop";
+  programs.fish.shellAliases.htop = "btop";
 }
diff --git a/home/shell/direnv.nix b/home/shell/direnv.nix
index 30c5f0d..7f21f6a 100644
--- a/home/shell/direnv.nix
+++ b/home/shell/direnv.nix
@@ -1,7 +1,7 @@
 {...}: {
   programs.direnv = {
     enable = true;
-    enableZshIntegration = true;
+    enableFishIntegration = true;
     nix-direnv.enable = true;
   };
 }
diff --git a/home/shell/exa.nix b/home/shell/exa.nix
index 8df8b33..e04220d 100644
--- a/home/shell/exa.nix
+++ b/home/shell/exa.nix
@@ -1,6 +1,6 @@
 {...}: {
   programs.eza.enable = true;
-  programs.zsh.shellAliases = {
+  programs.fish.shellAliases = {
     l = "eza -lahg --icons --git --time-style=long-iso --group-directories-first --color=always";
     ll = "l --grid";
   };