Merge branch 'master' of github.com:DelvarWorld/configs

Author: AndrewRayCode

.bashrc

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Colors for prompt
 COLOR_RED=$(tput sgr0 && tput setaf 1)
 COLOR_GREEN=$(tput sgr0 && tput setaf 2)
@@ -11,6 +13,9 @@ COLOR_LIGHT_RED=$(tput sgr0 && tput bold && tput setaf 1)
 COLOR_LIGHT_CYAN=$(tput sgr0 && tput bold && tput setaf 6)
 COLOR_RESET=$(tput sgr0)
 
+# shellcheck disable=SC1091
+source ~/.iterm2_shell_integration.bash
+
 pathadd() {
     newelement=${1%/}
     if [ -d "$1" ] && ! echo "$PATH" | grep -E -q "(^|:)$newelement($|:)" ; then
@@ -60,22 +65,22 @@ function gsync() {
     gitBranch=$(git rev-parse --abbrev-ref HEAD)
     if [[ -z "$1" ]]; then
         echo -n "${COLOR_YELLOW}Sync ${COLOR_BLUE}${gitBranch}${COLOR_YELLOW}? (Enter/y to confirm, n to cancel)${COLOR_RESET} "
-        read confirm
+        read -r confirm
     fi
 
-    hasOrigin=`cat .git/config | grep origin`
-    hasUpstream=`cat .git/config | grep upstream`
+    hasOrigin=$(grep origin < .git/config)
+    hasUpstream=$(grep upstream < .git/config)
 
     if [[ -z "$hasOrigin" || -z "$hasUpstream" ]]; then
         echo "${COLOR_RED}Error: ${COLOR_PINK}The command syncdev expects an ${COLOR_RED}origin${COLOR_PINK} and ${COLOR_RED}upstream${COLOR_PINK} remote${COLOR_RESET}"
         return 1
     fi
 
     if [[ "$confirm" == "" || "$confirm" == "y" ]]; then
-        git checkout ${gitBranch}
+        git checkout "$gitBranch"
         git fetch --all
-        git reset --hard upstream/${gitBranch}
-        git push origin ${gitBranch}
+        git reset --hard "upstream/$gitBranch"
+        git push origin "$gitBranch"
         echo "${COLOR_YELLOW}Complete!${COLOR_RESET}"
     fi
 
@@ -300,7 +305,7 @@ function audiosize() {
 
     mroot="/Users/andrewray/Music/Extended Mixes"
     # Find all system config files that aren't vim swap files and loop through them
-    for file in `ls "$mroot"`
+    for file in $mroot
     do
         # Show them in a list with a counter
         xx=`expr $xx + 1`
@@ -564,6 +569,9 @@ git_purge() {
     git_purge_remote_branches $branch
 }
 
+# Replacement for st?
+alias gs="git status --untracked-files=no"
+
 #######################################
 # distributed version control section #
 #######################################
@@ -905,6 +913,19 @@ function ding() {
     afplay /System/Library/Sounds/Glass.aiff
 }
 
+# Python development, requires pyenv from homebrew
+# Needs to go before GR stuff to 
+if [[ $(command -v pyenv) ]]; then
+    export PYENV_ROOT="$HOME/.pyenv"
+
+    eval "$(pyenv init -)"
+
+    # Requires homebrew pyenv-virtualenv
+    if [[ -f "${PYENV_ROOT}/shims/virtualenv" ]]; then
+        eval "$(pyenv virtualenv-init -)"
+    fi
+fi
+
 # Grand rounds stuff
 export GR_HOME=${HOME}/dev
 export GR_USERNAME=andrew.ray
@@ -987,18 +1008,6 @@ if [[ -d "${HOME}/c" ]]; then
     source ~/c/c_recent_branches_completer
 fi
 
-# Python development, requires pyenv from homebrew
-if [[ $(command -v pyenv) ]]; then
-    export PYENV_ROOT="$HOME/.pyenv"
-
-    eval "$(pyenv init -)"
-
-    # Requires homebrew pyenv-virtualenv
-    if [[ -f "${PYENV_ROOT}/shims/virtualenv" ]]; then
-        eval "$(pyenv virtualenv-init -)"
-    fi
-fi
-
 # legacy line? testing removing for new laptop setup and not linux
 # export IPSEC_SECRETS_FILE=/etc/ipsec.secrets
 export KEY_SUFFIX=grandrounds.com
@@ -1031,7 +1040,8 @@ function releaseCommits() {
 }
 
 function jgrep() {
-    #{ rake routes > ~/dev/rake-routes & } 2>/dev/null
+    # Run this to regenerate
+    # bundle exec rake routes > ~/dev/rake-routes
     cat ~/dev/rake-routes | grep "$1"
 }
 
@@ -1138,6 +1148,22 @@ if [ -d "$TRACKER_FLOW_PATH" ]; then
   . "$TRACKER_FLOW_PATH/tracker_completion.bash"
 fi
 
+# Kill stanky Rails Console
+function kc() {
+    ps aux | grep -E 'bin/rails c|rails_console' | grep -v 'grep' | awk '{print $2}' | xargs kill -9
+}
+
+# Check out file to branch and unstage it
+function fb() {
+    if [[ -z "$1" || -z "$2" ]]; then
+        echo 'Usage: filebranch branchname filename'
+    fi
+    dqt='"'
+    echo "git checkout ${dbq}${1}${dbq} -- ${dbq}${2}${dbq} && git reset HEAD ${dbq}${2}${dbq}"
+    git checkout "$1" -- "$2" && git reset HEAD "$2"
+    git status --untracked-files=no
+}
+
 # Chruby
 CHRUBY_PATH="/usr/local/share/chruby/"
 if [ -d "$CHRUBY_PATH" ]; then
@@ -1153,6 +1179,11 @@ if [ -d "$MINI_CONDA_PATH" ]; then
   pathadd "$MINI_CONDA_PATH"
 fi
 
+BAZEL_COMPLETION="${HOME}/usr/local/etc/bash_completion.d/bazel-complete.bash"
+if [ -s "$BAZEL_COMPLETION" ]; then
+    source "${HOME}/usr/local/etc/bash_completion.d/bazel-complete.bash"
+fi
+
 pathadd /Users/aray/miniconda3/bin:$PATH
 
 # loads nvm bash_completion

.pryrc

@@ -1,25 +1,34 @@
 #require 'awesome_print' # Removing because bad colors and can't configure
 #AwesomePrint.pry!
 
+
+url = 'https://vonk.fire.ly'
+if defined? GrFhir
+    client = GrFhir::Client.build(url)
+else
+    client = Gr::Fhir::Client.build(url)
+end
+puts "Client ready at #{url}"
+
 begin
     require 'colorize'
     puts "#{'require'.light_red} #{"'colorize'".cyan}"
-rescue LoadError
+rescue StandardError
     puts "Warning: colorize gem not found"
 end
 
 begin
     require 'factory_bot_rails'
     puts "#{'require'.light_red} #{"'factory_bot_rails'".cyan}"
-rescue LoadError
+rescue StandardError
     puts "Warning: factory_bot_rails gem not found"
 end
 
 # Gives domestic_phone_number for creating factories that use phone numbers
 begin
     require './spec/support/faker_phones.rb'
     puts "#{'require'.light_red} #{"'./spec/support/faker_phones.rb'".cyan}"
-rescue LoadError
+rescue StandardError
     puts "Warning: ./spec/support/faker_phones.rb not found"
 end
 

code/keybindings.json

@@ -12,10 +12,52 @@
   // terrible defaults for "rails run specs"
   { "key": "shift+cmd+t",           "command": "workbench.action.reopenClosedEditor" },
   { "key": "cmd+k cmd+f",           "command": "extension.runFileSpecs" },
+
+  // Jump around in vim
+  {
+    "key": "cmd+]",
+    "command": "workbench.action.editor.nextChange",
+    "when": "editorTextFocus"
+  },
   {
-    "key": "alt+cmd+n",
-    "command": "workbench.action.compareEditor.nextChange",
+    "key": "cmd+[",
+    "command": "workbench.action.editor.previousChange",
     "when": "editorTextFocus"
+  },
+
+  // From https://stackoverflow.com/a/46087295/743464, note it applies to
+  // splits with tabs which sucks
+  {
+    "key": "cmd+1",
+    "command": "workbench.action.openEditorAtIndex1"
+  },
+  {
+      "key": "cmd+2",
+      "command": "workbench.action.openEditorAtIndex2"
+  },
+  {
+      "key": "cmd+3",
+      "command": "workbench.action.openEditorAtIndex3"
+  },
+  {
+      "key": "cmd+4",
+      "command": "workbench.action.openEditorAtIndex4"
+  },
+  {
+      "key": "cmd+5",
+      "command": "workbench.action.openEditorAtIndex5"
+  },
+  {
+      "key": "cmd+6",
+      "command": "workbench.action.openEditorAtIndex6"
+  },
+  {
+      "key": "cmd+7",
+      "command": "workbench.action.openEditorAtIndex7"
+  },
+  {
+      "key": "cmd+8",
+      "command": "workbench.action.openEditorAtIndex8"
   }
 ]
 

code/settings.json

@@ -1,6 +1,6 @@
 // Place your settings in this file to overwrite the default settings
 {
-  "workbench.colorTheme": "Visual Studio Light",
+  "workbench.colorTheme": "Abyss",
   "eslint.enable": true,
   "javascript.validate.enable": false,
   "editor.rulers": [80],
@@ -45,5 +45,7 @@
       "editor.background": "#000"
     }
   },
-  "workbench.sideBar.location": "left"
-}
+  "workbench.sideBar.location": "left",
+  "workbench.settings.editor": "json",
+  "files.autoSave": "onFocusChange"
+}