🛹

bin/enod

@@ -3,8 +3,14 @@ set -ex
 
 current_branch=$(git branch | grep '*' | sed -e 's/* //')
 
-if [ $current_branch == "master" ]; then
- echo 'Not destroying master'
+if git branch | grep -q master; then
+ main_branch='master'
+else
+ main_branch='main'
+fi
+
+if [ $current_branch == $main_branch ]; then
+ echo "Not destroying $main_branch"
  exit 1
 fi
 
@@ -13,9 +19,9 @@ if [[ `git status --porcelain` != '' ]]; then
  exit 1
 fi
 
-git checkout master
+git checkout $main_branch
 
 git fetch --all --prune
-git pull origin master --ff-only --rebase --autostash
+git pull origin $main_branch --ff-only --rebase --autostash
 
 git br -D $current_branch

brew/Brewfile.symlink

@@ -1,11 +1,11 @@
 # vim: set ft=ruby
 
 brew "ansible"
-brew "aria2"
 brew "carthage"
 brew "chruby"
 brew "ctags"
 brew "curl"
+brew "fd"
 brew "dark-mode"
 brew "git"
 brew "hub"
@@ -27,12 +27,17 @@ brew "wget"
 brew "yarn"
 brew "youtube-dl"
 brew "zsh"
+brew "zsh-autosuggestions"
+brew "zsh-syntax-highlighting"
 
 tap "homebrew/services"
 
 tap "mongodb/brew"
 brew "mongodb-community"
 
+tap "federico-terzi/espanso"
+brew "espanso"
+
 cask_args appdir: "/Applications"
 tap "homebrew/cask"
 
@@ -68,37 +73,28 @@ cask "transmit"
 cask "vimr"
 cask "visual-studio-code"
 cask "vlc"
-cask "zoomus"
+cask "zoom"
 
 tap "homebrew/cask-fonts"
 cask "font-courier-prime"
 cask "font-courier-prime-code"
-cask "font-cousine"
-cask "font-dejavu-sans"
-cask "font-dejavusansmono-nerd-font"
 cask "font-fantasque-sans-mono"
 cask "font-fira-code"
 cask "font-fira-sans"
-cask "font-firacode-nerd-font"
-cask "font-firacode-nerd-font-mono"
 cask "font-inconsolata"
-cask "font-inter"
 cask "font-input"
+cask "font-inter"
 cask "font-iosevka"
 cask "font-iosevka-aile"
 cask "font-iosevka-curly"
 cask "font-iosevka-curly-slab"
 cask "font-iosevka-etoile"
 cask "font-iosevka-slab"
-cask "font-iosevka-sparkle"
-cask "font-lekton"
-cask "font-liberation-sans"
 cask "font-monoid"
 cask "font-mononoki"
-cask "font-roboto"
-cask "font-roboto-condensed"
-cask "font-roboto-mono"
-cask "font-sourcecodepro-nerd-font"
+cask "font-sf-compact"
+cask "font-sf-mono"
+cask "font-sf-pro"
 cask "font-victor-mono"
 
 cask "qlcolorcode"

iterm/com.googlecode.iterm2.plist

@@ -2097,6 +2097,10 @@
  <integer>4</integer>
  <key>JobName</key>
  <true/>
+ <key>NeverWarnAboutShortLivedSessions_0573FFC4-AE86-44EE-8AD2-0C475F168DD3</key>
+ <true/>
+ <key>NeverWarnAboutShortLivedSessions_0573FFC4-AE86-44EE-8AD2-0C475F168DD3_selection</key>
+ <integer>0</integer>
  <key>NeverWarnAboutShortLivedSessions_F04B134F-101E-47DF-925A-8C1E1978DDD5</key>
  <true/>
  <key>NeverWarnAboutShortLivedSessions_F04B134F-101E-47DF-925A-8C1E1978DDD5_selection</key>
@@ -3410,7 +3414,7 @@
  <key>Non-ASCII Anti Aliased</key>
  <true/>
  <key>Normal Font</key>
- <string>VictorMono-SemiBold 18</string>
+ <string>VictorMono-SemiBold 16</string>
  <key>Option Key Sends</key>
  <integer>0</integer>
  <key>Place Prompt at First Column</key>