diff --git a/common.nix b/common.nix
index 49e1869d..03519a6d 100644
--- a/common.nix
+++ b/common.nix
@@ -59,9 +59,12 @@
 
   security.rtkit.enable = true;
 
-  programs.firefox = {
-    enable = true;
-    nativeMessagingHosts.packages = [ pkgs.browserpass ];
+  programs = {
+    firefox = {
+      enable = true;
+      nativeMessagingHosts.packages = [ pkgs.browserpass ];
+    };
+    zsh = { enable = true; };
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/flake.nix b/flake.nix
index 00bcc8ad..b5779311 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,7 +12,6 @@
 
   outputs = { nixpkgs, home-manager, ... }:
     let
-      lib = nixpkgs.lib;
       system = "x86_64-linux";
       pkgs = import nixpkgs { inherit system; };
     in
diff --git a/users/functionalhacker/configuration.nix b/users/functionalhacker/configuration.nix
index 9a073857..d2bae854 100644
--- a/users/functionalhacker/configuration.nix
+++ b/users/functionalhacker/configuration.nix
@@ -1,9 +1,10 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   users.users.functionalhacker = {
     description = "Marko";
     isNormalUser = true;
     extraGroups = [ "networkmanager" "wheel" ];
+    shell = pkgs.zsh;
   };
 }
diff --git a/users/functionalhacker/home.nix b/users/functionalhacker/home.nix
index 97a28d3d..ee2f93f3 100644
--- a/users/functionalhacker/home.nix
+++ b/users/functionalhacker/home.nix
@@ -1,9 +1,31 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
+  programs = {
+    neovim = {
+      enable = true;
+      defaultEditor = true;
+    };
+
+    zsh = {
+      enable = true;
+      zplug = {
+        enable = true;
+        plugins = [
+          { name = "mafredri/zsh-async"; }
+          {
+            name = "sindresorhus/pure";
+            tags = [ "use:pure.zsh" "as:theme" ];
+          }
+          { name = "Aloxaf/fzf-tab"; }
+          { name = "zsh-users/zsh-history-substring-search"; }
+          { name = "wfxr/forgit"; }
+          { name = "zsh-users/zsh-completions"; }
+          { name = "zdharma-continuum/fast-syntax-highlighting"; }
+          { name = "RobSis/zsh-completion-generator"; }
+        ];
+      };
+    };
   };
 
   home = {
@@ -23,9 +45,9 @@
       nerdfonts
       nodejs
       pass
+      ripgrep
       tree-sitter
       yarn
-      zsh
     ];
   };
 }