Merge beaner:.dotfiles

bashrc

@@ -23,6 +23,7 @@ fi
 export JAVA_FONTS=/usr/share/fonts/TTF
 export ANDROID_HOME=/opt/android-sdk
 export GOPATH=$HOME/.go
+export PATH=$GOPATH/bin:$PATH
 export XDG_CONFIG_HOME=$HOME/.config
 export ARDUINO=/usr/share/arduino
 export ARDUINO_DIR=$ARDUINO
@@ -105,7 +106,7 @@ export PS4="- "
 
 # CUSTOM SCRIPTS
 
-export PATH="$HOME/.scripts/:$PATH"
+export PATH="$HOME/.bin/:$HOME/.scripts/:$PATH"
 [ -f ~/.gscripts/gprofile ] && source ~/.gscripts/gprofile
 
 # UTILITIES
@@ -118,7 +119,7 @@ function fuck {
     if which thefuck &> /dev/null
     then
         eval $(thefuck --alias)
-        fuck
+        fuck $@
     else
         echo "thefuck is not installed on this system."
     fi
@@ -127,12 +128,12 @@ alias FUCK='fuck'
 
 # Node Version Manager
 function nvm {
+    export NVM_DIR="$HOME/.nvm"
     if [ -s "$NVM_DIR/nvm.sh" ]
     then
         . "$NVM_DIR/nvm.sh"
         [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
-        export NVM_DIR="$HOME/.nvm"
-        nvm
+        nvm $@
     else
         echo "NVM is not installed on this system."
     fi