diff --git a/home-manager/common/programs/default.nix b/home-manager/common/programs/default.nix
index 2c8e2b7..a07815d 100644
--- a/home-manager/common/programs/default.nix
+++ b/home-manager/common/programs/default.nix
@@ -1,5 +1,5 @@
 { lib, config, ... }: {
-  imports = [ ./basePrograms.nix ./neovim.nix ];
+  imports = [ ./basePrograms.nix ./neovim.nix ./zsh.nix ];
 
   home = {
     homeDirectory = lib.mkDefault "/home/${config.home.username}";
diff --git a/home-manager/common/programs/zsh.nix b/home-manager/common/programs/zsh.nix
new file mode 100644
index 0000000..826c012
--- /dev/null
+++ b/home-manager/common/programs/zsh.nix
@@ -0,0 +1,32 @@
+{ inputs, ... }: {
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestions.enable = true;
+    syntaxHighlighting.enable = true;
+
+    shellAliases = {
+      c = "cargo";
+      d = "docker";
+      dc = "docker compose";
+      g = "git";
+      n = "nvim";
+      vim = "nvim";
+      mm = "mise";
+      mr = "mise run";
+      ls = "eza";
+      cat = "bat";
+      ps = "procs";
+    };
+
+    history = {
+      size = 10000;
+      path = "${config.xdg.dataHome}/zsh/history";
+    };
+  };
+
+  programs.starship = {
+    enable = true;
+    settings = { add_newline = true; };
+  };
+}
diff --git a/hosts/common/features/desktop-apps.nix b/hosts/common/features/desktop-apps.nix
index 456895d..9fcaf29 100644
--- a/hosts/common/features/desktop-apps.nix
+++ b/hosts/common/features/desktop-apps.nix
@@ -1,6 +1,6 @@
 { inputs, pkgs, ... }: {
   environment.systemPackages = [
-    # desktop apps
+    # various
     pkgs.google-chrome
     pkgs.firefox-devedition
     pkgs.spotify
@@ -17,6 +17,7 @@
     # dev tools
     pkgs.ferdium
     pkgs.bruno
+    pkgs.kitty
   ];
 
 }
diff --git a/hosts/common/features/zsh.nix b/hosts/common/features/zsh.nix
deleted file mode 100644
index 38b774c..0000000
--- a/hosts/common/features/zsh.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ inputs, ... }: {
-  programs.zsh.enable = true;
-  programs.starship.enable = true;
-}
diff --git a/hosts/common/global/cli-tools.nix b/hosts/common/global/cli-tools.nix
index 6d37e01..2142e87 100644
--- a/hosts/common/global/cli-tools.nix
+++ b/hosts/common/global/cli-tools.nix
@@ -4,13 +4,15 @@
     pkgs.fzf
     pkgs.home-manager
     pkgs.ripgrep
-    pkgs.zsh
     pkgs.git
     pkgs.neovim
     pkgs.lazygit
     pkgs.mise
     pkgs.gh
     pkgs.pass
+    pkgs.bat
+    pkgs.procs
+    pkgs.eza
   ];
 
 }
diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix
index 82fdd0e..0598ac9 100644
--- a/hosts/common/global/default.nix
+++ b/hosts/common/global/default.nix
@@ -1,11 +1,6 @@
 { inputs, pkgs, ... }: {
-  imports = [
-    inputs.home-manager.nixosModules.home-manager
-    ./nix.nix
-    ./zsh.nix
-    ./cli-tools.nix
-    ./desktop-apps.nix
-  ];
+  imports =
+    [ inputs.home-manager.nixosModules.home-manager ./nix.nix ./cli-tools.nix ];
 
   environment.systemPackages = [ pkgs.home-manager ];
 
diff --git a/hosts/common/global/zsh.nix b/hosts/common/global/zsh.nix
deleted file mode 100644
index ab0441b..0000000
--- a/hosts/common/global/zsh.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ inputs, ... }: {
-  programs.zsh.enable = true;
-  programs.starship = {
-    enable = true;
-    settings = { add_newline = true; };
-  };
-}