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

Conflicts:
	Xresources

.gitmodules

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

Xresources

@@ -16,51 +16,66 @@ Xft.hintstyle:              hintslight
 ! http://pod.tst.eu/http://cvs.schmorp.de/rxvt-unicode/doc/rxvt.1.pod
 !-------------------------------------------------------------------------------
 
-URxvt.depth:                32
+URxvt*depth:                32
-URxvt.geometry:             90x30
+URxvt*geometry:             90x30
-URxvt.transparent:          false
+URxvt*transparent:          false
-URxvt.fading:               0
+URxvt*fading:               0
-! URxvt.urgentOnBell:         true
+! URxvt*urgentOnBell:         true
-! URxvt.visualBell:           true
+! URxvt*visualBell:           true
-URxvt.loginShell:           true
+URxvt*loginShell:           true
-URxvt.internalBorder:       3
+URxvt*internalBorder:       3
-URxvt.lineSpace:            0
+URxvt*lineSpace:            0
+URxvt*skipBuiltinGlyphs:    true
 
 ! Fonts
-URxvt*font: xft:DejaVu Sans Mono:pixelsize=14
+URxvt*font:                 xft:DejaVu Sans Mono:style=Book:size=10, \
-URxvt*boldFont: xft:DejaVu Sans Mono:bold:pixelsize=14
+                            xft:Droid Sans Fallback:style=Regular, \
+                            xft:Droid Sans Japanese:style=Regular, \
+                            xft:unifont:style=Medium
+URxvt*boldFont:             xft:DejaVu Sans Mono:style=Book:size=10, \
+                            xft:Droid Sans Fallback:style=Regular, \
+                            xft:Droid Sans Japanese:style=Regular, \
+                            xft:unifont:style=Medium
+URxvt*italicFont:           xft:DejaVu Sans Mono:style=Book:size=10, \
+                            xft:Droid Sans Fallback:style=Regular, \
+                            xft:Droid Sans Japanese:style=Regular, \
+                            xft:unifont:style=Medium
+URxvt*boldItalicFont:       xft:DejaVu Sans Mono:style=Book:size=10, \
+                            xft:Droid Sans Fallback:style=Regular, \
+                            xft:Droid Sans Japanese:style=Regular, \
+                            xft:unifont:style=Medium
 
 ! Font size
-URxvt.keysym.C-Up:     perl:font-size:increase
+URxvt*keysym.C-Up:     perl:font-size:increase
-URxvt.keysym.C-Down:   perl:font-size:decrease
+URxvt*keysym.C-Down:   perl:font-size:decrease
-URxvt.keysym.C-S-Up:   perl:font-size:incglobal
+URxvt*keysym.C-S-Up:   perl:font-size:incglobal
-URxvt.keysym.C-S-Down: perl:font-size:decglobal
+URxvt*keysym.C-S-Down: perl:font-size:decglobal
 
 ! Scrollbar
-URxvt.scrollStyle:          rxvt
+URxvt*scrollStyle:          rxvt
-URxvt.scrollBar:            true
+URxvt*scrollBar:            true
-URxvt.scrollBar_right:      true
+URxvt*scrollBar_right:      true
 
 ! Perl extensions
-URxvt.perl-ext-common:      default,matcher,font-size
+URxvt*perl-ext-common:      default,matcher,font-size
-URxvt.url-launcher:         xdg-open
+URxvt*url-launcher:         xdg-open
-URxvt.matcher.button:       1
+URxvt*matcher.button:       1
 
 ! Cursor
-URxvt.cursorBlink:          true
+URxvt*cursorBlink:          true
-URxvt.cursorColor:          #657b83
+URxvt*cursorColor:          #657b83
-URxvt.cursorUnderline:      false
+URxvt*cursorUnderline:      false
 
 ! Pointer
-URxvt.pointerBlank:         true
+URxvt*pointerBlank:         true
 
 ! scrollback buffer lines - 65535 is max on most machines (64 is default)
-URxvt.saveLines:            65536
+URxvt*saveLines:            65536
 
 ! Create a dump of the content of the terminal in /tmp
 ! <PRINT> : current screen
 ! <CTRL>+<PRINT> : current screen and scrollbackbuffer
-URxvt.print-pipe:           cat > $(echo /tmp/urxvt.dump.$(date +'%Y-%m-%d--%H:%M:%S'))
+URxvt*print-pipe:           cat > $(echo /tmp/urxvt.dump.$(date +'%Y-%m-%d--%H:%M:%S'))
 
 ! Base16 Solarized Dark
 ! Scheme: Ethan Schoonover (http://ethanschoonover.com/solarized)

tmux.conf

@@ -0,0 +1,64 @@
+# force a reload of the config file
+unbind r
+bind r source-file ~/.tmux.conf
+
+# start window numbering at 1 for easier switching
+set -g base-index 1
+
+# colors
+set -g default-terminal "screen-256color"
+
+# unicode
+setw -g utf8 on
+set -g status-utf8 on
+
+# bah, C-B is ugly
+unbind C-b
+set -g prefix C-a
+bind C-a send-prefix
+
+# status bar config
+set -g status-left "#h:[#S]"
+set -g status-left-length 50
+set -g status-right-length 50
+#set -g status-right "⚡ #(~/bin/tmux-battery) [✉#(~/bin/imap_check.py)] %H:%M %d-%h-%Y"
+set -g status-right "%H:%M %d-%h-%Y"
+setw -g window-status-current-format "|#I:#W|"
+set-window-option -g automatic-rename off
+
+# listen to alerts from all windows
+set -g bell-action any
+
+# sessions
+# bind Y source-file ~/.tmux/work
+
+# This tmux statusbar config was created by tmuxline.vim
+# on Mon, 15 Dec 2014
+
+set -g status-bg "colour234"
+set -g message-command-fg "colour231"
+set -g status-justify "left"
+set -g status-left-length "100"
+set -g status "on"
+set -g pane-active-border-fg "colour254"
+set -g message-bg "colour31"
+set -g status-right-length "100"
+set -g status-right-attr "none"
+set -g message-fg "colour231"
+set -g message-command-bg "colour31"
+set -g status-attr "none"
+set -g status-utf8 "on"
+set -g pane-border-fg "colour240"
+set -g status-left-attr "none"
+setw -g window-status-fg "colour250"
+setw -g window-status-attr "none"
+setw -g window-status-activity-bg "colour234"
+setw -g window-status-activity-attr "none"
+setw -g window-status-activity-fg "colour250"
+setw -g window-status-separator ""
+setw -g window-status-bg "colour234"
+set -g status-left "#[fg=colour16,bg=colour254,bold] #S #[fg=colour254,bg=colour234,nobold,nounderscore,noitalics]>"
+set -g status-right "#[fg=colour236,bg=colour234,nobold,nounderscore,noitalics]<#[fg=colour247,bg=colour236] %Y-%m-%d < %H:%M #[fg=colour252,bg=colour236,nobold,nounderscore,noitalics]<#[fg=colour235,bg=colour252] #h "
+setw -g window-status-format "#[fg=colour244,bg=colour234] #I <#[fg=colour250,bg=colour234] #W "
+setw -g window-status-current-format "#[fg=colour234,bg=colour31,nobold,nounderscore,noitalics]>#[fg=colour117,bg=colour31] #I >#[fg=colour231,bg=colour31,bold] #W #[fg=colour31,bg=colour234,nobold,nounderscore,noitalics]>"
+

vim/snippets/javascript-jasmin.snippets

@@ -1,60 +0,0 @@
-# Describe
-snippet des
-	describe('${1:description}', function(${2}) {
-		${3}
-	});
-
-# After Each
-snippet aft
-	afterEach(function(${1}) {
-		${2}
-	});${0}
-
-#	Before Each
-snippet bef
-	beforeEach(function(${1}) {
-		${2}
-	});
-
-# It
-snippet it
-	it('${1:description}', function(${2}) {
-		${3}
-	});
-
-# Stub
-snippet stub
-	sandbox.stub(${1:target},'${2:function}');${3}
-
-# Spy
-snippet spy
-	sandbox.spy(${1:target},'${2:function}');${3}
-
-# Expect not to be defined
-snippet end
-	expect(${1:target}).not.toBeDefined();${2}
-
-# Expect not to contain
-snippet enc
-	expect(${1:target}).not.toContain(${2:value});${3}
-
-# Expect not to equal
-snippet ene
-	expect(${1:target}).not.toEqual(${2:value});${3}
-
-# Expect not
-snippet enx
-	expect(${1:target}).not.${2};${3}
-
-# Expect to be defined
-snippet etd
-	expect(${1:target}).toBeDefined();${2}
-
-# Expect to contain
-snippet etc
-	expect(${1:target}).toContain(${2:value});${3}
-
-# Expect to equal
-snippet ete
-	expect(${1:target}).toEqual(${2:value});${3}
-

vim/snippets/javascript.snippets

@@ -1,11 +0,0 @@
-# requirejs
-snippet def
-	define([
-		${1}
-	], function(
-		${2}
-	){
-		'use strict';
-
-		${3}
-	});

vimrc

@@ -1,58 +1,66 @@
-" FULL VIM
+" NeoBundle
-set nocompatible
+if !1 | finish | endif
 
-" Vundle
+if has('vim_starting')
+  set nocompatible               " Be iMproved
 
-filetype off  " required!
+  set runtimepath+=~/.vim/bundle/neobundle.vim/
-" set the runtime path to include Vundle and initialize
+endif
-set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
 
-" let Vundle manage Vundle, required
+call neobundle#begin(expand('~/.vim/bundle/'))
-Plugin 'gmarik/Vundle.vim'
 
-Plugin 'L9'
+NeoBundleFetch 'Shougo/neobundle.vim'
-Plugin 'unimpaired.vim'
 
-Plugin 'scrooloose/nerdtree'
+" my bundles
-Plugin 'kien/ctrlp.vim'
+NeoBundle 'L9'
+NeoBundle 'unimpaired.vim'
 
-Plugin 'Gundo'
+NeoBundle 'Shougo/unite.vim'
 
-Plugin 'scrooloose/nerdcommenter'
+NeoBundle 'scrooloose/nerdtree'
+NeoBundle 'kien/ctrlp.vim'
 
-Plugin 'surround.vim'
+NeoBundle 'scrooloose/nerdcommenter'
 
-Plugin 'SirVer/ultisnips'
+NeoBundle 'surround.vim'
-Plugin 'honza/vim-snippets'
 
-Plugin 'editorconfig/editorconfig-vim'
+NeoBundle 'SirVer/ultisnips'
+NeoBundle 'honza/vim-snippets'
 
-Plugin 'sheerun/vim-polyglot'
+NeoBundle 'editorconfig/editorconfig-vim'
 
-Plugin 'nathanaelkane/vim-indent-guides'
+NeoBundle 'sheerun/vim-polyglot'
 
-Plugin 'tpope/vim-fugitive'
+NeoBundle 'nathanaelkane/vim-indent-guides'
-Plugin 'airblade/vim-gitgutter'
 
-Plugin 'mileszs/ack.vim'
+NeoBundle 'tpope/vim-fugitive'
+NeoBundle 'airblade/vim-gitgutter'
 
-Plugin 'vim-airline', {'name': 'airline'}
+NeoBundle 'rking/ag.vim'
-Plugin 'chriskempson/base16-vim'
 
-Plugin 'scrooloose/syntastic.git'
+NeoBundle 'vim-airline'
-Plugin 'Raimondi/delimitMate'
+NeoBundle 'chriskempson/base16-vim'
 
-Plugin 'pangloss/vim-javascript'
+NeoBundle 'scrooloose/syntastic.git'
-Plugin 'mustache/vim-mustache-handlebars'
+NeoBundle 'Raimondi/delimitMate'
-Plugin 'gorodinskiy/vim-coloresque'
 
-Plugin 'inside/vim-search-pulse'
+NeoBundle 'jelera/vim-javascript-syntax'
+NeoBundle 'JavaScript-Indent'
+NeoBundle 'othree/javascript-libraries-syntax.vim'
+NeoBundle 'marijnh/tern_for_vim'
 
-" All of your Plugins must be added before the following line
+NeoBundle 'mustache/vim-mustache-handlebars'
-call vundle#end()            " required
+NeoBundle 'gorodinskiy/vim-coloresque'
-filetype plugin indent on    " required
 
+NeoBundle 'inside/vim-search-pulse'
+
+call neobundle#end()
+
+filetype plugin indent on
+
+NeoBundleCheck
+
+" other stuff
 
 "" Encoding
 set encoding=utf-8
@@ -143,7 +151,7 @@ set t_vb=
 set spelllang=en,de
 
 "" long lines
-let &showbreak='↪ '
+set showbreak=~
 
 "
 " KEY MAPPINGS
@@ -152,6 +160,7 @@ let &showbreak='↪ '
 "" MAP LEADER
 noremap , \
 let mapleader = ","
+"let mapleader = "\<Space>"
 
 "" fast saving
 nmap <leader>w :update<cr>
@@ -231,24 +240,18 @@ endif
 "
 
 "" syntastic
-let g:syntastic_javascript_checkers = ['jscs','jshint']
+let g:syntastic_javascript_checkers = ['jshint','jscs']
 let g:syntastic_check_on_open = 1
 
 "" ariline
-let g:airline_theme = 'powerlineish'
+let g:airline_theme = 'bubblegum'
+let g:airline_left_sep = '»'
+let g:airline_right_sep = '«'
 let g:airline_enable_syntastic = 1
 let g:airline#extensions#tabline#enabled = 1
 
 "" NERDTree configuration
 nmap <leader>n :NERDTreeToggle<CR>
-let NERDTreeChDirMode=2
-let NERDTreeIgnore=['\.rbc$', '\~$', '\.pyc$', '\.db$', '\.sqlite$', '__pycache__']
-let NERDTreeSortOrder=['^__\.py$', '\/$', '*', '\.swp$', '\.bak$', '\~$']
-let NERDTreeShowBookmarks=1
-let g:nerdtree_tabs_focus_on_files=1
-let g:NERDTreeMapOpenInTabSilent = '<RightMouse>'
-let g:NERDTreeWinSize = 20
-set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.pyc,*.db,*.sqlite
 
 "" Unimpaired
 "" bubble single lines
@@ -272,6 +275,14 @@ nmap <leader>g :IndentGuidesToggle<CR>
 "" Gundo
 nmap <leader>u :GundoToggle<CR>
 
+"" Ultisnips
+"let g:UltiSnipsExpandTrigger="<tab>"
+let g:UltiSnipsJumpForwardTrigger="<tab>"
+"let g:UltiSnipsJumpBackwardTrigger="<c-z>"
+
+" Tex
+let g:tex_flavor = "latex"
+
 "
 " Autocmd Rules
 "