From fbf3480482cb8fb3cb5115e1d1d88e503b286294 Mon Sep 17 00:00:00 2001
From: Steffen Becker <webgefrickel@gmail.com>
Date: Tue, 14 Jan 2014 14:39:40 +0100
Subject: [PATCH] lots of changes and fixes for npm, quicklook etc

---
 install/_install.sh |  3 ++-
 install/brew.sh     |  9 ++++++++-
 install/node.sh     | 25 ++++++++++++++++++-------
 slate.js            | 17 ++++++++---------
 tmux.conf           | 19 ++++++++-----------
 vimrc               | 26 +++++---------------------
 zshrc               |  1 -
 7 files changed, 49 insertions(+), 51 deletions(-)

diff --git a/install/_install.sh b/install/_install.sh
index d15afc5..4dce6c7 100755
--- a/install/_install.sh
+++ b/install/_install.sh
@@ -10,6 +10,7 @@ brew doctor
 
 # tap the casks
 brew tap phinze/homebrew-cask
+brew tap caskroom/versions
 
 # brew paths
 export HOMEBREW_CASK_OPTS="--appdir=/Applications"
@@ -23,7 +24,7 @@ brew install brew-cask
 brew install coreutils
 
 brew cask install forklift
-brew cask install iterm2
+brew cask install iterm2-beta
 brew cask install dropbox
 
 # set zsh to the default
diff --git a/install/brew.sh b/install/brew.sh
index fe5c7cf..3b2b8dc 100755
--- a/install/brew.sh
+++ b/install/brew.sh
@@ -45,13 +45,13 @@ brew cask install istat-menus
 brew cask install keyremap4macbook
 brew cask install libreoffice
 brew cask install miro-video-converter
+brew cask install openemu
 brew cask install opera
 brew cask install pckeyboardhack
 brew cask install sequel-pro
 brew cask install simple-comic
 brew cask install skype
 brew cask install slate
-brew cask install sourcetree
 brew cask install things
 brew cask install transmission
 brew cask install truecrypt
@@ -68,6 +68,13 @@ brew cask install qlmarkdown
 brew cask install quicklook-json
 brew cask install quicklook-csv
 brew cask install betterzipql
+
+# set some options for qlcolorcode
+defaults write org.n8gray.QLColorCode font Menlo
+defaults write org.n8gray.QLColorCode fontSizePoints 8
+# maybe you have to copy solarized-dark into the caskroom to use it
+# have a look a the most current github repo for qlcolorcode
+defaults write org.n8gray.QLColorCode hlTheme solarized-dark
 qlmanage -r
 
 # the rest -> appstore or adobe or others :-)
diff --git a/install/node.sh b/install/node.sh
index f5bb604..deadf47 100755
--- a/install/node.sh
+++ b/install/node.sh
@@ -1,16 +1,27 @@
 #!/usr/bin/env zsh
 
+brew uninstall node
 brew update
-brew upgrade node
-brew link --overwrite node
+brew install node --without-npm
+brew unlink node
+brew link node
+curl https://npmjs.org/install.sh | sh
+
+# set npm to use npm_lazy
+npm install -g npm_lazy
+npm config set registry http://localhost:8080/
+grepkill npm_lazy
+npm_lazy &
+
+npm install -g bower
+npm install -g dploy
+npm install -g generator-generator
 npm install -g grunt-cli
-npm install -g npm-check-updates
-npm install -g jshint
-npm install -g uglify-js
 npm install -g jake
 npm install -g js-beautify
+npm install -g jshint
 npm install -g jsonlint
+npm install -g npm-check-updates
 npm install -g recursive-blame
-npm install -g bower
+npm install -g uglify-js
 npm install -g yo
-npm install -g generator-generator
diff --git a/slate.js b/slate.js
index e4f9a7b..444dee7 100644
--- a/slate.js
+++ b/slate.js
@@ -42,16 +42,16 @@ var grid = slate.operation('grid', {
   'padding': 10,
   'grids': {
     '0': {
-      'width': 12,
-      'height': 8
+      'width': 6,
+      'height': 2
     },
     '1': {
-      'width': 12,
-      'height': 8
+      'width': 6,
+      'height': 2
     },
     '2': {
-      'width': 12,
-      'height': 8
+      'width': 6,
+      'height': 2
     }
   }
 });
@@ -62,8 +62,7 @@ var iterm = slate.operation('focus', { 'app': 'iTerm' });
 var chrome = slate.operation('focus', { 'app': 'Google Chrome' });
 var mail = slate.operation('focus', { 'app': 'Mail' });
 var fork = slate.operation('focus', { 'app': 'ForkLift' });
-var ical = slate.operation('focus', { 'app': 'iCal' });
-var fox = slate.operation('focus', { 'app': 'Firefox' });
+var things = slate.operation('focus', { 'app': 'Things' });
 
 
 var fullscreen = slate.operation('move', {
@@ -144,7 +143,7 @@ slate.bind('q' + hyper, iterm, false);
 slate.bind('w' + hyper, chrome, false);
 slate.bind('e' + hyper, mail, false);
 slate.bind('r' + hyper, fork, false);
-slate.bind('t' + hyper, ical, false);
+slate.bind('t' + hyper, things, false);
 
 // movements in modal mode with m
 slate.bind('h' + hyperModal, lefthalf, false);
diff --git a/tmux.conf b/tmux.conf
index 2589816..fcde26a 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -15,6 +15,9 @@ set-option -g default-command "reattach-to-user-namespace -l zsh"
 # Fix for sending keys to Vim
 setw -g xterm-keys on
 
+# set esc-timeout to 50ms (better vim)
+set -sg escape-time 50
+
 # use vim motions :-)
 setw -g mode-keys vi
 
@@ -33,16 +36,6 @@ bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy"
 unbind -t vi-copy Enter
 bind-key -t vi-copy Enter copy-pipe "reattach-to-user-namespace pbcopy"
 
-
-
-# Fix for sending keys to Vim
-setw -g xterm-keys on
-# set esc-timeout to 50ms (better vim)
-set -sg escape-time 50
-
-
-
-
 # Force a reload of te config file
 unbind-key r
 bind-key r source-file ~/.tmux.conf \; display-message "Configuration reloaded!"
@@ -59,6 +52,10 @@ unbind-key -n C-k
 unbind-key -n C-h
 unbind-key -n C-l
 
+# unbind ctrl-left + ctrl-right -- we use this in vim only
+unbind-key -n C-Left
+unbind-key -n C-Right
+
 bind-key -r C-j resize-pane -D
 bind-key -r C-k resize-pane -U
 bind-key -r C-h resize-pane -L
@@ -86,7 +83,7 @@ set -g display-time 2000
 
 
 # statusbar colors solarized dark
-set-option -g status-bg black 
+set-option -g status-bg black
 set-option -g status-fg yellow
 set-option -g status-attr default
 set-window-option -g window-status-fg brightblue
diff --git a/vimrc b/vimrc
index 2b2045a..a851bc2 100644
--- a/vimrc
+++ b/vimrc
@@ -19,7 +19,6 @@ Bundle 'chrisbra/NrrwRgn'
 Bundle 'editorconfig/editorconfig-vim'
 Bundle 'edsono/vim-matchit'
 Bundle 'ervandew/supertab'
-Bundle 'gavinbeatty/dragvisuals.vim'
 Bundle 'godlygeek/tabular'
 Bundle 'justinmk/vim-sneak'
 Bundle 'kien/ctrlp.vim'
@@ -246,17 +245,11 @@ nnoremap <down> :blast<cr>
 nnoremap <left> :bp<cr>
 nnoremap <right> :bn<cr>
 
-" Bubble lines using unimpaired
-nmap <C-up> [e
-nmap <C-down> ]e
-vmap <C-up> [egv
-vmap <C-down> ]egv
-
-" in/outdent Keymappings
-nmap <C-left> <<
-nmap <C-right> >>
-vmap <C-left> <gv
-vmap <C-right> >gv
+" Bubble/indent lines using unimpaired
+nmap <C-k> [e
+nmap <C-j> ]e
+nmap <C-h> <<
+nmap <C-l> >>
 
 " Yank text to the OS X clipboard
 noremap <leader>y "*y
@@ -318,15 +311,6 @@ nnoremap <silent> <leader>gp :Git push<CR><C-w>20+
 nnoremap <silent> <leader>gw :Gwrite<CR><C-w>20+
 
 
-" use visual line/block bubbling with dragvisuals
-vmap <expr> <C-h> DVB_Drag('left')
-vmap <expr> <C-l> DVB_Drag('right')
-vmap <expr> <C-j> DVB_Drag('down')
-vmap <expr> <C-k> DVB_Drag('up')
-vmap <expr> <C-d> DVB_Duplicate()
-let g:DVB_TrimWS = 1
-
-
 " Undotree
 nnoremap <F3> :UndotreeToggle<cr>
 
diff --git a/zshrc b/zshrc
index 8b38278..2f3103d 100644
--- a/zshrc
+++ b/zshrc
@@ -61,7 +61,6 @@ setopt long_list_jobs
 source $HOME/dotfiles/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 source $HOME/dotfiles/zsh/forklift/forklift.plugin.zsh
 
-
 # load tmuxifier
 eval "$(tmuxifier init -)"