diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix
index 7df5e94..4888d4a 100644
--- a/modules/home/shell/default.nix
+++ b/modules/home/shell/default.nix
@@ -1,4 +1,9 @@
-{ ... }: {
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    thefuck
+    git
+  ];
+
   home.shellAliases = {
     ga = "git add -A";
     gc = "git commit -m ";
@@ -8,9 +13,24 @@
 
     nrb = "sudo nixos-rebuild switch --flake .";
     nd = "nix develop";
+
+    neofetch = "hyfetch";
   };
 
   programs.bash = {
     enable = true;
   };
+
+  programs.zsh = {
+    enable = true;
+    enableAutosuggestions = true;
+    enableVteIntegration = true;
+    history.ignoreAllDups = true;
+    historySubstringSearch.enable = true;
+    oh-my-zsh = {
+      enable = true;
+      plugins = [ "git" "thefuck" ];
+      theme = "bira";
+    };
+  };
 }
diff --git a/modules/system/default.nix b/modules/system/default.nix
index e669639..498346a 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -83,5 +83,9 @@
       description = "twoneis";
       extraGroups = [ "networkmanager" "wheel" ];
     };
+
+    # Use zsh
+    programs.zsh.enable = true;
+    users.defaultUserShell = pkgs.zsh;
   };
 }