Tweakin' and twerkin'

vim/vimrc

@@ -33,6 +33,7 @@ set showmatch
 set smartcase
 set smartindent
 set so=7
+set softtabstop=2
 set t_Co=256
 set tabstop=2
 set textwidth=0
@@ -53,20 +54,24 @@ Bundle 'gmarik/vundle'
 Bundle 'AfterColors.vim'
 Bundle 'bling/vim-airline'
 Bundle 'bling/vim-bufferline'
+Bundle 'cakebaker/scss-syntax.vim'
 Bundle 'ervandew/supertab'
 "Bundle 'garbas/vim-snipmate'
-"Bundle 'groenewege/vim-less'
+Bundle 'groenewege/vim-less'
 "Bundle 'joshtronic/php.vim'
 "Bundle 'jQuery'
 Bundle 'kien/ctrlp.vim'
+Bundle 'hail2u/vim-css3-syntax'
 "Bundle 'majutsushi/tagbar'
 "Bundle 'MarcWeber/vim-addon-mw-utils'
+Bundle 'mustache/vim-mustache-handlebars'
 Bundle 'nanotech/jellybeans.vim'
 "Bundle 'nathanaelkane/vim-indent-guides'
 "Bundle 'nginx.vim'
 "Bundle 'othree/html5.vim'
 Bundle 'pangloss/vim-javascript.git'
 "Bundle 'rstacruz/sparkup', {'rtp': 'vim/'}
+"Bundle 'skammer/vim-css-color'
 "Bundle 'scrooloose/syntastic'
 "Bundle 'shawncplus/phpcomplete.vim'
 "Bundle 'SearchComplete'
@@ -106,7 +111,6 @@ let g:airline_section_c = '%t'
 let g:airline_theme_patch_func = 'AirlineThemePatch'
 let g:airline#extensions#tabline#enabled = 1
 let g:airline#extensions#tabline#fnamemod = ':t'
-let g:airline#extensions#tabline#show_buffers = 0
 let g:airline#extensions#tabline#show_tab_nr = 0
 let g:indent_guides_start_level = 2
 let g:indent_guides_guide_size = 1
@@ -114,11 +118,11 @@ let g:indent_guides_guide_size = 1
 nmap <silent> ,/ :nohlsearch<CR>
 nnoremap ; :
 
-" nnoremap <Leader>[ :tabprevious<CR>
-" nnoremap <Leader>] :tabnext<CR>
-" 
-" nnoremap <Leader>{ :tabfirst<CR>
-" nnoremap <Leader>} :tablast<CR>
+nnoremap <Leader>[ :prev<CR>
+nnoremap <Leader>] :next<CR>
+
+nnoremap <Leader>{ :first<CR>
+nnoremap <Leader>} :last<CR>
 
 nnoremap <Leader>f :set nolist<CR>
 nnoremap <Leader>F :set list<CR>
@@ -139,7 +143,7 @@ nnoremap <Leader>tt /\t$<CR>
 syntax on
 syntax sync fromstart
 
-" vnoremap * :<C-u>call <SID>VSetSearch()<CR>//<CR>
+vnoremap * :<C-u>call <SID>VSetSearch()<CR>//<CR>
 " vnoremap # :<C-u>call <SID>VSetSearch()<CR>??<CR>
 
 " Jumps to last cursor position except on commit messages
@@ -154,12 +158,12 @@ function! SetCursorPosition()
 endfunction
 
 " Search for selected text
-" function! s:VSetSearch()
-" 	let temp = @@
-" 	norm! gvy
-" 	let @/ = '\V' . substitute(escape(@@, '\'), '\n', '\\n', 'g')
-" 	let @@ = temp
-" endfunction
+function! s:VSetSearch()
+  let temp = @@
+  norm! gvy
+  let @/ = '\V' . substitute(escape(@@, '\'), '\n', '\\n', 'g')
+  let @@ = temp
+endfunction
 
 " Force airline's color scheme
 function! AirlineThemePatch(palette)

zsh/zshrc

@@ -13,79 +13,41 @@ source $ZSH/oh-my-zsh.sh
 # PHP_FULL_VERSION=`php --version | head -n 1 | awk '{print $2}'`
 # PHP_MAJOR_MINOR=`echo $PHP_FULL_VERSION | awk -F '.' '{print $1$2}'`
 # PHP_BASE_PATH=/usr/local/Cellar/php$PHP_MAJOR_MINOR/$PHP_FULL_VERSION
-# 
+#
 # export PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:$PHP_BASE_PATH/lib/php:~/Source/dotfiles/scripts:~/Source/dotfiles/git/scripts:$PHP_BASE_PATH/bin:/opt/X11/bin:$PHP_BASE_PATH/lib/php/File
 
-# git
-#alias    ga="git add"
-#alias   gaa="git add --all"
-#alias    gb="git branch"
-#alias   gba="git branch -a"
-#alias    gc="git commit"
-#alias   gca="git commit -a"
-#alias   gcl="git clone"
-#alias   gco="git checkout"
-#alias  gcob="git checkout -B"
-#alias  gcom="git checkout master"
-#alias    gd="git diff"
-#alias   gdb="git delete-branch"
-#alias    gf="git fetch"
-#alias    gl="git log"
-#alias    gm="git merge"
-#alias   gmm="git merge master"
-#alias  gmup="git fetch upstream; git merge origin/upstream"
-#alias   gmv="git mv"
-#alias    gp="git rev-parse --abbrev-ref HEAD | xargs git push origin"
-#alias   gpu="git rev-parse --abbrev-ref HEAD | xargs git pull origin"
-#alias    gr="git remote"
-#alias   gra="git remote add"
-#alias  grao="git remote add origin"
-#alias   grr="git remote rm"
-#alias  grro="git remote rm origin"
-#alias   grm="git rm"
-#alias    gs="git status"
-
-# jekyll
+alias    gaa="git add --all"
+alias   gcob="git checkout -B"
+alias    gdb="git delete-branch"
+alias     gf="git fetch"
+alias    gmm="git merge master"
+alias   gmup="git fetch upstream; git merge origin/upstream"
+alias    gmv="git mv"
+#alias     gp="git rev-parse --abbrev-ref HEAD | xargs git push origin"
+#alias    gpu="git rev-parse --abbrev-ref HEAD | xargs git pull origin"
+alias    gra="git remote add"
+alias    grm="git rm"
+alias     gs="git status"
 alias jekyll="jekyll serve --watch"
+alias    mtr="sudo mtr"
+alias   uuid="node -e \"var uuid = require('node-uuid'); console.log(uuid.v4())\""
+alias    unq="xattr -r -d com.apple.quarantine *"
+alias      v="vim"
+alias     vd="vimdiff"
 
-# mtr
-alias mtr="sudo mtr"
+export CLICOLOR=1
+export LSCOLORS=Exfxcxdxbxegedabagacad
 
-# zsh
-#alias zshrc="source ~/.zshrc"
+export GREP_OPTIONS="--color=auto"
 
-# vim
-#alias   v="vim -p"
-#alias  vi="vim -p"
-#alias vim="vim -p"
-#alias  vd="vimdiff"
-#alias  vo="vim -O"
-
-
-# Platform-specific
-if [[ `uname` == "Darwin" ]];
-then
-	alias unquarantine="xattr -r -d com.apple.quarantine *"
-
-	# Tell ls to be colourful
-	export CLICOLOR=1
-	export LSCOLORS=Exfxcxdxbxegedabagacad
-
-	# Tell grep to highlight matches
-	export GREP_OPTIONS="--color=auto"
-
-	export   PATH=/usr/local/bin:/usr/local/sbin:$PATH
-	export EDITOR="mvim -v"
-else
-	export   PATH="$HOME/Source/bash:$PATH"
-	export EDITOR=vim
-fi
+export EDITOR=vim
 
 for method in GET HEAD POST PUT DELETE TRACE OPTIONS; do
-	alias "$method"="lwp-request -m '$method'"
+  alias "$method"="lwp-request -m '$method'"
 done
 
-source $(brew --prefix nvm)/nvm.sh
-#
-export PATH=./node_modules/bower/bin:./node_modules/grunt-cli/bin:$PATH
+export PATH=/usr/local/bin:/usr/local/sbin:./node_modules/bower/bin:./node_modules/grunt-cli/bin:$PATH
 
+source $(brew --prefix nvm)/nvm.sh
+
+export NODE_ENV=development