diff --git a/.bashrc b/.bashrc
index d8585d1..5eac197 100644
--- a/.bashrc
+++ b/.bashrc
@@ -70,15 +70,20 @@ export EDITOR=vim
 export BROWSER=google-chrome
 export PAGER='less -R -F -X -S -n -i -m'
 
-export GOPATH=~/src/go
-export GOROOT=~/pkg/go
-export PATH="$HOME/bin:$PATH:$GOROOT/bin:$GOPATH/bin:$HOME/.npm/bin:$HOME/.local/bin"
-if [ -d $HOME/.gem/ruby ]; then
-	export PATH="$PATH:$(echo $HOME/.gem/ruby/*/bin | tr ' ' :)"
+export GOPATH="$HOME/src/go"
+export GOROOT="$HOME/pkg/go"
+
+export PATH="$HOME/bin:$PATH"
+if [ -d "$HOME/.gem/ruby" ]; then
+	PATH+=":$(echo $HOME/.gem/ruby/*/bin | tr ' ' :)"
 fi
-if [ -d $HOME/Android/Sdk ]; then
-	export PATH="$PATH:$HOME/Android/Sdk/tools:$HOME/Android/Sdk/platform-tools"
+if [ -d "$HOME/Android/Sdk" ]; then
+	PATH+=":$HOME/Android/Sdk/tools:$HOME/Android/Sdk/platform-tools"
 fi
+for extras in "$GOROOT/bin" "$GOPATH/bin" "$HOME/.local/bin" "$HOME/.npm/bin" "$HOME/.pub-cache/bin" /usr/lib/dart/bin; do
+	[ -d "$extras" ] && PATH+=":$extras"
+done
+
 export DOOMWADDIR=~/dist/games/doom/wad
 export DE=generic
 export CLICOLOR=1