minor config changes

.gitconfig

@@ -6,12 +6,7 @@
 	helper = store
 [pull]
 	rebase = false
-[filter "lfs"] # Whyyyy is this default config here
- # Whyyyy is this default config here
- # Whyyyy is this default config here
- # Whyyyy is this default config here
- # Whyyyy is this default config here
- # Whyyyy is this default config here
+[filter "lfs"]
 	clean = git-lfs clean -- %f
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process

.zshrc_local

@@ -5,7 +5,7 @@ alias exrdeploy="(cexr && pack editxr.tgz --exclude=node_modules --exclude=dist
 alias man="batman"
 alias less="batpipe"
 alias watch="batwatch"
-alias diff="batdiff --staged"
+alias diff="batdiff"
 alias rg="batgrep"
 alias skim="/Applications/Skim.app/Contents/MacOS/Skim"
 present() {

.zshrc_portable

@@ -86,7 +86,6 @@ alias status="git status"
 alias pull="git pull"
 alias push="git push"
 alias clean="git clean -dfx"
-alias reset="git reset --hard HEAD"
 alias nuke="git clean -dfx && git reset --hard HEAD"
 alias stashlist="git stash list"
 alias stashshow="git stash show -p"
@@ -164,6 +163,14 @@ ammend() {
   git commit --amend -m "$1"
 }
 
+reset() {
+    if [ $# -eq 0 ]; then
+        git reset --hard HEAD
+    else
+        git restore --source=HEAD "$@"
+    fi
+}
+
 # gen z alias 
 alias yikes="git reset --hard HEAD"
 alias bigyikes="git clean -dfx && git reset --hard HEAD"

README.md

@@ -48,10 +48,12 @@ brew install yadm && yadm clone https://github.com/davay/dotfiles.git
 
 - Settings - Privacy & Security: Allow apps from anywhere
 
-- Yabai + Skhd: Start Service
+- Yabai + Skhd: Start service (they don't use brew services, do `yabai/skhd --start-service`)
 
 - Skim: Set headless config to sync with nvim https://github.com/benbrastmckie/.config
 
+- This may or may not be needed in the future: https://github.com/luckman212/screencapture-nag-remover
+
 ### 4. Where are hotkeys set 
 
 | App | Action | Hotkey |