From 141e5e47e6ae0bd3f2b9587852bf0b8093156f96 Mon Sep 17 00:00:00 2001
From: Ian Langworth <ian@langworth.com>
Date: Tue, 30 Jul 2024 10:37:57 -0700
Subject: [PATCH] Add some aliases

---
 .gitignore |  1 +
 .zshrc     | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 85f79616..aa884333 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 .vim/bundle/*/doc/tags-??
 .vimlocal
 .zsh-completions
+.aider*
diff --git a/.zshrc b/.zshrc
index f38b5423..0aa5de90 100644
--- a/.zshrc
+++ b/.zshrc
@@ -115,6 +115,7 @@ alias aag='agg'
 alias agg='_agg () { rg --group $@ | less }; _agg'
 alias aurl='adb shell am start -a "android.intent.action.VIEW" -d'
 alias bc='bc -l'
+alias com='git checkout main'
 alias cr2lf="perl -pi -e 's/\x0d/\x0a/gs'"
 alias curlheaders='curl -s -D- -o/dev/null'
 alias curltime='curl -w "@$HOME/.curl-format" -o /dev/null -s'
@@ -245,7 +246,6 @@ alias vimsql="vim -c 'set ft=sql'"
 alias wgetdir='wget -r -l1 -P035 -nd --no-parent'
 alias wip='git add -A ; git commit --all --no-verify -m WIP'
 alias x='screen -A -x'
-alias y='yarn'
 alias yad='yarn add -D'
 alias ye='yarn exec'
 alias yeshist='HISTFILE=~/.zsh_history'
@@ -272,6 +272,9 @@ fi
 if ! _has gvim && _has open; then
   alias gvim='open -a "MacVim"'
 fi
+if ! _has mvim && _has open; then
+  alias mvim='open -a "MacVim"'
+fi
 
 # Use ripgrep or silver searcher over ack.
 if _has rg; then
@@ -371,6 +374,11 @@ if _has pnpm ; then
   alias npx='pnpm dlx'
 fi
 
+# Make a nice alias for tailscale on macOS
+if [ -e /Applications/Tailscale.app/Contents/MacOS/Tailscale ]; then
+  alias tailscale='/Applications/Tailscale.app/Contents/MacOS/Tailscale'
+fi
+
 # FUNCTIONS {{{1
 
 # Generate passwords