diff --git a/oni/home/data/config.scm b/oni/home/data/config.scm
index ca0b40f..4271dda 100644
--- a/oni/home/data/config.scm
+++ b/oni/home/data/config.scm
@@ -6,13 +6,16 @@
   #:use-module (gnu services)
   #:use-module (gnu packages)
   #:use-module (gnu packages admin)
+  #:use-module (gnu packages shellutils)
   #:use-module (guix gexp)
   #:use-module (oni home services xdisorg)
   #:use-module (oni home services xmodmap)
   #:use-module (oni home services kitty))
 
 (home-environment
- (packages (list (specification->package+output "glibc-locales")))
+ (packages (list (specification->package+output "glibc-locales")
+                 zsh-syntax-highlighting
+                 zsh-autosuggestions))
 
  (services
   (list
@@ -31,7 +34,35 @@
              (latitude 49.2127205)
              (longitude 122.9267927)))
 
-   (service home-zsh-service-type)
+   (service home-zsh-service-type
+            (home-zsh-configuration
+             (environment-variables
+              '(("HISTFILE" . "$HOME/.zsh/histfile")
+                ("HISTSIZE" . "1000")
+                ("SAVEHIST" . "1000")))
+             (zshrc
+              (list
+               (mixed-text-file
+                "zshrc"
+                "fpath=($HOME/.zsh/functions $fpath)\n"
+                "autoload -U $HOME/.zsh/functions/*(:t)\n"
+                "alias csi=\"rlwrap csi\"\n"
+                "alias scsh=\"rlwrap scsh\"\n"
+                "alias sbcl=\"rlwrap sbcl\"\n"
+                "alias hc=herbstclient\n"
+                "setopt SHARE_HISTORY\n"
+                "setopt HIST_IGNORE_ALL_DUPS\n"
+                "zle -N x-copy-region-as-kill\n"
+                "zle -N x-kill-region\n"
+                "zle -N x-yank\n"
+                "bindkey -e '^[w' x-copy-region-as-kill\n"
+                "bindkey -e '^W' x-kill-region\n"
+                "bindkey -e '^Y' x-yank\n"
+                "autoload -Uz compinit\n"
+                "compinit\n"
+                "source " zsh-autosuggestions "/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh\n"
+                ;; This has to be last
+                "source " zsh-syntax-highlighting "/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh\n")))))
 
    (service home-rofi-service-type
             (home-rofi-configuration