diff options
| -rw-r--r-- | .Xdefaults | 4 | ||||
| -rw-r--r-- | .config/htop/htoprc | 6 | ||||
| -rw-r--r-- | .gitconfig | 5 | ||||
| -rw-r--r-- | .gitmodules | 6 | ||||
| m--------- | .vim/bundle/YouCompleteMe | 0 | ||||
| m--------- | .vim/bundle/splice.vim | 0 | ||||
| m--------- | .vim/bundle/unite.vim | 0 | ||||
| m--------- | .vim/bundle/vimproc.vim | 0 | ||||
| -rw-r--r-- | .vimrc | 40 | ||||
| -rw-r--r-- | .xinitrc | 4 | ||||
| -rw-r--r-- | .zshrc | 6 |
11 files changed, 59 insertions, 12 deletions
@@ -1,5 +1,5 @@ -URxvt*font: xft:DejaVu\ Sans\ Mono:size=9:antialias=true,xft:unifont -URxvt*boldFont: xft:DejaVu\ Sans\ Mono:size=9:bold,xft:unifont +URxvt*font: xft:DejaVu\ Sans\ Mono:size=10:antialias=true,xft:unifont +URxvt*boldFont: xft:DejaVu\ Sans\ Mono:size=10:bold,xft:unifont ! xterm xterm*faceName: DejaVu Sans Mono:pixelsize=12 diff --git a/.config/htop/htoprc b/.config/htop/htoprc index 2030b99..ce059de 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -1,7 +1,7 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # The parser is also very primitive, and not human-friendly. fields=0 48 17 18 38 39 40 2 46 47 62 63 49 1 -sort_key=63 +sort_key=46 sort_direction=1 hide_threads=0 hide_kernel_threads=0 @@ -11,7 +11,7 @@ show_thread_names=1 highlight_base_name=1 highlight_megabytes=1 highlight_threads=1 -tree_view=1 +tree_view=0 header_margin=1 detailed_cpu_time=1 cpu_count_from_zero=0 @@ -20,6 +20,6 @@ account_guest_in_cpu_meter=0 color_scheme=0 delay=15 left_meters=Memory Swap CPU LeftCPUs2 -left_meter_modes=1 1 1 1 +left_meter_modes=1 1 2 1 right_meters=Tasks LoadAverage Uptime RightCPUs2 right_meter_modes=2 2 2 1 @@ -40,9 +40,14 @@ cmd = vim -f \"$MERGED\" [mergetool "vimdiff3"] cmd = vim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" +[mergetool "splice"] + cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'" + trustExitCode = true [core] excludesfile = ~/.gitignore compression = 9 attributesfile = ~/git/dotfiles/.gitattributes [log] decorate = full +[gc] + autopacklimit = 20 diff --git a/.gitmodules b/.gitmodules index edcd438..022bad1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -70,3 +70,9 @@ [submodule ".vim/bundle/vim-snippets"] path = .vim/bundle/vim-snippets url = https://github.com/honza/vim-snippets.git +[submodule ".vim/bundle/unite.vim"] + path = .vim/bundle/unite.vim + url = https://github.com/Shougo/unite.vim.git +[submodule ".vim/bundle/splice.vim"] + path = .vim/bundle/splice.vim + url = https://github.com/sjl/splice.vim.git diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe -Subproject 31918411ff6d207d1e2f4cb2fa87a8c3f6bf599 +Subproject 31e5fa6d280bf15a5b3a14736203ceac9e92149 diff --git a/.vim/bundle/splice.vim b/.vim/bundle/splice.vim new file mode 160000 +Subproject 4d322d823563f6fd2d72c129b1e99f5a98060fa diff --git a/.vim/bundle/unite.vim b/.vim/bundle/unite.vim new file mode 160000 +Subproject f8c0c00cf33f61663bdc02aa3b3a4565d86162e diff --git a/.vim/bundle/vimproc.vim b/.vim/bundle/vimproc.vim -Subproject 11bd6853b25f73f3729cccbb9282fecade2bf50 +Subproject 6b8b3c724e161f39c0938046a2072f9668fc802 @@ -69,6 +69,8 @@ Plugin 'scrooloose/syntastic' Plugin 'Valloric/YouCompleteMe' Plugin 'SirVer/ultisnips' Plugin 'honza/vim-snippets' +Plugin 'Shougo/unite.vim' +Plugin 'Shougo/vimproc.vim' Plugin 'tpope/vim-unimpaired' Plugin 'tpope/vim-fugitive' @@ -82,6 +84,8 @@ Plugin 'majutsushi/tagbar' Plugin 'adoy/vim-php-refactoring-toolbox' Plugin 'shawncplus/phpcomplete.vim' +Plugin 'sjl/splice.vim' + call vundle#end() syntax on filetype plugin indent on @@ -126,6 +130,9 @@ nnoremap <C-s> :w<cr> inoremap <C-c> <esc>:q<cr> nnoremap <C-c> :q<cr> +noremap <C-h> :nohl<CR> +inoremap <C-h> <ESC>:nohl<CR>a + " fix some keycodes set <C-Right>=[C set <C-Left>=[D @@ -164,7 +171,7 @@ let python_highlight_all = 1 " Ultisnips let g:UltiSnipsJumpForwardTrigger="<tab>" let g:UltiSnipsExpandTrigger="<c-j>" -let g:UltiSnipsListSnippets="<c-e>" +let g:UltiSnipsListSnippets="<c-l>" let g:UltiSnipsUsePythonVersion=2 let g:UltiSnipsEditSplit="vertical" @@ -176,6 +183,32 @@ let g:tagbar_autoclose=1 " syntastic let g:syntastic_check_on_open = 1 +" unite +let g:unite_source_history_yank_enable = 1 +call unite#filters#matcher_default#use(['matcher_fuzzy']) +call unite#filters#sorter_default#use(['sorter_rank']) + +call unite#custom#profile('default', 'context', + \ { 'prompt': '➤ ', + \ 'start_insert' : '1'}) + +function! s:unite_settings() + let b:SuperTabDisabled=1 + inoremap <silent> <buffer><expr> <Leader>v unite#do_action('right') + inoremap <silent> <buffer><expr> <Leader>s unite#do_action('below') + inoremap <silent> <buffer> <c-e> <end> + inoremap <silent> <buffer> <c-a> <home> + imap <silent> <buffer> <tab> <plug>(unite_complete) +endfunction + +" Custom mappings for the unite buffer +autocmd FileType unite call s:unite_settings() + +nnoremap <leader>w :<C-u>Unite -buffer-name=files -start-insert file<cr> +nnoremap <leader>q :<C-u>Unite -buffer-name=files -start-insert file_rec/async:!<cr> +nnoremap <leader>y :<C-u>Unite -buffer-name=yank history/yank<cr> +nnoremap <leader>b :<C-u>Unite -buffer-name=buffer buffer<cr> + " completion autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags @@ -195,8 +228,13 @@ autocmd FileType python set ts=4 sw=4 softtabstop=4 et " misc autocmd settings autocmd FileType make setlocal noexpandtab autocmd FileType text setlocal textwidth=78 +autocmd FileType plaintex setlocal textwidth=80 autocmd BufRead,BufNewFile PKGBUILD let is_bash=1 | set ft=sh +" move to first line in git commits +autocmd FileType gitcommit autocmd! BufEnter COMMIT_EDITMSG call setpos('.', [0, 1, 1, 0]) + + " colorscheme let g:jellybeans_background_color_256 = 'none' let g:jellybeans_overrides = { @@ -38,8 +38,8 @@ autostart () { rm -f $HOME/passwords.kdb.lock keepassx & transmission-remote-gtk & - thunderbird & - clipit & + claws-mail & + copyq & #$HOME/git/thetime/src/thetime -t "%F %H:%M:%S" -p 1921,1160 -f "xft:DejaVu Sans:size=10" } @@ -286,10 +286,6 @@ ls () { #echo "${MAGENTA}Files: ${BLUE}$(/bin/ls -l $@ | grep -v "^[l|d|total]" | wc -l) ${GREEN}--- ${MAGENTA}Directories: ${BLUE}$(/bin/ls -l $@ | grep "^d" | wc -l)${NC}" } -ctailf() { - tail -f "$@" | ccze -A -o nolookups -} - password() { if [[ -z $1 ]]; then count=8 @@ -505,6 +501,8 @@ alias vgfull='valgrind --leak-check=full --show-reachable=yes' alias is="iostat -Nyxm 2" +alias md='mysqldump -lc --skip-extended-insert' + # other random aliases alias ☠='pkill -9' alias nocomment='egrep -v "^\s*(#|$)"' |