diff options
| -rw-r--r-- | tmux.conf | 6 | ||||
| -rw-r--r-- | vimrc | 25 | ||||
| -rw-r--r-- | zshrc | 2 |
3 files changed, 26 insertions, 7 deletions
@@ -7,7 +7,11 @@ unbind C-b set -g prefix C-Space bind Space send-prefix +unbind r +bind r source-file ~/.tmux.conf + set -s escape-time 0 +set-option -g allow-rename off set -g @tpm_plugins ' \ tmux-plugins/tpm \ @@ -24,3 +28,5 @@ bind -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L" bind -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D" bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U" bind -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R" + +source-file ~/.tmuxlinerc @@ -1,5 +1,3 @@ -"" Required by Vundle - set nocompatible filetype off set rtp+=~/.vim/bundle/vundle/ @@ -27,6 +25,9 @@ Plugin 'tpope/vim-scriptease' Plugin 'tpope/vim-sensible' Plugin 'tpope/vim-surround' Plugin 'tpope/vim-unimpaired' +Plugin 'bling/vim-airline' +Plugin 'bling/vim-bufferline' +Plugin 'edkolev/tmuxline.vim' filetype plugin indent on syntax on @@ -80,7 +81,7 @@ let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$', \ '\.out$', '\.log$','\.aux$','\.sty$', \ '\.fdb_latexmk$', '\.synctex.gz$','\.latexmain$'] -"" Options +"" Options " Tabs and indent set smartindent @@ -141,7 +142,7 @@ set clipboard=unnamedplus try | colorscheme solarized | catch | endtry " General -nnoremap <Leader>te :tabedit +nnoremap <Leader>te :tabedit nnoremap <Leader>tn :tabnew<cr> nnoremap <Leader>to :tabonly<cr> nnoremap <Leader>w :w<cr> @@ -149,10 +150,11 @@ nnoremap <Leader>q :q!<cr> nnoremap <Leader>h :set hlsearch!<cr> nnoremap <Leader>n :set relativenumber!<cr> nnoremap <Leader>sp :set paste!<cr> -nnoremap <Leader>sv :source ~/.vim/vimrc<cr> +nnoremap <Leader>sv :source ~/.vimrc<cr> nnoremap <Leader>sc :source %<cr> nnoremap <Leader>es :UltiSnipsEdit<Return> nnoremap <Leader>i mxgg=G'x +nnoremap <Leader>sw :%s/\s\+$//<cr> nnoremap <tab> <C-^> @@ -167,9 +169,11 @@ nnoremap <c-e> 3<c-e> " Dvorak specific nnoremap : , +vnoremap : , nnoremap , : +vnoremap , : -"" Latex +"" Latex let g:tex_fast="" "" Autocommands @@ -182,3 +186,12 @@ augroup END if has('nvim') tmap jk <C-\><C-n> endif + +let g:airline_section_x = '' +let g:airline_section_y = '' +let g:airline_theme='solarized' +let g:tmuxline_theme='airline' +let g:airline_right_sep='' +let g:airline_left_sep='' +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':' '} @@ -78,7 +78,7 @@ alias gco='git checkout' # Configuration alias ez='vim ~/.zshrc' alias em='vim ~/.mutt/muttrc' -alias ev='vim ~/.vim/vimrc' +alias ev='vim ~/.vimrc' alias eza='vim ~/.zathurarc' alias et='vim ~/.tmux.conf' alias evi='vim ~/.vifm/vifmrc' |