diff --git a/.config/zsh/aliases.sh b/.config/zsh/aliases.sh
new file mode 100644
index 0000000..164cb3d
--- /dev/null
+++ b/.config/zsh/aliases.sh
@@ -0,0 +1,36 @@
+alias encodempv='mpv --profile=encode'
+alias qaac='wine ~/.wine/drive_c/qaac/qaac.exe'
+alias qaac_release=/mnt/hephaestos/qaac/qaac91
+alias define='python /home/kageru/programming/mwebster/mwebster.py'
+alias nanaone-stream='mpv rtmp://live1.brb.re/live/nanaone'
+alias ls='exa'
+alias animesync='python /home/kageru/programming/animesync-personal/animesync.py'
+alias autoremove='sudo pacaur -R $(pacaur -Qdtq)'
+export EDITOR=/usr/bin/vim
+#alias nt='alacritty --working-directory $PWD &'
+alias nt='urxvt -cd $PWD &'
+alias ej='udisksctl power-off -b'
+alias monitor_on='pactl load-module module-loopback'
+alias monitor_off='pactl unload-module module-loopback'
+alias eac='wine "/home/kageru/.wine/drive_c/Program Files (x86)/Exact Audio Copy/EAC.exe"'
+alias sizeof='expac -H M "%n\t%m" -s'
+alias now='date +%H:%M:%S'
+alias c='bc <<< '
+alias ll='ls -l'
+alias la='ls -a'
+alias grep="grep --colour"
+alias clip='xsel -b'
+alias aurnoverify='yaourt --m-arg "--skipinteg" '
+alias bitrateviewer='wine "/home/kageru/.wine/drive_c/Program Files (x86)/BitrateViewer/BitrateViewer.exe"'
+alias colorpicker="maim -st 0 | convert - -resize 1x1\! -format '%[pixel:p{0,0}]' info:-"
+
+alias config='/usr/bin/git --git-dir=/home/kageru/dotfiles/ --work-tree=/home/kageru'
+alias -g ...='../../'           #cd ...
+alias -g ....='../../../'       #cd ....
+alias -g .....='../../../../'   #cd .....
+
+alias sprunge="curl -F 'sprunge=<-' http://sprunge.us"
+
+# Aliases for SSH connections (raspi, remote server, etc.)
+[ -f ~/.config/zsh/ssh.sh ] && source ~/.config/zsh/ssh.sh
+
diff --git a/.zshrc b/.zshrc
new file mode 100644
index 0000000..2aa6572
--- /dev/null
+++ b/.zshrc
@@ -0,0 +1,71 @@
+export PATH=$PATH:~/bin
+
+[ -f ~/.config/zsh/aliases.sh ] && source ~/.config/zsh/aliases.sh
+
+autoload -Uz vcs_info
+autoload -U colors && colors
+zstyle ':vcs_info:*' stagedstr "${fg_blue}?"
+zstyle ':vcs_info:*' unstagedstr "${fg_brown}?"
+zstyle ':vcs_info:*' check-for-changes true
+zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r'
+zstyle ':vcs_info:*' enable git svn
+
+precmd () {
+    if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] {
+        zstyle ':vcs_info:*' formats "${fg_green} ${fg_normal}%b%c%u${at_normal}"
+    } else {
+        zstyle ':vcs_info:*' formats "${fg_green} ${fg_normal}%b%c%u${fg_red}!${at_normal}"
+    }
+    vcs_info
+}
+
+setopt prompt_subst
+
+# I usually change the hostname color between my systems
+hostcolor="66"
+PROMPT="%(!.%F{220}[%F{196}%n%F{220}@%F{$hostcolor}%m %F{196}%c%F{204}\${vcs_info_msg_0_}%F{220}] %(?/%F{2}/%F{1})#.%F{196}[%F{220}%n%F{196}@%F{$hostcolor}%m %F{146}%c%F{111}\${vcs_info_msg_0_}%F{196}] %(?/%F{2}/%F{1})Δ)%f "
+
+# the same prompt without git/vcs stuff
+# PROMPT="%(!.%F{220}[%F{196}%n%F{220}@%F{$hostcolor}%m %F{196}%c%F{220}] %(?/%F{2}/%F{1})#.%F{196}[%F{220}%n%F{196}@%F{$hostcolor}%m %F{146}%c%F{196}] %(?/%F{2}/%F{1})Δ)%f "
+
+autoload -Uz compinit
+compinit
+
+export WINEDEBUG=-all
+
+# Get completion above command line
+setopt noalwayslastprompt
+setopt noauto_remove_slash
+setopt list_types
+setopt complete_in_word
+
+ZSHCAHCEDIR=/tmp/$USER-zsh-cache
+
+zstyle ':completion:*' completer _expand _complete _correct _approximate
+zstyle ':completion:*' expand prefix suffix
+zstyle ':completion:*' list-suffixes true
+zstyle ':completion:*' matcher-list '' '+m:{a-z}={A-Z}' 'r:|[._-]=** r:|=**' 'l:|=* r:|=*'
+zstyle ':completion:*' preserve-prefix '//[^/]##/'
+zstyle ':completion:*' use-cache on
+zstyle ':completion:*' cache-path $ZSHCAHCEDIR
+zstyle ':completion:*:*:kill:*' menu yes select
+zstyle ':completion:*:kill:*'   force-list always
+zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;31'
+zstyle ':completion:*:kill:*' command pids4kill
+zstyle ':completion:::::' completer _complete _approximate
+zstyle ':completion:*:approximate:*' max-errors 2
+zstyle ':completion:*' completer _complete _prefix
+zstyle ':completion::prefix-1:*' completer _complete
+zstyle ':completion:incremental:*' completer _complete _correct
+zstyle ':completion:predict:*' completer _complete # Completion caching
+zstyle ':completion::complete:*' use-cache 1
+zstyle ':completion::complete:*' cache-path $ZSHCAHCEDIR/$HOST # Expand partial paths
+zstyle ':completion:*:functions' ignored-patterns '_*'
+zstyle ':completion:*' squeeze-slashes 'yes' # Include non-hidden directories in globbed file completions
+zstyle ':completion:*:complete:-command-::commands' ignored-patterns '*\~' # Separate matches into groups
+zstyle ':completion:*:matches' group 'yes' # Describe each match group.
+zstyle ':completion:*:descriptions' format "%B---- %d%b" # Messages/warnings format
+zstyle ':completion:*:messages' format '%B%U---- %d%u%b'
+zstyle ':completion:*:warnings' format '%B%U---- no match for: %d%u%b' # Describe options in full
+zstyle ':completion:*:options' description 'yes'
+zstyle ':completion:*:options' auto-description '%d'