From ab1d346314852de828fa639a95131276488470f1 Mon Sep 17 00:00:00 2001
From: Jake Pullen <hello@jake-is.me>
Date: Sat, 7 Mar 2026 18:16:05 +0000
Subject: [PATCH] pre-merge commit

---
 zsh/.zshrc | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 zsh/.zshrc

diff --git a/zsh/.zshrc b/zsh/.zshrc
new file mode 100644
index 0000000..b4431e2
--- /dev/null
+++ b/zsh/.zshrc
@@ -0,0 +1,35 @@
+HISTFILE=~/.config/zsh/.histfile
+HISTSIZE=5000
+SAVEHIST=100000
+setopt autocd extendedglob
+unsetopt beep
+
+bindkey -v
+
+bindkey "^[[H" beginning-of-line
+bindkey "^[[F" end-of-line
+bindkey "^[[3~"  delete-char
+
+export PATH=$PATH:$HOME/.local/bin:$HOME/.lmstudio/bin
+export EDITOR=nvim
+export GIT_EDITOR=nvim
+
+# Fixing zsh history problems on multiple terminals
+setopt inc_append_history
+setopt share_history
+setopt histignorealldups
+
+# Alias: general
+alias ..='cd ..'
+alias la='ls -la'
+
+alias wake_up='(cd source/ai_web && ./run.sh >/dev/null 2>&1) && cd ~'
+alias kill_ai='pkill -f "open-webui"'
+
+alias mklink='ln -s "$(pwd)" ~/$(basename "$(pwd)")'
+
+alias merlin='(cd ~/source/merlin && uv run merlin) && cd ~'
+alias update_mp3='rsync -av /home/devin/music/ /run/media/devin/3761-3261'
+
+eval "$(starship init zsh)"
+fastfetch