diff options
| -rw-r--r-- | i3/.config/i3blocks/config | 4 | ||||
| -rw-r--r-- | tmux/.tmux.conf | 3 | ||||
| -rw-r--r-- | vim/.vimrc | 16 | ||||
| -rw-r--r-- | zsh/.zshrc | 1 |
4 files changed, 18 insertions, 6 deletions
diff --git a/i3/.config/i3blocks/config b/i3/.config/i3blocks/config index 93850ee..bd9357e 100644 --- a/i3/.config/i3blocks/config +++ b/i3/.config/i3blocks/config @@ -31,13 +31,13 @@ signal=1 [primary] label=<span color='gray'></span> -command=echo "$(xclip -o | cut -c1-9)" +command=echo "$(xclip -o | cut -c1-9 | sed -e 's/[^a-zA-Z0-9\-]/_/g')" min_width=15 interval=5 [clipboard] label=<span color='gray'></span> -command=echo "$(xclip -o -selection "clipboard" | cut -c1-9)" +command=echo "$(xclip -o -selection "clipboard" | cut -c1-9 | sed -e 's/[^a-zA-Z0-9\-]/_/g')" instance=Master interval=5 diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index d99acac..71bc79d 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -18,4 +18,7 @@ bind -n C-Right next-window bind-key P swap-window -t -1 bind-key N swap-window -t +1 +WINTAB_BOUNDARY=create +WINTAB_MODE=wintab +WINTAB_ROOT=$HOME/Dropbox/projects/vim-wintab source-file $WINTAB_ROOT/wintab.tmux.conf @@ -61,7 +61,8 @@ Plug 'tpope/vim-sensible' Plug 'tpope/vim-surround' Plug 'tpope/vim-unimpaired' Plug 'urbainvaes/vim-remembrall' -Plug 'urbainvaes/vim-wintab' +" Plug 'urbainvaes/vim-wintab' +Plug '~/Dropbox/projects/vim-wintab' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' Plug 'vim-scripts/ReplaceWithRegister' @@ -236,6 +237,9 @@ let g:vimtex_view_method='zathura' let g:vimtex_quickfix_mode=2 let g:vimtex_compiler_progname='nvr' +let g:wintab_boundary='create' +let g:wintab_mode='wintab' + " YouCompleteMe let g:ycm_key_list_select_completion = ['<C-n>', '<Down>'] let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>'] @@ -324,6 +328,7 @@ nmap [w <Plug>AddWhiteSpaceBefore nnoremap <Leader>w :update<cr> nnoremap <Leader>q :q<cr> nnoremap <Leader>d :bd!<cr> +nnoremap <nowait> <c-d> :q<cr> nnoremap ,bd :ls<cr>:bd<space> @@ -427,15 +432,18 @@ augroup vimrc " Filetype specific autocmd FileType cmake setlocal commentstring=#%s autocmd FileType cpp setlocal commentstring=//%s - autocmd FileType dirvish setlocal errorformat=%f - autocmd FileType dirvish setlocal relativenumber - autocmd FileType dirvish silent! unmap <buffer> <C-p> autocmd FileType freefem comp freefem autocmd FileType gmsh setlocal makeprg=gmsh\ % autocmd FileType gnuplot setlocal commentstring=#%s autocmd FileType gnuplot setlocal makeprg=gnuplot\ % autocmd FileType python setlocal makeprg=python\ % autocmd FileType tex setlocal spell + + " Dirvish + autocmd FileType dirvish nnoremap <buffer> t :!touch % + autocmd FileType dirvish setlocal errorformat=%f + autocmd FileType dirvish setlocal relativenumber + autocmd FileType dirvish silent! unmap <buffer> <C-p> augroup END " }}} @@ -142,6 +142,7 @@ alias vs="vim -S Session.vim" alias g='git' alias ga='git add' alias gc='git commit' +alias gco='git checkout' alias gd='git diff' alias gl='git pull' alias gp='git push' |