diff --git a/hosts/p14s/configuration.nix b/hosts/p14s/configuration.nix
index 5b2cf9f..16d8e2a 100644
--- a/hosts/p14s/configuration.nix
+++ b/hosts/p14s/configuration.nix
@@ -90,6 +90,7 @@
     isNormalUser = true;
     description = "Jan Grosser";
     extraGroups = [ "networkmanager" "wheel" ];
+    shell = pkgs.zsh;
     packages = with pkgs; [
     #  thunderbird
     ];
@@ -97,6 +98,9 @@
 
   # Install firefox.
   programs.firefox.enable = true;
+  
+  # Install ZSH
+  programs.zsh.enable = true;
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
diff --git a/hosts/p14s/home.nix b/hosts/p14s/home.nix
index fc99c5d..f5dfdbf 100644
--- a/hosts/p14s/home.nix
+++ b/hosts/p14s/home.nix
@@ -48,6 +48,19 @@
   # Update the font cache
   fonts.fontconfig.enable = true;
 
+  # ZSH
+  programs.zsh = {
+    enable = true;
+    oh-my-zsh = {
+      enable = true;
+      theme = "dst";
+    };
+
+    initExtra = ''
+        setopt nonomatch # forward wildcard if no match
+	'';
+  };
+
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
   # plain files is through 'home.file'.
   home.file = {