From fd90d8ce239634f0fc905cb6da92ec55f815300a Mon Sep 17 00:00:00 2001 From: Devin Lim Date: Sat, 4 Jan 2025 03:23:17 -0800 Subject: [PATCH] minor config changes --- .gitconfig | 7 +------ .zshrc_local | 2 +- .zshrc_portable | 9 ++++++++- Library/Preferences/.GlobalPreferences.plist | Bin 3772 -> 3772 bytes .../com.hegenberg.BetterTouchTool.plist | Bin 12438 -> 12564 bytes README.md | 4 +++- 6 files changed, 13 insertions(+), 9 deletions(-) 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 0b9f3da897f0c8023a1c0b3dcd54e3154f2765de..9f51e1bf118dd09ccd578c3491b00afd5aae26cc 100644 GIT binary patch delta 83 zcmdlZyGM4zZyx2&&UgVi>F~_Fl>Bn(pw!&_vQz~KPa&-+KUX0*wPf;N9#x?rhtxm; j4gm%ZW5;7tk{=e>JlY(}YsAPd$E(Zh%LB^A$Ve78wg=)1?tJk(* zZ4;!6v7#pYacR<6qiMRNid$1lfJ>$GKxZ;%&iT$abI$obs5-d#)HY0W z@Ge)2JzOof0q=1exRW>#^jY*FJ8djCBN#C(h}NPVN6_)y|6(8$M2~k}#Qc~j!%0g^ z&o(ntUE8}N{NV2Xd)KdZ?f0G!i#~Yxz{Ki5B7fua+)AOosfX+3`oY12P(&gM(TIT$ z!!ZJWNFbn4p}{~LY{X+E5-E(7GnukU?o;# z9X6r?Z(uuG@HTc}XL%qskiq(Maw-B{)5RMYUdE72C(Q}GaME2}Zt(VTkGRL&6YeSZ zA3M+7J5+Md$>pH{Lfl1Kdel{fAsi808;j!IemTZ%)ReGp48c%_1fsez3|{cy+0ztv z7zy_X5Q7=Uk)bdzGwcd<_I@Ij7~6z}Si}a|Qt0L2x`xphgG403VLO>?WVvKlr3FZJ z7tusd1{`+}H9gtLajR(jP(JcGQ!bB8c5+-8`rgCkV#%5ugF{WdN z8&GdY%))HMvL^OW&CSq8d5SQXwU#~PWxRssWwFEX1o= z#5LkI?isUHtf1xQ>hoi+VkwqkIr4*L7^=8u49#6bL^kaz)+sB*IBT#L)oiL7Hp8H_ zc`k2+4yna@Y(O1rwQc~L>1Ca!T% zC#L9|cni&FX8)wb#4iv=T@S%JdAI?Yck$f(n$B*Un`SJV&elkCWpX$r>W%;sw zIlkGxLf;%;t#7@**k9r=^;h`!`@a)BLYNRPLYve6*v%FVsl{@54`Gown zd_#Vu@JfO*T1iwKC0WT<<|xaQEnZ8|Mr#4BNZY8@YumK< zwc}c+c0xO;eWm@P_2^XBbX`x^XX;h@W__RjxqehXrhloQ)_>CP8XhCmh%!bR>BdZ> z+GsI$7_M>5IB8rmzBR5Ge;NIz-%K>8o6F4IX1jUJJa7JN-ZA?uujR9bTh${hzol6j z)+}qbRcw{S^~UwZJ+i5-+LrCu$##mJYM0vc>=pJ(dzHP~USqGdtL++lpWW)rb&8!5 cr_?EP%AE>lfm6v1tdNkw8=Zsq3+o*EAAXm0asU7T delta 1357 zcmXv~2~d?)6#l>Wc)TYH|9$ZO?f$F&Xqpd%Cm@SbZnz+!NC_w!u2?AKl7-82B^-4` zeycI}a@1@Z9cjifYiMd}YNk;T7qkQ!XDVyPX;pEn`ylU`d+xd4IrrS}e7onqQ*mk? zCJe=9t_F2n4Yv$ixnXZ2c8(`?DeDFU-~*prc*Ag3_s?c z0B|81Uii=#JP7=VhX5H0C{*a^j{&feh=CY{Bn(3eQZXE97=cWT#6;v{3JNh5(@=yN zD8b99z&uo932N{<-o#q0Lm2BzLn)!Oq}0@;%(ACZsHs#u4<}1r#oy)bare1y?g96Z z?MF_lDLIqPY=eT3Rk5 z0f9)yEkcSsi)LUeH0Ll?y#`EJup-4$6vJCuF5wvr#t=MhWeF8#%~{bQ|Dl$0+3DIXsWi7=y7G$L+y*HVZRW zl!pmUf!5)fgvspt6n%ob053$?5yqhn(@~5US=mc$kVy9nhUrvkKIfL6AQQReGD=Z~ znV5xgt`@VoN6gP*MEg6%#tcs@<}y-@Uu+xZV*wVjK^8H_y&C5BU5r=oDykTtsvhiw zX?d5Tx<|EEGlhQ*%di|Pu#$DnVV#KOcvs;KuC`ZbCMIYU1V@mW#ZVFa1K9fm9={mg=Nk(mv^!bXxjc`c`U_I;7jupVDL5Cnv~; zJVZ{DbLENhba}R1DKD4T%Jp)i?8rytb8?6LkJ3+xQ-~6;Bq*9PT$!xoD*+yyoHo-dw4Gj~*Xa-R zM|y+aQ9Y`rj#f+5GIf?(q1LHysrBj(^@RG7dP=>lURB%GF7>{~Ykn=H6>3%5R_%~> zM!Tf_ru+1mu-;FP(tPia(tgBYLb;GLYus7M8?Jf2(`?&qFeb)ZeK4*VsciK1YzwE#5yY@Z% wzTIs;M1& 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 |