diff --git a/common/user-ppetru.nix b/common/user-ppetru.nix
index fddb44d..141ee3b 100644
--- a/common/user-ppetru.nix
+++ b/common/user-ppetru.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 {
-  programs.zsh.enable = true;
+  programs.fish.enable = true;
   users.users.ppetru = {
     isNormalUser = true;
     extraGroups = [
@@ -8,7 +8,7 @@
       "wheel"
     ];
 
-    shell = pkgs.zsh;
+    shell = pkgs.fish;
 
     hashedPassword = "$y$j9T$RStwCKefSqHTIiRo6u6Q50$Pp2dNUeJeUMH0HJdDoM/vXMQa2jqyTTPvvIzACHZhVB";
     openssh.authorizedKeys.keys = [
diff --git a/home/default.nix b/home/default.nix
index a4ee6a7..e7402ee 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,10 +1,7 @@
 { pkgs, ... }:
-let
-  packages = import ./packages.nix { inherit pkgs; };
-in
 {
   home = {
-    inherit packages;
+    packages = (import ./packages.nix { inherit pkgs; }).packages;
     stateVersion = "24.05"; # TODO: unify this with the references in flake.nix:inputs
 
     sessionVariables = {
@@ -23,10 +20,10 @@ in
         ".ssh"
         "projects"
       ];
-      files = [ ];
+      files = [ ".local/share/fish/fish_history" ];
       allowOther = true;
     };
   };
 
-  programs = import ./programs.nix;
+  programs = import ./programs.nix { inherit pkgs; };
 }
diff --git a/home/packages.nix b/home/packages.nix
index 68e91c1..e6b1516 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -1,13 +1,17 @@
 { pkgs }:
-
-let
-  nixTools = with pkgs; [
-    git
-    home-manager
-    mosh
-    tmux
-    vim
-    zsh
-  ];
-in
-nixTools
+{
+  packages =
+    with pkgs;
+    [
+      git
+      home-manager
+      mosh
+      tmux
+      vim
+      zsh
+    ]
+    ++ (with pkgs.fishPlugins; [
+      # don't add failed commands to history
+      sponge
+    ]);
+}
diff --git a/home/programs.nix b/home/programs.nix
index abfa965..7564e23 100644
--- a/home/programs.nix
+++ b/home/programs.nix
@@ -1,4 +1,9 @@
+{ pkgs, ... }:
 {
+  fish = {
+    enable = true;
+  };
+
   git = {
     enable = true;
     userEmail = "petru@paler.net";
@@ -38,37 +43,4 @@
       set -g status-right ""
     '';
   };
-
-  zsh = {
-    enable = true;
-    history = {
-      save = 1000000;
-      size = 1000000;
-    };
-    prezto = {
-      enable = true;
-      pmodules = [
-        "gnu-utility"
-        "environment"
-        "terminal"
-        "editor"
-        "history"
-        "directory"
-        "spectrum"
-        "utility"
-        "completion"
-        "syntax-highlighting"
-        "prompt"
-      ];
-      gnuUtility.prefix = "g";
-      prompt.theme = "pure";
-      utility.safeOps = false;
-      syntaxHighlighting.highlighters = [
-        "main"
-        "brackets"
-        "pattern"
-        "root"
-      ];
-    };
-  };
 }