diff --git a/zsh/aliases b/aliases
similarity index 100%
rename from zsh/aliases
rename to aliases
diff --git a/bombadil.toml b/bombadil.toml
index b9d1e2d..5026647 100644
--- a/bombadil.toml
+++ b/bombadil.toml
@@ -19,8 +19,8 @@ waybar = { source = "waybar", target = ".config/waybar" }
 wofi = { source = "wofi", target = ".config/wofi" }
 
 # zsh
+zsh = { source = "aliases", target = ".aliases" }
 p10k = { source = "p10k.zsh", target = ".p10k.zsh" }
-zsh = { source = "zsh", target = ".zsh", ignore = [ ".keep" ] }
 zshenv = { source = "zshenv", target = ".zshenv" }
 zshrc = { source = "zshrc", target = ".zshrc" }
 
diff --git a/zsh/completions/.keep b/zsh/completions/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/zshrc b/zshrc
index b8c5a36..8ce7324 100644
--- a/zshrc
+++ b/zshrc
@@ -23,9 +23,12 @@ fi
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
 
 # Custom aliases
-[[ ! -f ~/.zsh/aliases ]] || source ~/.zsh/aliases
+[[ ! -f ~/.aliases ]] || source ~/.aliases
 
 # NVM
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+
+# Source machine-specific setup
+[[ ! -f ~/.zshrc.local ]] || source ~/.zshrc.local