From e229d8cfee8b698b636faf0f9a748049fc73adbf Mon Sep 17 00:00:00 2001 From: Josh Sherman Date: Sat, 14 Dec 2013 15:36:03 -0500 Subject: [PATCH] Cleaning up more stuff --- git/gitconfig | 2 +- private | 2 +- setup | 78 ++++++++++++++++++++++----------------------------- vim/vimrc | 3 +- 4 files changed, 37 insertions(+), 48 deletions(-) mode change 100755 => 100644 setup diff --git a/git/gitconfig b/git/gitconfig index 2a230d2..c1abfd5 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -9,7 +9,7 @@ color = true [core] - editor = /usr/bin/vim + editor = vim [color] branch = auto diff --git a/private b/private index 424e867..bc06a5d 160000 --- a/private +++ b/private @@ -1 +1 @@ -Subproject commit 424e867e4736744544899ea5b0670af099cbff98 +Subproject commit bc06a5d4d3f2b38db902ca22f0bf8963c0214433 diff --git a/setup b/setup old mode 100755 new mode 100644 index 5139e72..556b77b --- a/setup +++ b/setup @@ -32,58 +32,55 @@ then fi # Gets our `brew` on - brew install bash-completion git htop imagemagick imagesnap macvim memcached multitail mysql nginx nmap redis ssh-copy-id wget flex_sdk postgresql p7zip node + brew install bash-completion git htop imagemagick imagesnap vim macvim \ + memcached multitail mysql nginx nmap redis ssh-copy-id wget \ + p7zip node npm # Allows htop to show all processes - sudo chown root:wheel /usr/local/Cellar/htop-osx/0.8.2/bin/htop - sudo chmod u+s /usr/local/Cellar/htop-osx/0.8.2/bin/htop + # TODO Need to find a better way to run these that sniffs the current version + sudo chown root:wheel /usr/local/Cellar/htop-osx/0.8.2.2/bin/htop + sudo chmod u+s /usr/local/Cellar/htop-osx/0.8.2.2/bin/htop + # TODO Establish some conditionals so this isn't run all the time # # Initializes databases # mysql_install_db --verbose --user=`whoami` --basedir="$(brew --prefix mysql)" --datadir=/usr/local/var/mysql --tmpdir=/tmp - # initdb /usr/local/var/postgres - # # Sets up our LaunchAgent # launchctl unload -w ~/Library/LaunchAgents/homebrew.mxcl.memcached.plist # cp /usr/local/Cellar/memcached/1.4.15/homebrew.mxcl.memcached.plist ~/Library/LaunchAgents/ # launchctl load -w ~/Library/LaunchAgents/homebrew.mxcl.memcached.plist - # + # # launchctl unload -w ~/Library/LaunchAgents/homebrew.mxcl.redis.plist # cp /usr/local/Cellar/redis/2.4.17/homebrew.mxcl.redis.plist ~/Library/LaunchAgents/ # launchctl load -w ~/Library/LaunchAgents/homebrew.mxcl.redis.plist - # + # # launchctl unload -w ~/Library/LaunchAgents/homebrew.mxcl.postgresql.plist # cp /usr/local/Cellar/postgresql/9.2.1/homebrew.mxcl.postgresql.plist ~/Library/LaunchAgents/ # launchctl load -w ~/Library/LaunchAgents/homebrew.mxcl.postgresql.plist - # + # # # `brew`s up some PHP 5.3 # brew tap homebrew/dupes # brew tap josegonzalez/homebrew-php - # + # # # Backs up the stock OSX version of PHP # if [ ! -f /usr/libexec/apache2/libphp5.so.orig ]; # then # sudo mv /usr/libexec/apache2/libphp5.so /usr/libexec/apache2/libphp5.so.orig # fi - # + # # brew remove php53 # rm ~/.pearrc # launchctl unload -w ~/Library/LaunchAgents/homebrew-php.josegonzalez.php53.plist # rm ~/Library/LaunchAgents/homebrew-php.josegonzalez.php53.plist - # - # # Installs PHP as an Apache module - # brew install php53 --with-mysql --with-suhosin - # sudo cp /usr/local/Cellar/php53/5.3.16/libexec/apache2/libphp5.so /usr/libexec/apache2/libphp5.so - # brew remove php53 - # + # # # Installs PHP for Nginx (via FPM) - # brew install php53 --with-fpm --with-mysql --with-pgsql --with-suhosin + # brew install php53 --with-fpm --with-mysql --with-suhosin # cp /usr/local/Cellar/php53/5.3.16/homebrew-php.josegonzalez.php53.plist ~/Library/LaunchAgents/ # launchctl load -w ~/Library/LaunchAgents/homebrew-php.josegonzalez.php53.plist - # + # # # Gets PHP how we like it # brew install php53-imagick php53-mcrypt php53-memcache php53-xdebug --with-homebrew-php - # + # # # Adds some PEAR to the recipe # pear update-channels # sudo pear upgrade-all @@ -97,36 +94,27 @@ then #brew linkapps # Installs git hooks - sudo ln -s $PWD/git/hooks/post-commit /usr/local/share/git-core/templates/hooks/post-commit + sudo ln -s $PWD/git/hooks/post-commit \ + /usr/local/share/git-core/templates/hooks/post-commit - # Installs some gems - sudo gem install localtunnel terminal-notifier + # Go mining for some gems + sudo gem install terminal-notifier sass - # Installs NPM & LESS (with CLI lessc) - curl https://npmjs.org/install.sh | sh - npm install -g less - - # Installs SASS - sudo gem install sass + # Installs LESS (with CLI lessc) + npm install -g less@1.3 else - sudo apt-get install zsh + sudo apt-get install python-software-properties zsh chsh -s /bin/zsh josh - # Gives us access to `add-apt-repository` - sudo apt-get install python-software-properties + # Adds PPA to get nginx to a more recent stable release + sudo add-apt-repository ppa:nginx/stable && apt-get update - # # Adds the PostgreSQL repository so we can install 9.2 - # sudo add-apt-repository ppa:pitti/postgresql - # - # # Updates the package list - # sudo apt-get update - # - # # Purges PostgreSQL 9.1 just in case - # # Seems this tries to remove 9.2 as well, leaving in just in case I need to run it - # # sudo apt-get --purge remove postgresql postgresql-9.1 postgresql-client-9.1 postgresql-client-common postgresql-common postgresql-doc postgresql-doc-9.1 - # - # # Installs CLI apps - # sudo apt-get install vim ssh multitail htop iotop git-core ruby1.8-dev nginx php5 php5-cgi php5-cli php-pear php5-suhosin php5-fpm redis-server memcached php5-memcache php5-memcached php5-gd php5-curl php5-imagick php5-pgsql exim4-daemon-light postgresql-9.2 + # Installs CLI apps + sudo apt-get install vim ssh multitail htop iotop git-core ruby1.8-dev \ + nginx php5 php5-cgi php5-cli php-pear php5-suhosin \ + php5-fpm php5-dev redis-server memcached \ + php5-memcache php5-memcached php5-gd php5-curl \ + php5-imagick exim4-daemon-light fi # Links .vimrc @@ -172,6 +160,8 @@ fi ln -s $DOTFILES/zsh/zshrc ~/.zshrc +# TODO Move away from submodule and add logic to only do this if it's me +# Perhaps only run this is the dotfiles-private directory is avail # Links .zshrc-private if [ -e ~/.zshrc-private ] || [ -h ~/.zshrc-private ]; then @@ -183,4 +173,4 @@ then ln -s $DOTFILES/private/zsh/zshrc ~/.zshrc-private fi -echo; echo "SETUP COMPLETE!!~!" +echo; echo 'WE’RE GOLDEN!' diff --git a/vim/vimrc b/vim/vimrc index e0e30dc..267d67e 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -8,7 +8,7 @@ call vundle#rc() Bundle 'gmarik/vundle' Bundle 'scrooloose/nerdtree' -Bundle 'msanders/snipmate.vim' +"Bundle 'msanders/snipmate.vim' Bundle 'ervandew/supertab' Bundle 'scrooloose/syntastic' Bundle 'tpope/vim-fugitive' @@ -18,7 +18,6 @@ Bundle 'bvemu.vim' Bundle 'random.vim' Bundle 'Command-T' -"Bundle 'Flex-Development-Support' Bundle 'SearchComplete' filetype plugin indent on " Also required by Vundle