diff --git a/zsh/.local/share/vxclutch/zsh/aliases b/zsh/.local/share/vxclutch/zsh/aliases
deleted file mode 100644
index d4babfa..0000000
--- a/zsh/.local/share/vxclutch/zsh/aliases
+++ /dev/null
@@ -1,6 +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'
diff --git a/zsh/.local/share/vxclutch/zsh/envs b/zsh/.local/share/vxclutch/zsh/envs
deleted file mode 100644
index a158930..0000000
--- a/zsh/.local/share/vxclutch/zsh/envs
+++ /dev/null
@@ -1,5 +0,0 @@
-export EDITOR=nvim
-export SUDO_EDITOR="$EDITOR"
-export TERM=xterm-256color
-
-export GOPATH=$HOME/.local/go
diff --git a/zsh/.local/share/vxclutch/zsh/functions b/zsh/.local/share/vxclutch/zsh/functions
deleted file mode 100644
index c6be6ae..0000000
--- a/zsh/.local/share/vxclutch/zsh/functions
+++ /dev/null
@@ -1,4 +0,0 @@
-take() {
-  mkdir $1;
-  cd $1
-}
diff --git a/zsh/.local/share/vxclutch/zsh/init b/zsh/.local/share/vxclutch/zsh/init
deleted file mode 100644
index 7815547..0000000
--- a/zsh/.local/share/vxclutch/zsh/init
+++ /dev/null
@@ -1,3 +0,0 @@
-eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-
-source $HOME/.zprofile
diff --git a/zsh/.local/share/vxclutch/zsh/inputrc b/zsh/.local/share/vxclutch/zsh/inputrc
deleted file mode 100644
index 23c019b..0000000
--- a/zsh/.local/share/vxclutch/zsh/inputrc
+++ /dev/null
@@ -1 +0,0 @@
-bindkey -e
diff --git a/zsh/.local/share/vxclutch/zsh/plugins b/zsh/.local/share/vxclutch/zsh/plugins
deleted file mode 100644
index 9ba0c53..0000000
--- a/zsh/.local/share/vxclutch/zsh/plugins
+++ /dev/null
@@ -1,5 +0,0 @@
-[ -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"
diff --git a/zsh/.local/share/vxclutch/zsh/rc b/zsh/.local/share/vxclutch/zsh/rc
deleted file mode 100644
index d55550f..0000000
--- a/zsh/.local/share/vxclutch/zsh/rc
+++ /dev/null
@@ -1,12 +0,0 @@
-autoload -Uz compinit
-compinit
-
-autoload -U bashcompinit
-bashcompinit
-
-HISTSIZE=10000
-SAVEHIST=10000
-HISTFILE=~/.cache/zsh/history
-
-autoload -U colors && colors
-PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "
diff --git a/zsh/.local/share/vxclutch/zsh/shell b/zsh/.local/share/vxclutch/zsh/shell
deleted file mode 100644
index 7bb8452..0000000
--- a/zsh/.local/share/vxclutch/zsh/shell
+++ /dev/null
@@ -1,5 +0,0 @@
-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
index cbe46d6..927713f 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,9 +1,44 @@
-source ~/.local/share/vxclutch/zsh/aliases
-source ~/.local/share/vxclutch/zsh/envs
-source ~/.local/share/vxclutch/zsh/functions
-source ~/.local/share/vxclutch/zsh/init
-source ~/.local/share/vxclutch/zsh/shell
-source ~/.local/share/vxclutch/zsh/plugins
-source ~/.local/share/vxclutch/zsh/inputrc
+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
 
-source ~/.local/share/vxclutch/zsh/rc
+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