From 983356b054f3dd44e6d346860592d4e109d67d8d Mon Sep 17 00:00:00 2001
From: Steffen Rademacker <webgefrickel@gmail.com>
Date: Sun, 1 Mar 2015 16:47:26 +0100
Subject: [PATCH] less stuff to install

---
 install/_install.sh |  1 -
 install/brew.sh     | 17 ++++++++---------
 install/node.sh     |  4 ----
 install/ruby.sh     |  1 +
 vimrc               |  9 ++++++---
 zsh/aliases         |  1 +
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/install/_install.sh b/install/_install.sh
index 7b6cb2e..3aa8b99 100755
--- a/install/_install.sh
+++ b/install/_install.sh
@@ -28,7 +28,6 @@ brew install the_silver_searcher
 brew install wget
 brew install zsh
 
-brew cask install dropbox
 brew cask install forklift
 brew cask install iterm2
 
diff --git a/install/brew.sh b/install/brew.sh
index 0d71212..8a84909 100755
--- a/install/brew.sh
+++ b/install/brew.sh
@@ -8,18 +8,15 @@ brew install curl
 brew install docker
 brew install boot2docker
 brew install fasd
-brew install ffmpeg
-brew install ghostscript
 brew install git-extras
 brew install git-flow
 brew install httpd
-brew install imagemagick
 brew install markdown
 brew install mysql
-brew install php55
-brew install php55-mcrypt
-brew install php55-xdebug
-brew install php55-intl
+brew install php56
+brew install php56-mcrypt
+brew install php56-xdebug
+brew install php56-intl
 brew install composer
 brew install ssh-copy-id
 brew install unrar
@@ -30,8 +27,10 @@ brew cask install adium
 brew cask install alfred
 brew cask install amadeus-pro
 brew cask install bartender
+brew cask install betterzipql
 brew cask install carbon-copy-cloner
 brew cask install doxie
+brew cask install dropbox
 brew cask install firefox
 brew cask install flux
 brew cask install google-chrome
@@ -42,20 +41,20 @@ brew cask install istat-menus
 brew cask install karabiner
 brew cask install libreoffice
 brew cask install qlcolorcode
+brew cask install qlimagesize
 brew cask install qlmarkdown
 brew cask install qlstephen
 brew cask install quicklook-csv
 brew cask install quicklook-json
 brew cask install seil
 brew cask install sequel-pro
-brew cask install skype
 brew cask install slate
 brew cask install things
 brew cask install transmission
 brew cask install truecrypt
 brew cask install virtualbox
 brew cask install vlc
-brew cask install wedge
+brew cask install webpquicklook
 brew cask install xld
 
 # set some options for qlcolorcode
diff --git a/install/node.sh b/install/node.sh
index d94a616..5dcda32 100755
--- a/install/node.sh
+++ b/install/node.sh
@@ -7,7 +7,6 @@ brew unlink node
 brew link node
 curl -L https://npmjs.org/install.sh | sh
 
-npm install -g bower
 npm install -g browserify
 npm install -g dploy
 npm install -g eslint
@@ -17,6 +16,3 @@ npm install -g gulp
 npm install -g jsonlint
 npm install -g npm-check-updates
 npm install -g recursive-blame
-npm install -g stylestats
-npm install -g svgo
-npm install -g vtop
diff --git a/install/ruby.sh b/install/ruby.sh
index ca844ea..e516aed 100755
--- a/install/ruby.sh
+++ b/install/ruby.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+rbenv instal 2.2.0
 gem install bundler --no-document
 gem install capistrano --no-document
 gem install compass --no-document
diff --git a/vimrc b/vimrc
index b437054..e35ab27 100644
--- a/vimrc
+++ b/vimrc
@@ -261,6 +261,9 @@ nnoremap k gk
 " behave - yank just like D and C
 nnoremap Y y$
 
+" auto-yanking with clipper for selected yanking, see leader-y mapping
+vnoremap y y :call system('nc localhost 8377', @0)<cr>
+
 " Search mappings: These will make it so that going to the next one in a
 " search will center on the line it's found in.
 nnoremap N Nzz
@@ -417,13 +420,13 @@ smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
 " no checking for xhtml/html -- because of fluidtemplate for TYPO3
 " and no checking for scss.css because of CSS3 and SASS-Variable
 let g:syntastic_auto_jump = 0
-let g:syntastic_scss_checkers = ['scss_lint']
+" let g:syntastic_scss_checkers = ['scss_lint']
 let g:syntastic_javascript_checkers = ['eslint']
 let g:syntastic_json_checkers = ['jsonlint']
 let g:syntastic_mode_map = {
       \ 'mode': 'active',
-      \ 'active_filetypes': ['php', 'javascript', 'scss', 'json'],
-      \ 'passive_filetypes': ['xhtml', 'html']
+      \ 'active_filetypes': ['php', 'javascript', 'json'],
+      \ 'passive_filetypes': ['xhtml', 'html', 'scss']
       \ }
 
 
diff --git a/zsh/aliases b/zsh/aliases
index a06c57d..71e1151 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -43,6 +43,7 @@ alias l='gls -al --color=auto'
 # Gitty gitgit
 alias g="git"
 alias gf="git-flow"
+alias gs="git status"
 alias gst="git status"
 alias ggpl='git pull origin $(current_branch)'
 alias ggps='git push origin $(current_branch)'