diff --git a/home-manager/modules/cli/zsh.nix b/home-manager/modules/cli/zsh.nix
new file mode 100644
index 0000000..7bfcd1a
--- /dev/null
+++ b/home-manager/modules/cli/zsh.nix
@@ -0,0 +1,36 @@
+{ config, pkgs, ... }:
+
+{
+  programs.zsh = {
+    enable = true;
+    enableAutosuggestion = true;
+
+    history= rec {
+      share = true;
+      extended = true;
+      save = 100000000; size = save;
+    };
+
+    shellAliases = {
+      "..." = "cd";
+      sl = "exa";
+      ls = "exa";
+      l = "exa -l";
+      la = "exa -la";
+
+      rs = "rsync -a --info=progress2 ";
+    };
+    pathSetup = ''
+      export PATH="${prefixEnvPath "PATH" [
+        "$HOME/.nix-profile/bin"
+        "/nix/var/nix/profiles/default/bin"
+      ]}";
+      export MANPATH="$HOME/.nix-profile/share/man:$(manpath 2>/dev/null)";
+      typeset -U PATH path
+    '';
+    initExtra = ''
+      # Write out history line-by-line, rather than on shell session exit
+      setopt INC_APPEND_HISTORY
+    '';
+  };
+}
diff --git a/home-manager/pfke_at_errol.nix b/home-manager/pfke_at_errol.nix
index 4e3d16e..5dcd86e 100644
--- a/home-manager/pfke_at_errol.nix
+++ b/home-manager/pfke_at_errol.nix
@@ -7,7 +7,7 @@ let
 in {
   imports = [
     ./modules/cli/bat.nix 
-    ./modules/cli/fish.nix 
+    ./modules/cli/zsh.nix 
     ./modules/keychain.nix 
     ./modules/cli/starship.nix 
   ];