diff --git a/systems/common.nix b/systems/common.nix
index a736afb..aff3766 100755
--- a/systems/common.nix
+++ b/systems/common.nix
@@ -83,6 +83,8 @@
   services.openssh.enable = true;
   programs.java.enable = true; 
   security.polkit.enable = true;
+  programs.zsh.enable = true;
+
   
   # System packages
   environment.systemPackages = with pkgs; [
@@ -116,6 +118,19 @@
     wget
   ];
 
+  fonts.fonts = with pkgs; [
+    nerdfonts
+    noto-fonts
+    noto-fonts-cjk
+    noto-fonts-emoji
+    liberation_ttf
+    fira-code
+    fira-code-symbols
+    mplus-outline-fonts.githubRelease
+    dina-font
+    proggyfonts
+  ];
+
   services.xserver.excludePackages = [ pkgs.xterm ];
   documentation.nixos.enable = false; 
 }
diff --git a/users/jsutter.nix b/users/jsutter.nix
index 3689f65..9f51bca 100755
--- a/users/jsutter.nix
+++ b/users/jsutter.nix
@@ -20,6 +20,7 @@ in
   ];
 
   users.users.jsutter = {
+    shell = pkgs.zsh;
     isNormalUser = true;
     description = "Julian Sutter";
     extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "libvirtd" ];
@@ -44,8 +45,6 @@ in
       libreoffice-qt
       deluge
       signal-desktop
-      mattermost-desktop
-      librecad
     ];
   };
 
@@ -83,6 +82,36 @@ in
         };
       };
 
+      programs.zsh = {
+        enable = true;
+        enableCompletion = false; # enabled in oh-my-zsh
+        enableAutosuggestions = true;
+        initExtra = ''
+          test -f ~/.dir_colors && eval $(dircolors ~/.dir_colors)
+        '';
+        shellAliases = {
+          ne = "nix-env";
+          ni = "nix-env -iA";
+          no = "nixops";
+          ns = "nix-shell --pure";
+          cat = "bat";
+          nra = "sudo nixos-rebuild switch --flake .#aurora --impure";
+	        nif = "sudo nixos-rebuild switch --flake .#framework --impure";
+        };
+        oh-my-zsh = {
+          enable = true;
+          plugins = [ "git" "systemd" "rsync" "kubectl" "ansible" "battery"];
+          theme = "terminalparty";
+        };
+      };
+      
+      programs.lsd = {
+        enable = true;
+        enableAliases = true;
+      };
+
+      programs.bat.enable = true;
+
     # Firefox
       programs.firefox = {
         enable = true;