Feature/version-seven-point-one

.gitignore

@@ -52,3 +52,4 @@ workstation/itermocil
 .Trashes
 ehthumbs.db
 Thumbs.db
+scratch.rb

workstation/dotfiles/.gemrc

@@ -1,9 +1,10 @@
 ---
-:update_sources: true
+:backtrace: false
+:bulk_threshold: 1000
 :sources:
 - https://rubygems.org/
-:benchmark: false
-:bulk_threshold: 1000
-:backtrace: false
+:update_sources: true
 :verbose: true
-gem: --no-ri --no-rdoc
+:concurrent_downloads: 8
+benchmark: false
+gem: "--no-ri --no-rdoc"

workstation/dotfiles/.zshrc

@@ -61,6 +61,7 @@ else
     export PATH="/usr/local/opt/[email protected]/bin:$PATH"
     export PATH="/usr/local/sbin:$PATH"
     export PATH="/usr/local/opt/[email protected]/bin:$PATH"
+    export PATH="/usr/local/opt/python/libexec/bin:$PATH"
 fi
 
 [[ -s `brew --prefix`/etc/autojump.sh ]] && . `brew --prefix`/etc/autojump.sh
@@ -74,4 +75,24 @@ export DIRENV_LOG_FORMAT=
 # For osx machines fix the alt + arrow functionality
 bindkey -e; bindkey '\e\e[C' forward-word; bindkey '\e\e[D' backward-word
 
-
+# Loads the correct version of node via nvm
+autoload -U add-zsh-hook
+load-nvmrc() {
+  local node_version="$(nvm version)"
+  local nvmrc_path="$(nvm_find_nvmrc)"
+
+  if [ -n "$nvmrc_path" ]; then
+    local nvmrc_node_version=$(nvm version "$(cat "${nvmrc_path}")")
+
+    if [ "$nvmrc_node_version" = "N/A" ]; then
+      nvm install
+    elif [ "$nvmrc_node_version" != "$node_version" ]; then
+      nvm use
+    fi
+  elif [ "$node_version" != "$(nvm version default)" ]; then
+    echo "Reverting to nvm default version"
+    nvm use default
+  fi
+}
+add-zsh-hook chpwd load-nvmrc
+load-nvmrc

workstation/shell/shortcut-help/git

@@ -9,6 +9,7 @@ githelp () {
   echo "  gcm          = commit locally, but do not push to origin, commit msg in ide"
   echo "  gmb          = pull, merge branch, push, status"
   echo "  gmt          = pull, merge branch with full rewrite, push, status"
+  echo "  gpab         = delete all local branches"
   echo "  gdb          = delete local and remote branch"
   echo "  gp           = pull down all the code and all the tags"
   echo "  gpo          = pushing all the things to origin"

workstation/shell/shortcuts/git

@@ -8,13 +8,13 @@ function gd(){ git diff }
 function gtl(){ git tag --sort=v:refname }
 function grso(){ git remote show origin }
 function gcf(){ git config --list }
+function gpab(){ git branch | grep -v "master" | xargs git branch -D }
 
 function gsmi(){
   git status;
   git pull;
   git submodule update --init --recursive;
 }
-
 function gstats(){
   git shortlog -s -n
 }

workstation/shell/shortcuts/ror

@@ -2,7 +2,7 @@
 # rubocop:disable all
 MYRUBYVERSION="3.0.0"
 export RUBY_DEP_GEM_SILENCE_WARNINGS=1
-export RUBYOPT='-W0'
+export RUBYOPT='-W:no-deprecated -W:no-experimental'
 export BUNDLER_EDITOR="vscode"
 export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
 

workstation/vscode/settings.json

@@ -70,7 +70,6 @@
     "[markdown]": {
         "files.trimTrailingWhitespace": false
     },
-    "editor.fontSize": 14,
     "liveshare.accountProvider": "",
     "liveshare.account": "",
     "remote.extensionKind": {
@@ -84,4 +83,6 @@
     "ruby.rubocop.useBundler": true,
     "editor.formatOnSave": false,
     "window.zoomLevel": -1,
+    "editor.accessibilityPageSize": 20,
+    "editor.fontSize": 14,
 }