Modernize and fix broken dotfiles configuration

aliases

@@ -13,7 +13,7 @@ alias RTM="RAILS_ENV=test be rake db:migrate"
 alias RDM="RAILS_ENV=development be rake db:migrate"
 
 # Other
-alias bashme="atom ~/code/dotfiles"
+alias bashme="subl ~/code/dotfiles"
 alias rm="rm -i -v"
 alias reload!="source ~/.bash_profile"
 alias be="bundle exec"

bash_profile

@@ -6,9 +6,7 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "/usr/local/opt/nvm/etc/bash_completion.d/nvm" ] && . "/usr/local/opt/nvm/etc/bash_completion.d/nvm"  # This loads nvm bash_completion
 export BASH_SILENCE_DEPRECATION_WARNING=1
 export PATH=$PATH:/usr/local/sbin
-export PATH="$PATH:/usr/local/opt/node@6/bin"
-
-export EDITOR="atom -nw"
+export EDITOR="subl -w"
 
 # initialize rbenv
 if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi

gitconfig

@@ -11,11 +11,6 @@
 [color]
   ui = always
 
-[filter "media"]
-  required = true
-  clean = git media clean %f
-  smudge = git media smudge %f
-
 [credential]
   helper = osxkeychain
 

homebrew_install.sh

@@ -6,16 +6,20 @@
 if test ! $(which brew)
 then
   echo "Installing Homebrew for you."
-  ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+  /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 fi
 
 echo "***************************************************************************************************"
 echo "Installng packages:"
 echo "***************************************************************************************************"
 
-brew install brew-cask geoip libevent mongodb node phantomjs rabbitmq readline ruby-build wget autoconf \
-             elasticsearch git memcached mysql openssl pkg-config rbenv redis htop-osx ffmpeg cowsay \
-             diff-so-fancy wget elixir
+# Note: mongodb and elasticsearch require additional taps — install separately if needed:
+#   brew tap mongodb/brew && brew install mongodb-community
+#   brew tap elastic/tap && brew install elastic/tap/elasticsearch-full
+
+brew install geoip libevent node rabbitmq readline ruby-build wget autoconf \
+             git memcached mysql openssl pkg-config rbenv redis mactop ffmpeg cowsay \
+             diff-so-fancy elixir
 
 echo "***************************************************************************************************"
 echo "Complete!"

welcome.sh

@@ -1,24 +1,26 @@
 #!/bin/bash
-bash homebrew_install.sh && bash preferences.sh
+DOTFILES_DIR="$(cd "$(dirname "$0")" && pwd)"
+
+bash "$DOTFILES_DIR/homebrew_install.sh" && bash "$DOTFILES_DIR/preferences.sh"
 
 # Symlink dotfiles
 [ -f ~/.bash_profile ] && rm -i ~/.bash_profile || echo "Creating .bash_profile"
-ln -s ~/code/dotfiles/bash_profile ~/.bash_profile
+ln -s "$DOTFILES_DIR/bash_profile" ~/.bash_profile
 
-[ -f ~/.git_completion.bash ] && rm -i ~/.git_completion.bash || echo "Creating .git_completion.bash"
-ln -s ~/code/dotfiles/git-completion ~/.git-completion.bash
+[ -f ~/.git-completion.bash ] && rm -i ~/.git-completion.bash || echo "Creating .git-completion.bash"
+ln -s "$DOTFILES_DIR/git-completion" ~/.git-completion.bash
 
-[ -f ~/.gitconfig.bash ] && rm -i ~/.gitconfig.bash || echo "Creating .gitconfig"
-ln -s ~/code/dotfiles/gitconfig ~/.gitconfig
+[ -f ~/.gitconfig ] && rm -i ~/.gitconfig || echo "Creating .gitconfig"
+ln -s "$DOTFILES_DIR/gitconfig" ~/.gitconfig
 
 [ -f ~/.gitignore ] && rm -i ~/.gitignore || echo "Creating .gitignore"
-ln -s ~/code/dotfiles/gitignore ~/.gitignore
+ln -s "$DOTFILES_DIR/gitignore" ~/.gitignore
 
-[ -f ~/.irbrc.bash ] && rm -i ~/.irbrc.bash || echo "Creating .irbrc"
-ln -s ~/code/dotfiles/irbrc ~/.irbrc
+[ -f ~/.irbrc ] && rm -i ~/.irbrc || echo "Creating .irbrc"
+ln -s "$DOTFILES_DIR/irbrc" ~/.irbrc
 
 [ -f ~/.aliases.bash ] && rm -i ~/.aliases.bash || echo "Creating .aliases"
-ln -s ~/code/dotfiles/aliases ~/.aliases.bash
+ln -s "$DOTFILES_DIR/aliases" ~/.aliases.bash
 
 echo "***************************"
 echo "All done!"