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

Author: AndrewRayCode

.bash_profile

@@ -27,3 +27,4 @@ export KEY_SUFFIX=grandrounds.com
 #test -e "${HOME}/.iterm2_shell_integration.bash" && source "${HOME}/.iterm2_shell_integration.bash"
 
 [[ -s "/Users/andrewray/.gvm/scripts/gvm" ]] && source "/Users/andrewray/.gvm/scripts/gvm"
+

.bashrc

@@ -11,6 +11,34 @@ COLOR_LIGHT_RED=$(tput sgr0 && tput bold && tput setaf 1)
 COLOR_LIGHT_CYAN=$(tput sgr0 && tput bold && tput setaf 6)
 COLOR_RESET=$(tput sgr0)
 
+pathadd() {
+    newelement=${1%/}
+    if [ -d "$1" ] && ! echo "$PATH" | grep -E -q "(^|:)$newelement($|:)" ; then
+        if [ "$2" = "after" ] ; then
+            PATH="$PATH:$newelement"
+        else
+            PATH="$newelement:$PATH"
+        fi
+    fi
+}
+
+pathrm() {
+    PATH="$(echo $PATH | sed -e "s;\(^\|:\)${1%/}\(:\|\$\);\1\2;g" -e 's;^:\|:$;;g' -e 's;::;:;g')"
+}
+
+
+# Configuration for the command line tool "hh" (history searcher to replace ctrl-r, brew install hh)
+export HH_CONFIG=hicolor,rawhistory,favorites   # get more colors
+shopt -s histappend              # append new history items to .bash_history
+#export HISTSIZE=${HISTFILESIZE}  # increase history size (default is 500)
+#export PROMPT_COMMAND="history -a; history -n; ${PROMPT_COMMAND}"   # mem/file sync
+# if this is interactive shell, then bind hh to Ctrl-r (for Vi mode check doc)
+#if [[ $- =~ .*i.* ]]; then bind '"\C-r": "\C-a hh -- \C-j"'; fi
+# if this is interactive shell, then bind 'kill last command' to Ctrl-x k
+#if [[ $- =~ .*i.* ]]; then bind '"\C-xk": "\C-a hh -k \C-j"'; fi
+
+# AWS_ENVIRONMENT_BETA=true
+
 # From awscli tools "Add the following to ~/.bashrc to enable bash completion:"
 complete -C aws_completer aws
 
@@ -226,9 +254,6 @@ function what-is-listening-on-port() {
     lsof -n -i4TCP:$1 | grep LISTEN
 }
 
-# required for dojo install of api (canvas dependency)
-#PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/X11/lib/pkgconfig
-
 # Don't wait for job termination notification
 set -o notify
 
@@ -872,19 +897,20 @@ function gr_banana() {
 
 PS1="\n\[$COLOR_YELLOW\]\u\[\$(error_test)\]@\[$COLOR_GREEN\]\w\$(${dvcs_function})\[$COLOR_RESET\] \$ "
 
-### Added by the Heroku Toolbelt
-#export PATH="/usr/local/heroku/bin:$PATH"
-
 # Grand rounds stuff
 export GR_HOME=${HOME}/dev
 export GR_USERNAME=andrew.ray
 
 if [ -d "$GR_HOME" ]; then
+
+    if [ -n "$LOGIN_WAIT" ]; then
+        echo "waiting ${LOGIN_WAIT}"
+    fi
     for file in ${GR_HOME}/engineering/bash/*.sh; do
         source $file;
     done
 
-    export PATH=${GR_HOME}/engineering/bin:${PATH}
+    pathadd "${GR_HOME}/engineering/bin"
 
     # default to aws env
     aws-environment development
@@ -896,7 +922,8 @@ fi
 alias vscode=code
 
 # Android SDK
-export PATH="${HOME}/Library/Android/sdk/tools:${HOME}/Library/Android/sdk/platform-tools:${PATH}"
+pathadd "${HOME}/Library/Android/sdk/tools:${HOME}/Library/Android/sdk/platform-tools"
+#export PATH="${HOME}/Library/Android/sdk/tools:${HOME}/Library/Android/sdk/platform-tools:${PATH}"
 
 # Banyan stuff
 alias bstart="pg_ctl start -D /usr/local/var/postgres-banyan -l /usr/local/var/postgres-banyan/server.log"
@@ -920,8 +947,10 @@ if [ -f /Users/andrewray/google-cloud-sdk/completion.bash.inc ]; then
   source '/Users/andrewray/google-cloud-sdk/completion.bash.inc'
 fi
 
+# My C quick branch switcher script
 if [[ -d "${HOME}/c" ]]; then
-    export PATH="${HOME}/c:${PATH}"
+    #export PATH="${HOME}/c:${PATH}"
+    pathadd "${HOME}/c"
     source ~/c/c_recent_branches_completer
 fi
 
@@ -937,6 +966,9 @@ if [[ $(command -v pyenv) ]]; then
     fi
 fi
 
+export IPSEC_SECRETS_FILE=/etc/ipsec.secrets
+export KEY_SUFFIX=grandrounds.com
+
 # GR
 function releaseCommits() {
     git fetch --all
@@ -1044,3 +1076,20 @@ function switch_dialog {
   esac
 }
 
+function docker_tag_exists() {
+    path="https://index.docker.io/v1/repositories/$1/tags/$2"
+    if curl --silent -f -lSL "$path" 2> /dev/null; then
+        echo "${COLOR_GREEN}Found $1 $2 at${COLOR_RESET}"
+        echo "    ${COLOR_LIGHT_GREEN}${path}${COLOR_RESET}"
+    else
+        echo "${COLOR_RED}Tag $1 $2 not found, checked path:${COLOR_RESET}"
+        echo "    ${COLOR_LIGHT_RED}${path}${COLOR_RESET}"
+    fi
+}
+
+TRACKER_FLOW_PATH="$GR_HOME/tracker-flow"
+if [ -d "$TRACKER_FLOW_PATH" ]; then
+  pathadd "$TRACKER_FLOW_PATH"
+  . "$TRACKER_FLOW_PATH/tracker_completion.bash"
+fi
+

.pryrc

@@ -1,8 +1,6 @@
 #require 'awesome_print' # Removing because bad colors and can't configure
 #AwesomePrint.pry!
 
-puts "#{'Starting a Pry console...'.cyan}"
-
 begin
     require 'colorize'
     puts "#{'require'.light_red} #{"'colorize'".cyan}"
@@ -11,18 +9,22 @@ rescue LoadError
 end
 
 begin
-    require 'factory_girl_console'
-    puts "#{'require'.light_red} #{"'factory_girl_console'".cyan}"
+    require 'factory_bot_rails'
+    puts "#{'require'.light_red} #{"'factory_bot_rails'".cyan}"
 rescue LoadError
-    puts "Warning: factory_girl_console gem not found"
+    puts "Warning: factory_bot_rails gem not found"
 end
 
-begin
-    include Rails.application.routes.url_helpers
-    puts "#{'include'.light_yellow} #{'Rails.application.routes.url_helpers'.cyan}"
-rescue LoadError
-    puts "Warning: factory_girl_console gem not found"
-end
+# rails 5.1 break?
+#begin
+    #Rails.application.routes.url_helpers
+    #include Rails.application.routes.url_helpers
+    #puts "#{'include'.light_yellow} #{'Rails.application.routes.url_helpers'.cyan}"
+#rescue LoadError
+    #puts "Warning: factory_bot_rails gem not found"
+#end
+
+puts "#{'Starting a Pry console...'.cyan}"
 
 def colorized_stack_trace( stack, base_dir )
   separator = File::SEPARATOR
@@ -66,8 +68,8 @@ Pry::Commands.block_command "sa", "Application stack trace" do
   filtered_stack_trace( caller, /./ )
 end
 
-_max_display_string_length = 50
-def pbcopy(input)
+def defandy(input)
+  _max_display_string_length = 50
   str = input.to_s
   IO.popen('pbcopy', 'w') { |f| f << str }
   truncated = str.length > _max_display_string_length ? str[0.._max_display_string_length] + '...' : str

.vimrc

@@ -259,6 +259,7 @@ nnoremap <Leader>sv :source $MYVIMRC<cr>
 nnoremap <silent> <Leader>so :source %<cr>:echo "Sourced this file!"<cr>
 
 " Quick file open shortcuts
+nnoremap <Leader>b :tabe ~/.bashrc<cr>
 nnoremap <Leader>v :tabe $MYVIMRC<cr>
 nnoremap <Leader>ss :tabe ~/.vim/delvarworld-snippets/javascript/javascript.snippets<cr>
 nnoremap <Leader>hs :tabe /etc/hosts<cr>:setlocal noreadonly<cr>:setlocal autoread<cr>
@@ -1489,9 +1490,9 @@ Project  '~/dev/jarvis'                   , 'jarvis'
 Project  '~/dev/devise-two-factor/demo'   , 'devise-two-factor-demo'
 Project  '~/workerbee/OpusWeb/mvp_webpack', 'bee site'
 Project  '~/rails-tutorial'               , 'rails tutorial'
+Project  '~/dev/onboarding-tech-notes'    , 'onboarding tech notes'
 Project  '~/closed-source-projects'       , 'closed source projects'
 
-
 "------------------------------------------------------------------------------
 " Script-runner (I don't really use this anymore)
 "------------------------------------------------------------------------------

code/keybindings.json

@@ -14,22 +14,29 @@
   { "key": "shift+alt+down",        "command": "editor.action.copyLinesDownAction",
   { "key": "shift+alt+up",        "command": "editor.action.copyLinesUpAction",
     "when": "editorTextFocus && !editorReadonly" },
-  { "key": "cmd+alt+up",          "command": "block-travel.selectUp",
-                                        "when": "editorTextFocus" },
-  { "key": "alt+down",              "command": "editor.action.moveLinesDownAction",
-    "when": "editorTextFocus && !editorReadonly" },
+  // { "key": "cmd+alt+up",          "command": "block-travel.selectUp",
+    //                                       "when": "editorTextFocus" },
+    // "when": "editorTextFocus && !editorReadonly" },
+  // { "key": "alt+down",              "command": "editor.action.moveLinesDownAction",
   { "key": "alt+up",                "command": "editor.action.moveLinesUpAction",
                                         "when": "editorTextFocus && !editorReadonly" },
-
+                                        
+  // I removed this plugin (cause it's bad?)
   // non-TERRIBLE defaults for this plugin. I tried cmd+] which feels more natural
   // but then selection (cmd+shift+[ conflicts with tab move)
-  { "key": "alt+[",           "command": "block-travel.jumpUp", "when": "editorTextFocus" },
-  { "key": "alt+]",           "command": "block-travel.jumpDown", "when": "editorTextFocus" },
+  // { "key": "alt+[",           "command": "block-travel.jumpUp", "when": "editorTextFocus" },
+  // { "key": "alt+]",           "command": "block-travel.jumpDown", "when": "editorTextFocus" },
 
-  { "key": "alt+shift+[",           "command": "block-travel.selectUp", "when": "editorTextFocus" },
-  { "key": "alt+shift+]",           "command": "block-travel.selectDown", "when": "editorTextFocus" },
+  // { "key": "alt+shift+[",           "command": "block-travel.selectUp", "when": "editorTextFocus" },
+  // { "key": "alt+shift+]",           "command": "block-travel.selectDown", "when": "editorTextFocus" },
 
   // terrible defaults for "rails run specs"
   { "key": "shift+cmd+t",           "command": "workbench.action.reopenClosedEditor" },
-  { "key": "cmd+k cmd+f",           "command": "extension.runFileSpecs" }
+  { "key": "cmd+k cmd+f",           "command": "extension.runFileSpecs" },
+  {
+    "key": "alt+cmd+n",
+    "command": "workbench.action.compareEditor.nextChange",
+    "when": "editorTextFocus"
+  }
 ]
+

code/settings.json

@@ -64,5 +64,17 @@
     "indentRainbow.error_color": "",
 
     "editor.renderWhitespace": "none",
+    "workbench.panel.location": "right",
+    "gitlens.advanced.messages": {
+        "suppressShowKeyBindingsNotice": true
+    },
+    "cSpell.userWords": [
+        "kase",
+        "kases",
+        "mixpanel"
+    ],
+    "window.title": "${activeEditorMedium}${separator}${rootName}",
+    "javascript.updateImportsOnFileMove.enabled": "always",
+    "typescript.updateImportsOnFileMove.enabled": "always",
     "workbench.panel.location": "bottom"
 }