diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
deleted file mode 100644
index 927713f..0000000
--- a/zsh/.config/zsh/.zshrc
+++ /dev/null
@@ -1,44 +0,0 @@
-alias ls='ls --color=auto'
-alias ll='ls -lah'
-alias gg='lazygit'
-alias v='nvim'
-alias rr='russ read'
-alias cp='cp -v'
-export EDITOR=nvim
-export SUDO_EDITOR="$EDITOR"
-export TERM=xterm-256color
-
-export GOPATH=$HOME/.local/go
-take() {
-  mkdir $1;
-  cd $1
-}
-eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-
-source $HOME/.zprofile
-bindkey -e
-[ -f "${XDG_DATA_HOME:-$HOME/.local/share}/zap/zap.zsh" ] && source "${XDG_DATA_HOME:-$HOME/.local/share}/zap/zap.zsh"
-plug "zsh-users/zsh-autosuggestions"
-plug "zsh-users/zsh-syntax-highlighting"
-plug "zap-zsh/sudo"
-plug "Aloxaf/fzf-tab"
-autoload -Uz compinit
-compinit
-
-autoload -U bashcompinit
-bashcompinit
-
-HISTSIZE=10000
-SAVEHIST=10000
-HISTFILE=~/.cache/zsh/history
-setopt inc_append_history
-
-autoload -U colors && colors
-PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "
-
-setopt interactive_comments
-export PATH=$HOME/.local/bin:$PATH
-export PATH=$HOME/.local/go/bin:$PATH
-export PATH=$HOME/opt/bin:$PATH
-
-export LD_LIBRARY_PATH=$HOME/opt/lib:$LD_LIBRARY_PATH
diff --git a/zsh/.zshrc b/zsh/.zshrc
new file mode 100644
index 0000000..0012c97
--- /dev/null
+++ b/zsh/.zshrc
@@ -0,0 +1,57 @@
+export TERM=xterm-256color
+
+export EDITOR=nvim
+export SUDO_EDITOR=nvim
+
+export GOPATH="$HOME/.local/go"
+
+export HISTSIZE=10000
+export SAVEHIST=10000
+export HISTFILE="$HOME/.cache/zsh/history"
+
+setopt inc_append_history
+setopt interactive_comments
+
+export PATH="$HOME/.local/bin:$HOME/.local/go/bin:$HOME/opt/bin:$PATH"
+export LD_LIBRARY_PATH="$HOME/opt/lib:${LD_LIBRARY_PATH:-}"
+
+alias ls='ls --color=auto'
+alias ll='ls -lah'
+alias gg='lazygit'
+alias v='nvim'
+alias rr='russ read'
+alias cp='cp -v'
+
+take() {
+  mkdir -p -- "$1" && cd -- "$1"
+}
+
+bindkey -e
+
+autoload -Uz compinit colors
+autoload -U bashcompinit
+
+colors
+compinit
+bashcompinit
+
+PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "
+
+if [ -f "$HOME/.zprofile" ]; then
+  source "$HOME/.zprofile"
+fi
+
+if [ -x /home/linuxbrew/.linuxbrew/bin/brew ]; then
+  eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+fi
+
+ZAP_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/zap"
+
+if [ -f "$ZAP_DIR/zap.zsh" ]; then
+  source "$ZAP_DIR/zap.zsh"
+fi
+
+plug "zsh-users/zsh-autosuggestions"
+plug "zsh-users/zsh-syntax-highlighting"
+plug "zap-zsh/sudo"
+plug "Aloxaf/fzf-tab"