Merge branch 'master' of ssh://git.monkeybox.org:2222/fdamstra/MyEnvironment

.bashrc

@@ -61,9 +61,11 @@ fi
 
 if [ "$color_prompt" = yes ]; then
     #PS1="\u@\h \[\033[32m\]\w\[\033[33m\]\$(parse_git_branch)\[\033[00m\] $ "
-    #PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\[\033[33m\]$(parse_git_branch)\[\033[00m\] \$ '
-    source /etc/bash_completion.d/docker-machine-prompt.bash
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\[\033[33m\]$(parse_git_branch)$(__docker_machine_ps1)\[\033[00m\] \$ '
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\[\033[33m\]$(parse_git_branch)\[\033[00m\] \$ '
+    if [[ -f /etc/bash_completion.d/docker-machine-prompt.bash ]]; then
+      source /etc/bash_completion.d/docker-machine-prompt.bash
+      PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\[\033[33m\]$(parse_git_branch)$(__docker_machine_ps1)\[\033[00m\] \$ '
+    fi
 
     # Also do color ls
     export CLICOLOR=true
@@ -249,6 +251,8 @@ export LSCOLORS="gxfxcxdxbxegedabagacad"
 # Disable bell for tab completion
 #bind 'set bell-style none'
 
+export EDITOR=vim
+
 echo ""
 echo "Reminder: Use command-shift-s to save your window arrangement, command-shift-r to restore."
 echo ""

.vimrc

@@ -125,6 +125,8 @@ au BufNewFile,BufRead *.js, *.html, *.css
 au BufNewFile,BufRead *.sls
     \ set filetype=sls
 
+au FileType gitcommit setlocal nowrap
+
 "au BufNewFile,BufRead *.hcl, *.tf
 "    \ set filetype=terraform
 
@@ -143,3 +145,5 @@ let g:syntastic_python_python_exec = 'python3'
 let g:syntastic_python_checkers = ['python']
 
 au BufRead * normal zR
+
+

README.md

@@ -2,3 +2,4 @@
 These are my environment scripts (bash, vim, etc).
 
 Also, my method of refreshing my skills on a couple things. Really, nothing to see here.
+