diff --git a/dot_bash_alias.sh b/dot_bash_alias.sh
deleted file mode 100644
index 56ddb15..0000000
--- a/dot_bash_alias.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-alias ls="exa --icons --long"
-alias grep="ugrep"
-alias cd="z"
-alias cat="bat -p"
-alias update="rate-mirrors arch | sudo tee /etc/pacman.d/mirrorlist; rate-mirrors chaotic-aur | sudo tee /etc/pacman.d/chaotic-mirrorlist; paru; paru -c"
diff --git a/dot_bash_setup.sh b/dot_bash_setup.sh
deleted file mode 100644
index 5d3e670..0000000
--- a/dot_bash_setup.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Initialize zoxide
-eval "$(zoxide init bash)"
-
-# Add JetBrains scripts to path
-export PATH="$PATH:/home/isaac/.local/share/JetBrains/Toolbox/scripts"
\ No newline at end of file
diff --git a/dot_bashrc b/dot_bashrc
index d49f732..c3860a5 100644
--- a/dot_bashrc
+++ b/dot_bashrc
@@ -2,15 +2,22 @@
 [[ $- != *i* ]] && return
 
 # Set up terminal variables and scripts
-[[ -f ~/.bash_setup.sh ]] && . ~/.bash_setup.sh
+eval "$(zoxide init bash)"
+eval "$(packwiz completion bash)"
+eval "$(chezmoi completion bash)"
 
-# Set aliases if aliases exist
-[[ -f ~/.bash_alias.sh ]] && . ~/.bash_alias.sh
+# Set aliases
+alias ls="exa --icons --long"
+alias grep="ugrep"
+alias cd="z"
+alias cat="bat -p"
+alias update-mirrors="rate-mirrors arch | sudo tee /etc/pacman.d/mirrorlist; rate-mirrors chaotic-aur | sudo tee /etc/pacman.d/chaotic-mirrorlist"
+alias update="paru; paru -c"
 
 # Helpful tool: https://bash-prompt-generator.org
 # On github: https://github.com/Scriptim/bash-prompt-generator
 PS1='[\u@\h \w]\$ '
 
-# CLI env variables for programs
+# CLI programs
 EDITOR=micro
 DIFFPROG=difft
diff --git a/dot_config/environment.d/diff.conf b/dot_config/environment.d/diff.conf
new file mode 100644
index 0000000..7cb30b6
--- /dev/null
+++ b/dot_config/environment.d/diff.conf
@@ -0,0 +1 @@
+DIFFPROG=kdiff3
diff --git a/dot_config/environment.d/editor.conf b/dot_config/environment.d/editor.conf
new file mode 100644
index 0000000..852b62f
--- /dev/null
+++ b/dot_config/environment.d/editor.conf
@@ -0,0 +1 @@
+EDITOR=code