diff --git a/fish/.config/fish/config.fish.symlink b/fish/.config/fish/config.fish.symlink
index d422aa4..5c8758d 100644
--- a/fish/.config/fish/config.fish.symlink
+++ b/fish/.config/fish/config.fish.symlink
@@ -17,6 +17,10 @@ set -gx DOT "$HOME/dotfiles"
 # Projects dir.
 set -gx HACK "$HOME/hackin"
 
+# Editor.
+set -gx EDITOR "nvim"
+set -gx VISUAL "$EDITOR"
+
 # Local environment variables.
 if [ -e "$HOME/.local.env" ]
   source "~/.local.env"
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
deleted file mode 100644
index bf47a9b..0000000
--- a/zsh/aliases.zsh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/env zsh
-
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-# Shell aliases
-alias zshconfig="$EDITOR ~/.zshrc"
-alias ohmyzsh="$EDITOR ~/.oh-my-zsh"
-alias rl=". ~/.zshrc"
-alias c="clear"
-alias e="$EDITOR"
-
-# Help alias
-autoload -Uz run-help
-autoload -Uz run-help-git
-alias help=run-help
-
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-# Location alias
-alias hack="cd ~/hackin"
-
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-# Default command options
-
-alias cp="cp -iv"
-#             │└─ list copied files
-#             └─ prompt before overwriting an existing file
-
-alias mkdir="mkdir -pv"
-#                   │└─ list created directories
-#                   └─ create intermediate directories
-
-alias mv="mv -iv"
-#             │└─ list moved files
-#             └─ prompt before overwriting an existing file
-
-alias rm="rm -rf --"
-
-# Colored grep output
-alias grep="grep --color=auto"
-alias fgrep="fgrep --color=auto"
-alias egrep="egrep --color=auto"
-
-# Recursively delete `.DS_Store` files
-alias dscleanup="find . -type f -name '*.DS_Store' -ls -delete"
-
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-shared_update_cmds="brew update && brew upgrade && brew cleanup; \
-  npm install npm -g && npm update -g; \
-  sudo gem update --system && sudo gem update && sudo gem cleanup"
-
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-# Mac aliases
-
-if [[ "$(uname)" == "Darwin" ]]; then
-
-  alias clear-dns-cache="sudo dscacheutil -flushcache; \
-    sudo killall -HUP mDNSResponder"
-
-  alias o="open"
-
-  alias u="sudo softwareupdate --install --all; $shared_update_cmds"
-
-  # Show/hide hidden files in Finder
-  alias showhid="defaults write com.apple.finder AppleShowAllFiles -bool true && killall Finder"
-  alias hidehid="defaults write com.apple.finder AppleShowAllFiles -bool false && killall Finder"
-
-  # Merge PDF files, preserving hyperlinks
-  # Usage: `mergepdf input{1,2,3}.pdf`
-  alias mergepdf='gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=_merged.pdf'
-
-fi
-
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-# Ubuntu aliases
-
-if [[ "$(uname)" == "Linux" ]]; then
-
-  alias 0="xdg-open"
-
-  alias u="sudo apt update && sudo apt upgrade; $shared_update_cmds"
-
-fi
diff --git a/zsh/catppuccin_mocha-zsh-syntax-highlighting.zsh b/zsh/catppuccin_mocha-zsh-syntax-highlighting.zsh
deleted file mode 100644
index 3958790..0000000
--- a/zsh/catppuccin_mocha-zsh-syntax-highlighting.zsh
+++ /dev/null
@@ -1,74 +0,0 @@
-# Catppuccin Mocha Theme (for zsh-syntax-highlighting)
-#
-# Paste this files contents inside your ~/.zshrc before you activate zsh-syntax-highlighting
-ZSH_HIGHLIGHT_HIGHLIGHTERS=(main cursor)
-typeset -gA ZSH_HIGHLIGHT_STYLES
-
-# Main highlighter styling: https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md
-#
-## General
-### Diffs
-### Markup
-## Classes
-## Comments
-ZSH_HIGHLIGHT_STYLES[comment]='fg=#585b70'
-## Constants
-## Entitites
-## Functions/methods
-ZSH_HIGHLIGHT_STYLES[alias]='fg=#a6e3a1'
-ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=#a6e3a1'
-ZSH_HIGHLIGHT_STYLES[global-alias]='fg=#a6e3a1'
-ZSH_HIGHLIGHT_STYLES[function]='fg=#a6e3a1'
-ZSH_HIGHLIGHT_STYLES[command]='fg=#a6e3a1'
-ZSH_HIGHLIGHT_STYLES[precommand]='fg=#a6e3a1,italic'
-ZSH_HIGHLIGHT_STYLES[autodirectory]='fg=#fab387,italic'
-ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=#fab387'
-ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=#fab387'
-ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=#cba6f7'
-## Keywords
-## Built ins
-ZSH_HIGHLIGHT_STYLES[builtin]='fg=#a6e3a1'
-ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=#a6e3a1'
-ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=#a6e3a1'
-## Punctuation
-ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#f38ba8'
-ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]='fg=#cdd6f4'
-ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-unquoted]='fg=#cdd6f4'
-ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]='fg=#cdd6f4'
-ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]='fg=#f38ba8'
-ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=#f38ba8'
-ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=#f38ba8'
-## Serializable / Configuration Languages
-## Storage
-## Strings
-ZSH_HIGHLIGHT_STYLES[command-substitution-quoted]='fg=#f9e2af'
-ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-quoted]='fg=#f9e2af'
-ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#f9e2af'
-ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=#e64553'
-ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#f9e2af'
-ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=#e64553'
-ZSH_HIGHLIGHT_STYLES[rc-quote]='fg=#f9e2af'
-## Variables
-ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#cdd6f4'
-ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=#e64553'
-ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=#cdd6f4'
-ZSH_HIGHLIGHT_STYLES[assign]='fg=#cdd6f4'
-ZSH_HIGHLIGHT_STYLES[named-fd]='fg=#cdd6f4'
-ZSH_HIGHLIGHT_STYLES[numeric-fd]='fg=#cdd6f4'
-## No category relevant in spec
-ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#e64553'
-ZSH_HIGHLIGHT_STYLES[path]='fg=#cdd6f4,underline'
-ZSH_HIGHLIGHT_STYLES[path_pathseparator]='fg=#f38ba8,underline'
-ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=#cdd6f4,underline'
-ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]='fg=#f38ba8,underline'
-ZSH_HIGHLIGHT_STYLES[globbing]='fg=#cdd6f4'
-ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=#cba6f7'
-#ZSH_HIGHLIGHT_STYLES[command-substitution]='fg=?'
-#ZSH_HIGHLIGHT_STYLES[command-substitution-unquoted]='fg=?'
-#ZSH_HIGHLIGHT_STYLES[process-substitution]='fg=?'
-#ZSH_HIGHLIGHT_STYLES[arithmetic-expansion]='fg=?'
-ZSH_HIGHLIGHT_STYLES[back-quoted-argument-unclosed]='fg=#e64553'
-ZSH_HIGHLIGHT_STYLES[redirection]='fg=#cdd6f4'
-ZSH_HIGHLIGHT_STYLES[arg0]='fg=#cdd6f4'
-ZSH_HIGHLIGHT_STYLES[default]='fg=#cdd6f4'
-ZSH_HIGHLIGHT_STYLES[cursor]='fg=#cdd6f4'
diff --git a/zsh/completion.zsh b/zsh/completion.zsh
deleted file mode 100644
index aa959fb..0000000
--- a/zsh/completion.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env zsh
-
-# Make matches case insensitive for lowercase
-zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}'https://github.com/holman/dotfiles