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

Author: AndrewRayCode

.bashrc

@@ -91,11 +91,6 @@ function ddiff() {
     git diff `git merge-base upstream/dev HEAD`..HEAD
 }
 
-# Log of everything on this braynch
-function dlog() {
-    git log -p `git merge-base origin/master HEAD`..HEAD
-}
-
 function recent-branches() {
     local branches=`git for-each-ref --sort=-committerdate refs/heads/ | head -n 10`
     local output=''
@@ -270,6 +265,13 @@ if [ -f ~/.git-completion.bash ]; then
   . ~/.git-completion.bash
 fi
 
+# Docker logs for conatiner with name
+dlog() {
+    local cid=`docker ps | grep $1 | awk '{print $1}'`
+    echo "docker logs -f ${cid}"
+    docker logs -f ${cid}
+}
+
 alias here='open .'
 
 # ln -s /Applications/MacVim.app/Contents/bin/mvim /usr/local/bin/mvim
@@ -1189,5 +1191,8 @@ pathadd /Users/aray/miniconda3/bin:$PATH
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
 
 # For docker builds
-export GITHUB_PRIVATE_KEY="$(cat /Users/aray/.ssh/docker_gr_rsa)"
+DOCKER_KEY="${HOME}/.ssh/docker_gr_rsa"
+if [ -a "$DOCKER_KEY" ]; then
+    export GITHUB_PRIVATE_KEY="$(cat $DOCKER_KEY)"
+fi
 

.haskeline

@@ -0,0 +1 @@
+editMode: Vi

.vimrc

@@ -489,6 +489,7 @@ function! TextEnableCodeSnip(filetype,start,end,textSnipHl) abort
 endfunction
 
 call TextEnableCodeSnip('ruby', '@begin=ruby@', '@end=ruby@', 'SpecialComment')
+call TextEnableCodeSnip('glsl', '@begin=glsl@', '@end=glsl@', 'SpecialComment')
 
 
 "------------------------------------------------------------------------------
@@ -1046,7 +1047,7 @@ augroup END
 " =============================================================================
 
 
-let g:markdown_fenced_languages = ['html', 'python', 'bash=sh', 'json', 'javascript', 'ruby']
+let g:markdown_fenced_languages = ['html', 'python', 'bash=sh', 'json', 'javascript', 'ruby', 'glsl']
 
 " To refresh the list of plugins installed, uncomment the line below and hit
 " command-E on it (see the <d-e> mapping in this file