diff --git a/users/richie/home.nix b/users/richie/home.nix
index 8e967a1..d9a24ab 100644
--- a/users/richie/home.nix
+++ b/users/richie/home.nix
@@ -1,8 +1,8 @@
 {
   imports = [
-    ./home/git.nix
     ./home/programs.nix
     ./home/sshconfig.nix
+    ./home/cli
     ./home/vscode
   ];
 
@@ -12,7 +12,6 @@
     };
   };
 
-  programs.zsh.enable = true;
   home = {
     username = "richie";
     homeDirectory = "/home/richie";
diff --git a/users/richie/home/cli/default.nix b/users/richie/home/cli/default.nix
new file mode 100644
index 0000000..9660569
--- /dev/null
+++ b/users/richie/home/cli/default.nix
@@ -0,0 +1,13 @@
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf;
+in {
+  imports = [
+    ./git.nix
+    ./starship.nix
+    ./zsh.nix
+  ];
+}
diff --git a/users/richie/home/git.nix b/users/richie/home/cli/git.nix
similarity index 100%
rename from users/richie/home/git.nix
rename to users/richie/home/cli/git.nix
diff --git a/users/richie/home/cli/starship.nix b/users/richie/home/cli/starship.nix
new file mode 100644
index 0000000..927ad3a
--- /dev/null
+++ b/users/richie/home/cli/starship.nix
@@ -0,0 +1,5 @@
+{
+  programs.starship = {
+    enable = true;
+  };
+}
diff --git a/users/richie/home/cli/zsh.nix b/users/richie/home/cli/zsh.nix
new file mode 100644
index 0000000..73de1c0
--- /dev/null
+++ b/users/richie/home/cli/zsh.nix
@@ -0,0 +1,28 @@
+{
+  programs.zsh = {
+    enable = true;
+    syntaxHighlighting.enable = true;
+    history.size = 10000;
+    oh-my-zsh = {
+      enable = true;
+      plugins = [
+        "git"
+        "docker"
+        "docker-compose"
+        "colored-man-pages"
+        "rust"
+        "systemd"
+        "tmux"
+        "ufw"
+        "z"
+      ];
+    };
+    shellAliases = {
+      "sgc" = "sudo git -C /root/dotfiles";
+
+      ## Utilities
+      "lrt" = "eza --icons -lsnew";
+      "ls" = "eza";
+    };
+  };
+}
diff --git a/users/richie/home/programs.nix b/users/richie/home/programs.nix
index 4b8f634..e141acf 100644
--- a/users/richie/home/programs.nix
+++ b/users/richie/home/programs.nix
@@ -4,6 +4,7 @@
     # cli
     bat
     btop
+    eza
     git
     gnupg
     ncdu
@@ -11,6 +12,7 @@
     ripgrep
     sops
     starship
+    tmux
     zoxide
     zsh-nix-shell
     # system info