Merge branch 'master' of ssh://gitlab.ahoskingit.com:9022/ahosking/dotfiles

run/.bashrc

@@ -13,7 +13,7 @@ if [ -d "$HOME/.dotfiles" ]; then
 elif [[ -n $CURRENT_SCRIPT && -x "$READLINK" ]]; then
   SCRIPT_PATH=$($READLINK -f "$CURRENT_SCRIPT")
   DOTFILES_DIR=$(dirname "$(dirname "$SCRIPT_PATH")")
-  echo $DOTFILES_DIR
+  #echo $DOTFILES_DIR
 else
   echo "Unable to find dotfiles, exiting."
   return # `exit 1` would quit the shell itself
@@ -173,3 +173,6 @@ log_bash_persistent_history
 
 ## Keyboard Mapping!!!
 setxkbmap dvorak
+export PYENV_ROOT="$HOME/.pyenv"
+export PATH="$PYENV_ROOT/bin:$PATH"
+eval "$(pyenv init -)"

system/.alias

@@ -23,3 +23,4 @@ alias git_clean='git fetch --all && git reset --hard origin/master'
 alias vpn_lyrical='cd /home/ahosking/lyrical/vpn &&sudo openvpn --config gw-udp-1194-ahosking-vpn.ovpn'
 
 alias roles_fetch='r10k puppetfile install --puppetfile Puppetfile --moduledir ../../roles/'
+alias roles_pull='for role in `ls ../../roles`; do echo "########" $role; echo `git -C ../../roles/$role pull`; done'