Merge remote-tracking branch 'origin/master' into everard

.gitignore

@@ -1,6 +1,6 @@
 irssi
 
 vim/bundle/*
-!vim/bundle/vundle
+!vim/bundle/Vundle.vim
 vim/spell
 .netrwhist

.gitmodules

@@ -1,9 +1,9 @@
-[submodule "vim/bundle/vundle"]
-	path = vim/bundle/vundle
-	url = git://github.com/gmarik/vundle.git
 [submodule "zsh/zilsh"]
 	path = zsh/zilsh
 	url = git@github.com:zilsh/zilsh.git
 [submodule "zsh/bundle/oh-my-zilsh"]
 	path = zsh/bundle/oh-my-zilsh
 	url = git@github.com:zilsh/oh-my-zilsh.git
+[submodule "vim/bundle/Vundle.vim"]
+	path = vim/bundle/Vundle.vim
+	url = https://github.com/gmarik/Vundle.vim.git

vimrc

@@ -3,25 +3,38 @@ set nocompatible
 
 " Vundle
 filetype off  " required!
-set rtp+=~/.vim/bundle/vundle/
+" set the runtime path to include Vundle and initialize
-call vundle#rc()
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
 
-" My Bundles here:
+" let Vundle manage Vundle, required
-"
+Plugin 'gmarik/Vundle.vim'
-" original repos on github
+
-Bundle 'gmarik/vundle'
+Plugin 'L9'
-Bundle 'scrooloose/nerdtree'
+
-Bundle 'pangloss/vim-javascript'
+Plugin 'clones/vim-fuzzyfinder'
-Bundle 'tpope/vim-fugitive'
+Plugin 'scrooloose/nerdtree'
-Bundle 'clones/vim-l9'
+Plugin 'kien/ctrlp.vim'
-Bundle 'clones/vim-fuzzyfinder'
+Plugin 'maxbrunsfeld/vim-yankstack', {'name': 'yankstack'}
-Bundle 'scrooloose/syntastic.git'
+
-Bundle 'kien/ctrlp.vim'
+Plugin 'editorconfig/editorconfig-vim'
-Bundle 'Lokaltog/powerline'
+
-Bundle 'flazz/vim-colorschemes'
+Plugin 'pangloss/vim-javascript'
+Plugin 'scrooloose/syntastic.git'
+
+Plugin 'mileszs/ack.vim'
+
+Plugin 'tpope/vim-fugitive'
+Plugin 'airblade/vim-gitgutter'
+
+Plugin 'vim-airline', {'name': 'airline'}
+Plugin 'flazz/vim-colorschemes'
 
 
-filetype plugin indent on
+" All of your Plugins must be added before the following line
+call vundle#end()            " required
+filetype plugin indent on    " required
+
 
 " enable 256 color !!1!
 set t_Co=256
@@ -34,7 +47,7 @@ let mapleader = ","
 " CONFIGURATION MAPPING
 set scrolloff=3                     " show 3 lines of context around the cursor
 set autoread                        " set to auto read when a file is changed from the outside
-set mouse=a                         " allow for full mouse support
+"set mouse=a                         " allow for full mouse support
 set autowrite
 set showcmd                         " show typed commands
 
@@ -82,23 +95,10 @@ au GUIEnter * set vb t_vb=
 
 syntax enable                       " enable syntax highlighting
 
-" Statusline
-
 if has('statusline')
     set laststatus=2
-
-    " Broken down into easily includeable segments
-    set statusline=%<%f\    " Filename
-    set statusline+=%w%h%m%r " Options
-    set statusline+=%{fugitive#statusline()} "  Git Hotness
-    set statusline+=\ [%{&ff}/%Y]            " filetype
-    set statusline+=\ [%{getcwd()}]          " current dir
-    "set statusline+=\ [A=\%03.3b/H=\%02.2B] " ASCII / Hexadecimal value of char
-    set statusline+=%=%-14.(%l,%c%V%)\ %p%%  " Right aligned file nav info
 endif
 
-" Powerline
-set rtp+=~/.vim/bundle/powerline/powerline/bindings/vim
 
 " VIM 7.3 FEATURES
 
@@ -121,7 +121,7 @@ set foldlevel=99
 
 " ADDITIONAL KEY MAPPINGS
 " fast saving
-nmap <leader>w :up<cr>
+nmap <leader>w :update<cr>
 " fast escaping
 imap jj <ESC>
 " prevent accidental striking of F1 key
@@ -171,11 +171,15 @@ map <leader>sp [s
 map <leader>sa zg
 map <leader>s? z=
 
-" numbers
+nmap <silent> <leader>hh :set invhlsearch<CR>
-set number
+nmap <silent> <leader>ll :set invlist<CR>
-set relativenumber
+nmap <silent> <leader>nn :set invnumber<CR>
-nnoremap <F3> :set nonumber!<CR>
+nmap <silent> <leader>pp :set invpaste<CR>
-nnoremap <F4> :set relativenumber!<CR>
+nmap <silent> <leader>ii :set invrelativenumber<CR>
+
+if exists('+relativenumber')
+  set relativenumber
+endif
 
 "" ADDITIONAL AUTOCOMMANDS
 
@@ -226,6 +230,10 @@ nmap <C-Down> ]e
 vmap <C-Up> [egv
 vmap <C-Down> ]egv
 
+" yankstack
+nmap <leader>p <Plug>yankstack_substitute_older_paste
+nmap <leader>P <Plug>yankstack_substitute_newer_paste
+
 " MAIL HUMAN TEX
 au BufNewFile,BufRead *.txt set filetype=human
 au FileType human,mail,tex set expandtab textwidth=78 nocindent

xinitrc

@@ -4,23 +4,26 @@
 #
 # Executed by startx (run your window manager from here)
 
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
+case $((hostname)) in
+    t430s-arch)
+        if [ -d /etc/X11/xinit/xinitrc.d ]; then
           for f in /etc/X11/xinit/xinitrc.d/*; do
             [ -x "$f" ] && . "$f"
           done
           unset f
-fi
+        fi
 
-start-pulseaudio-x11
+        pulseaudio --start
-eval $(gpg-agent --daemon) &
 
-xrdb $HOME/.Xresources
+        eval $(gpg-agent --daemon) &
 
-# add additional fonts
+        xrdb $HOME/.Xresources
-xset +fp /usr/share/fonts/local
-xset fp rehash
 
-case $1 in
+        # add additional fonts
+        xset +fp /usr/share/fonts/local
+        xset fp rehash
+
+        case $1 in
             enlightenment)
                 exec enlightenment_start
                 ;;
@@ -36,4 +39,7 @@ case $1 in
                 xbindkeys &
                 exec herbstluftwm --locked
                 ;;
+        esac
+    ;;
 esac
+

zsh/bundle/npm/init.zsh

@@ -0,0 +1,53 @@
+###-begin-npm-completion-###
+#
+# npm command completion script
+#
+# Installation: npm completion >> ~/.bashrc  (or ~/.zshrc)
+# Or, maybe: npm completion > /usr/local/etc/bash_completion.d/npm
+#
+
+COMP_WORDBREAKS=${COMP_WORDBREAKS/=/}
+COMP_WORDBREAKS=${COMP_WORDBREAKS/@/}
+export COMP_WORDBREAKS
+
+if type complete &>/dev/null; then
+  _npm_completion () {
+    local si="$IFS"
+    IFS=$'\n' COMPREPLY=($(COMP_CWORD="$COMP_CWORD" \
+                           COMP_LINE="$COMP_LINE" \
+                           COMP_POINT="$COMP_POINT" \
+                           npm completion -- "${COMP_WORDS[@]}" \
+                           2>/dev/null)) || return $?
+    IFS="$si"
+  }
+  complete -F _npm_completion npm
+elif type compdef &>/dev/null; then
+  _npm_completion() {
+    si=$IFS
+    compadd -- $(COMP_CWORD=$((CURRENT-1)) \
+                 COMP_LINE=$BUFFER \
+                 COMP_POINT=0 \
+                 npm completion -- "${words[@]}" \
+                 2>/dev/null)
+    IFS=$si
+  }
+  compdef _npm_completion npm
+elif type compctl &>/dev/null; then
+  _npm_completion () {
+    local cword line point words si
+    read -Ac words
+    read -cn cword
+    let cword-=1
+    read -l line
+    read -ln point
+    si="$IFS"
+    IFS=$'\n' reply=($(COMP_CWORD="$cword" \
+                       COMP_LINE="$line" \
+                       COMP_POINT="$point" \
+                       npm completion -- "${words[@]}" \
+                       2>/dev/null)) || return $?
+    IFS="$si"
+  }
+  compctl -K _npm_completion npm
+fi
+###-end-npm-completion-###