Various changes

5 files changed, 99 insertions, 74 deletions

diff --git a/.tmuxlinerc b/.tmuxlinerc
new file mode 100644
index 0000000..5b7120a
--- /dev/null
+++ b/.tmuxlinerc
@@ -0,0 +1,29 @@
+# This tmux statusbar config was created by tmuxline.vim
+# on Sat, 25 Apr 2015
+
+set -g status-bg "colour7"
+set -g message-command-fg "colour7"
+set -g status-justify "centre"
+set -g status-left-length "100"
+set -g status "on"
+set -g pane-active-border-fg "colour11"
+set -g message-bg "colour14"
+set -g status-right-length "100"
+set -g status-right-attr "none"
+set -g message-fg "colour7"
+set -g message-command-bg "colour14"
+set -g status-attr "none"
+set -g status-utf8 "on"
+set -g pane-border-fg "colour14"
+set -g status-left-attr "none"
+setw -g window-status-fg "colour14"
+setw -g window-status-attr "none"
+setw -g window-status-activity-bg "colour7"
+setw -g window-status-activity-attr "none"
+setw -g window-status-activity-fg "colour11"
+setw -g window-status-separator ""
+setw -g window-status-bg "colour7"
+set -g status-left "#[fg=colour7,bg=colour11,bold] #H #[fg=colour11,bg=colour14,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour14] #S #[fg=colour14,bg=colour7,nobold,nounderscore,noitalics]"
+set -g status-right "#[fg=colour7,bg=colour7,nobold,nounderscore,noitalics]#[fg=colour14,bg=colour7] %R #[fg=colour14,bg=colour7,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour14] %a #[fg=colour11,bg=colour14,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour11] %Y "
+setw -g window-status-format "#[fg=colour7,bg=colour7,nobold,nounderscore,noitalics]#[default] #W #[fg=colour7,bg=colour7,nobold,nounderscore,noitalics]"
+setw -g window-status-current-format "#[fg=colour7,bg=colour14,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour14] #W #[fg=colour14,bg=colour7,nobold,nounderscore,noitalics]"
diff --git a/make b/make
index 4f88752..1f464de 100755
--- a/make
+++ b/make
@@ -4,7 +4,7 @@ dir=~/dotfiles
 olddir=~/dotfiles_old
 
 # Files to sync
-files="vim vimrc mutt passwords vifm msmtprc bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc offlineimap.py inputrc latexmkrc crontab gitconfig"
+files="vim vimrc mutt passwords vifm msmtprc bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc offlineimap.py inputrc latexmkrc crontab gitconfig tmuxlinerc"
 
 rm -rf $olddir
 mkdir -p $olddir
diff --git a/tmux.conf b/tmux.conf
index 15e5c1a..577b997 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -4,8 +4,8 @@ set -g mouse-resize-pane on
 set -g mouse-select-pane on
 
 unbind C-b
-set -g prefix C-Space
-bind Space send-prefix
+set -g prefix C-s
+bind s send-prefix
 
 unbind r
 bind r source-file ~/.tmux.conf
diff --git a/vim/after/ftplugin/tex/mappings.vim b/vim/after/ftplugin/tex/mappings.vim
index 05d02dd..a8753bb 100644
--- a/vim/after/ftplugin/tex/mappings.vim
+++ b/vim/after/ftplugin/tex/mappings.vim
@@ -10,25 +10,37 @@ inoremap <buffer> << \,\leq\,
 inoremap <buffer> ++ \,+\,
 inoremap <buffer> -- \,-\,
 
-inoremap <buffer> `a \alpha
-inoremap <buffer> `b \beta
-inoremap <buffer> `g \gamma
-inoremap <buffer> `d \delta
-inoremap <buffer> `e \varepsilon
-inoremap <buffer> `z \zeta
-inoremap <buffer> `h \eta
-inoremap <buffer> `t \theta
-inoremap <buffer> `i \iota
-inoremap <buffer> `k \kappa
-inoremap <buffer> `l \lambda
-inoremap <buffer> `m \mu
-inoremap <buffer> `n \nu
-inoremap <buffer> `x \xi
-inoremap <buffer> `r \rho
-inoremap <buffer> `s \sigma
-inoremap <buffer> `f \phi
-inoremap <buffer> `p \pi
-inoremap <buffer> `w \omega
+iabbrev <buffer> ga \alpha
+iabbrev <buffer> gb \beta
+iabbrev <buffer> gg \gamma
+iabbrev <buffer> gd \delta
+iabbrev <buffer> ge \varepsilon
+iabbrev <buffer> gz \zeta
+iabbrev <buffer> gh \eta
+iabbrev <buffer> gt \theta
+iabbrev <buffer> gi \iota
+iabbrev <buffer> gk \kappa
+iabbrev <buffer> gl \lambda
+iabbrev <buffer> gm \mu
+iabbrev <buffer> gn \nu
+iabbrev <buffer> gx \xi
+iabbrev <buffer> gr \rho
+iabbrev <buffer> gs \sigma
+iabbrev <buffer> gf \phi
+iabbrev <buffer> gp \pi
+iabbrev <buffer> gw \omega
+iabbrev <buffer> dd \d
+
+function! SynctexShow()
+    let synctex = glob("*.synctex.gz")
+    if strlen(synctex) == 0
+        echom "no synctex file found"
+    else
+        let pdffile = substitute(synctex,"synctex.gz","pdf","")
+        let execline = printf(":!zathura --synctex-forward %d:%d:%s %s", line('.'), col('.'), shellescape(bufname("%")), shellescape(pdffile))
+        exec execline
+    end
+endfunction
 
 nnoremap <buffer> <LocalLeader>a :call SynctexShow()<CR><CR>
 nnoremap <buffer> <LocalLeader>i :Latexmk<CR>
@@ -36,5 +48,3 @@ nnoremap <buffer> <LocalLeader>e :LatexErrors<CR>
 nnoremap <buffer> <LocalLeader>o :LatexView<CR>
 nnoremap <buffer> <LocalLeader>k :LatexmkStop<CR>:LatexmkClean<CR>
 nnoremap <buffer> <LocalLeader>h :split header.sty<CR>
-
-iabbrev <buffer> dd \d
diff --git a/vimrc b/vimrc
index fba3b24..a9db890 100644
--- a/vimrc
+++ b/vimrc
@@ -39,54 +39,51 @@ let maplocalleader = "-"
 nmap <Space> <Leader>
 
 "  Plugins options
-let g:ctrlp_map = '<c-p>'
-let g:ctrlp_cmd = 'CtrlPBuffer'
-let g:ctrlp_by_filename = 1
-let g:ctrlp_working_path_mode = 'r'
-let g:ctrlp_show_hidden = 1
-let g:ctrlp_open_new_file = 't'
-let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
 
+let g:LatexBox_Folding=0
+let g:LatexBox_latexmk_preview_continuously=1
+let g:LatexBox_quickfix=2
+let g:LatexBox_viewer='zathura'
+
+let g:UltiSnipsEditSplit="horizontal"
 let g:UltiSnipsExpandTrigger="<tab>"
-let g:UltiSnipsJumpForwardTrigger="<tab>"
 let g:UltiSnipsJumpBackwardTrigger="<s-tab>"
+let g:UltiSnipsJumpForwardTrigger="<tab>"
 let g:UltiSnipsListSnippets="<c-l>"
-let g:UltiSnipsEditSplit="horizontal"
-let g:UltiSnipsSnippetsDir="~/.vim/mySnippets"
 let g:UltiSnipsSnippetDirectories=['UltiSnips', 'mySnippets']
+let g:UltiSnipsSnippetsDir="~/.vim/mySnippets"
 
-let g:bufferline_echo = 0
-let g:bufferline_active_buffer_left = '['
-let g:bufferline_active_buffer_right = ']'
-let g:bufferline_modified = '+'
-let g:bufferline_rotate = 1
-
+let g:airline_left_sep=''
+let g:airline_right_sep=''
 let g:airline_section_x = ''
 let g:airline_section_y = ''
+let g:airline_section_z = '%3p%%|%3l|%3c'
 let g:airline_theme='solarized'
-let g:airline_right_sep=''
-let g:airline_left_sep=''
 
-let g:tmuxline_theme='airline'
-let g:tmuxline_preset = {'a':'#H','b':'#S','win':'#W','cwin':'#W','x':'%R','y':'%a','z':'%Y'}
-let g:tmuxline_separators = {'left':'','left_alt':'>','right':'','right_alt':'<','space':' '}
+let g:bufferline_active_buffer_left = ''
+let g:bufferline_active_buffer_right = ''
+let g:bufferline_echo = 0
+let g:bufferline_modified = '+'
+let g:bufferline_rotate = 0
+
+let g:ctrlp_by_filename = 1
+let g:ctrlp_cmd = 'CtrlPBuffer'
+let g:ctrlp_map = '<c-p>'
+let g:ctrlp_open_new_file = 't'
+let g:ctrlp_show_hidden = 1
+let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
+let g:ctrlp_working_path_mode = 'r'
+
+let g:syntastic_cpp_compiler = 'clang++'
+let g:syntastic_cpp_compiler_options = ' -std=c++11 -stdlib=libc++'
 
-let g:tex_flavor='latex'
 let g:tex_conceal= 'adgm'
-let g:LatexBox_Folding=0
-let g:LatexBox_viewer='zathura'
-let g:LatexBox_latexmk_preview_continuously=1
-let g:LatexBox_quickfix=2
-function! SynctexShow()
-    let synctex = glob("*.synctex.gz")
-    if strlen(synctex) == 0
-        echom "no synctex file found"
-    else
-        let pdffile = substitute(synctex,"synctex.gz","pdf","")
-        let execline = printf(":!zathura --synctex-forward %d:%d:%s %s", line('.'), col('.'), shellescape(bufname("%")), shellescape(pdffile))
-        exec execline
-    end
-endfunction
+let g:tex_flavor='latex'
+let g:tex_fast=""
+
+let g:tmuxline_preset = {'a':'#H','b':'#S','win':'#W','cwin':'#W','x':'%R','y':'%a','z':'%Y'}
+let g:tmuxline_separators = {'left':'','left_alt':'>','right':'','right_alt':'<','space':' '}
+let g:tmuxline_theme='airline'
 
 "  Gundo
 nnoremap <F5> :GundoToggle<cr>
@@ -155,10 +152,8 @@ set encoding=utf-8
 set mouse=a
 set clipboard=unnamedplus
 
-""  Colorscheme
-try | colorscheme solarized | catch | endtry
 
-" General
+" Leader-maps
 nnoremap <Leader>te :tabedit
 nnoremap <Leader>tn :tabnew<cr>
 nnoremap <Leader>to :tabonly<cr>
@@ -174,8 +169,6 @@ nnoremap <Leader>i mxgg=G'x
 nnoremap <Leader>sw :%s/\s\+$//<cr>
 nnoremap <tab> <C-^>
 
-
-"  Other maps
 nnoremap <Return> o<Esc>
 nnoremap <s-Return> O<Esc>
 nnoremap J mzJ`z
@@ -190,17 +183,10 @@ vnoremap : ,
 nnoremap , :
 vnoremap , :
 
-""  Latex
-let g:tex_fast=""
-
-""  Autocommands
-augroup autorelead_vimrc
-    au!
-    au BufWritePost ~/.vim/vimrc source ~/.vim/vimrc
-augroup END
-
 "" Neovim specific
 if has('nvim')
     tmap jk <C-\><C-n>
 endif
 
+""  Colorscheme
+try | colorscheme solarized | catch | endtry