diff --git a/.gitconfig b/.gitconfig index d1d1f8d..3e608f8 100644 --- a/.gitconfig +++ b/.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 diff --git a/.zshrc_local b/.zshrc_local index b194353..7127951 100644 --- a/.zshrc_local +++ b/.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() { diff --git a/.zshrc_portable b/.zshrc_portable index aff2b6b..9adf95c 100644 --- a/.zshrc_portable +++ b/.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" diff --git a/Library/Preferences/.GlobalPreferences.plist b/Library/Preferences/.GlobalPreferences.plist index 0b9f3da..9f51e1b 100644 Binary files a/Library/Preferences/.GlobalPreferences.plist and b/Library/Preferences/.GlobalPreferences.plist differ diff --git a/Library/Preferences/com.hegenberg.BetterTouchTool.plist b/Library/Preferences/com.hegenberg.BetterTouchTool.plist index 778f8bc..94efbae 100644 Binary files a/Library/Preferences/com.hegenberg.BetterTouchTool.plist and b/Library/Preferences/com.hegenberg.BetterTouchTool.plist differ diff --git a/README.md b/README.md index 9a4eee8..a3df97d 100644 --- a/README.md +++ b/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 |