dotfiles

commit 6e2ee5d4dd9646cb60488b4cc82d61c129b7b6e3
parent e679a9313170dbcfbcc9d18eb4f868bafe1c2411
Author: Alex Balgavy <a.balgavy@gmail.com>
Date:   Fri, 30 Nov 2018 20:46:23 +0100

Path fixes

Diffstat:
M
shell/bash_profile
 | 
2
++
M
shell/commonprofile
 | 
3
+--
M
shell/zshrc
 | 
7
+++----

3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/shell/bash_profile b/shell/bash_profile
@@ -1 +1,3 @@
 source $HOME/.commonprofile
+PATH=$PATH:/opt/metasploit-framework/bin
+export PATH=$PATH:/opt/metasploit-framework/bin
diff --git a/shell/commonprofile b/shell/commonprofile
@@ -18,7 +18,7 @@ fi
 export CONF_DIR="$HOME/.dotfiles"
 
 # Where my music is located
-export MUSIC_DIR="$HOME/iTunes/iTunes Media/Music"
+export MUSIC_DIR="$HOME/Music/iTunes/iTunes Media/Music"
 
 export EDITOR="vim"
 export HOMEBREW_EDITOR="vim"
@@ -55,7 +55,6 @@ conf() {
       elif [ "$1" = 'common' ]; then
          vim ~/.commonprofile
       elif [ "$1" = 'reload' ]; then
-         source ~/.commonprofile
          if [[ $SHELL = *"zsh"* ]]; then
             START_TIME=$SECONDS
             source ~/.zshrc
diff --git a/shell/zshrc b/shell/zshrc
@@ -73,8 +73,6 @@ plugins=(
   python
   rails
   rake
-  rbenv
-  rvm
   sublime
   sudo
   vim-interaction
@@ -117,7 +115,6 @@ POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status root_indicator background_jobs histor
 
 # Aliases
 source ~/.commonprofile
-
 if [ -f ~/.config/exercism/exercism_completion.zsh ]; then
   source ~/.config/exercism/exercism_completion.zsh
 fi
@@ -126,4 +123,6 @@ fi
 . /usr/local/etc/profile.d/z.sh
 
 # rbenv init
-eval "$(rbenv init -)"
+if [[ $PATH != *"$HOME/.rbenv/shims"* ]]; then
+  eval "$(rbenv init -)"
+fi