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

Author: AndrewRayCode

.bashrc

@@ -944,7 +944,7 @@ if [ -d "$GR_HOME" ]; then
     pathadd "${GR_HOME}/engineering/bin"
 
     # default to aws env
-    aws-environment || aws-environment development
+    aws-environment > /dev/null || aws-environment development -l
 
     # allow for pivotal prme command
     tracker-environment
@@ -1034,6 +1034,7 @@ function jgrep() {
 }
 
 if type "bat" > /dev/null 2>&1; then
+    alias ccat='/bin/cat'
     alias cat='bat --theme=TwoDark'
 else
     echo 'bat not found'
@@ -1145,5 +1146,16 @@ if [ -d "$CHRUBY_PATH" ]; then
     chruby 2.5.1
 fi
 
+MINI_CONDA_PATH="${HOME}/miniconda3/bin"
+if [ -d "$MINI_CONDA_PATH" ]; then
+  pathadd "$MINI_CONDA_PATH"
+fi
+
+pathadd /Users/aray/miniconda3/bin:$PATH
+
 # loads nvm bash_completion
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+
+# For docker builds
+export GITHUB_PRIVATE_KEY="$(cat /Users/aray/.ssh/docker_gr_rsa)"
+

.gvimrc

@@ -0,0 +1,3 @@
+" Fix for bug https://github.com/macvim-dev/macvim/issues/806#issuecomment-446551760
+macm Edit.Find.Use\ Selection\ for\ Find key=<nop>
+

.vimrc

@@ -32,6 +32,8 @@ highlight ColorColumn guibg=#331111
 set colorcolumn=80
 set cursorline
 
+set novisualbell
+
 " Make the cursor a thin line (not a block) and color it differently in insert
 " and normal mode. Makes it WAY easier to see where the cursor is. This is the
 " most important thing in this file
@@ -298,6 +300,7 @@ nnoremap <Leader>rs vi{:sort<cr>
 " trim trailing whitespace
 noremap <Leader>sw :let _s=@/<Bar>:%s/\s\+$//e<Bar>:let @/=_s<Bar>:nohl<CR>
 
+" See ~/.gvimrc
 " Execute VIM colon command under cursor with <⌘-e>
 nnoremap <D-e> yy:<C-r>"<backspace><cr>
 

code/settings.json

@@ -20,24 +20,23 @@
     "workbench.colorTheme": "rainbow",
     "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",
-    "breadcrumbs.enabled": true,
-    "editor.formatOnSave": true,
-    "editor.tabSize": 2,
-    "editor.tabCompletion": true,
-    "editor.snippetSuggestions": "top",
-    "terminal.integrated.rendererType": "dom"
+  "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",
+  "breadcrumbs.enabled": true,
+  "editor.formatOnSave": true,
+  "editor.tabSize": 2,
+  "editor.tabCompletion": true,
+  "editor.snippetSuggestions": "top",
+  "terminal.integrated.rendererType": "dom",
+  "editor.tokenColorCustomizations": {
+    "comments": "#d152ff"
+  }
 }