diff options
| -rw-r--r-- | .Xdefaults | 2 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | .i3/conkyrc | 1 | ||||
| m--------- | .vim/bundle/YouCompleteMe | 0 | ||||
| m--------- | .vim/bundle/neomake | 0 | ||||
| -rw-r--r-- | .vimrc | 17 | ||||
| -rw-r--r-- | .xinitrc | 1 | ||||
| -rw-r--r-- | .zshrc | 6 |
8 files changed, 27 insertions, 3 deletions
@@ -106,7 +106,7 @@ xterm*foreground: #CCCCCC !-------------------- ! Cursor Theme !-------------------- -Xcursor.theme: Vienna3 +Xcursor.theme: Breeze_Snow !-------------------- ! xcalc colors by heartcore diff --git a/.gitmodules b/.gitmodules index ece7ac2..b5b1cf7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -106,3 +106,6 @@ [submodule ".vim/bundle/vim-action-ag"] path = .vim/bundle/vim-action-ag url = https://github.com/Chun-Yang/vim-action-ag.git +[submodule ".vim/bundle/neomake"] + path = .vim/bundle/neomake + url = https://github.com/neomake/neomake.git diff --git a/.i3/conkyrc b/.i3/conkyrc index 87e7714..9a5e438 100644 --- a/.i3/conkyrc +++ b/.i3/conkyrc @@ -20,6 +20,7 @@ TEXT ${if_match "${mpd_status}" == "Playing"}{ "full_text" : "${mpd_artist} - ${mpd_title} (${mpd_vol}%)", "color" : "\#d466138"},${endif} { "full_text" : "intern0 ${upspeed intern0}\u2191 ${downspeed intern0}\u2193", "color" : "\#00FF00"}, ${if_up guest0}{ "full_text" : "guest0 ${upspeed guest0}\u2191 ${downspeed guest0}\u2193", "color" : "\#FF0000"},${endif} + ${if_up usb0}{ "full_text" : "usb0 ${upspeed usb0}\u2191 ${downspeed usb0}\u2193", "color" : "\#FF0000"},${endif} # { "full_text" : "IO ${diskio_read}\u2191 ${diskio_write}\u2193"}, { "full_text" : "PA ${pa_sink_volume}%"}, { "full_text" : "/ ${fs_free /}"}, diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe -Subproject 95a44c22cf3d2d9a151f5a9e77824d1ea28ec82 +Subproject b20809332c3298cb954cff20006cb52955b54b2 diff --git a/.vim/bundle/neomake b/.vim/bundle/neomake new file mode 160000 +Subproject b2b71d8f220e2a020265899fac1df96e2dfe69a @@ -67,14 +67,16 @@ let g:tagbar_phpctags_bin='~/git/phpctags/bin/phpctags' let g:tagbar_phpctags_memory_limit = '512M' " }}} + filetype off set runtimepath+=/usr/share/vim set runtimepath+=~/.vim/bundle/vundle call vundle#begin() -Plugin 'scrooloose/syntastic' Plugin 'Valloric/YouCompleteMe' Plugin 'SirVer/ultisnips' +"Plugin 'scrooloose/syntastic' +Plugin 'neomake/neomake' Plugin 'honza/vim-snippets' Plugin 'Shougo/unite.vim' Plugin 'Shougo/vimproc.vim' @@ -172,6 +174,16 @@ nnoremap <silent> <C-W><C-Down> <c-w>J nnoremap <silent> <C-W>[A <c-w>K nnoremap <silent> <C-W>[B <c-w>J +nnoremap <silent> <C-W>[1;5C <c-w>L +nnoremap <silent> <C-W>[1;5D <c-w>H +nnoremap <silent> <C-W>[1;5A <c-w>K +nnoremap <silent> <C-W>[1;5B <c-w>J + +nnoremap <silent> [1;5C <c-w>l +nnoremap <silent> [1;5D <c-w>h +nnoremap <silent> [1;5A <c-w>k +nnoremap <silent> [1;5B <c-w>j + nnoremap <Up> gk nnoremap <Down> gj nnoremap j gj @@ -187,6 +199,9 @@ inoremap <F2> <ESC>:NERDTreeToggle<CR> let python_highlight_all = 1 +" Neomake +autocmd! BufRead,BufNewFile,BufWritePost * Neomake + " Syntastic let g:syntastic_enable_perl_checker = 1 @@ -23,6 +23,7 @@ numlockx xset -dpms xset r rate 250 50 & source $HOME/bin/gpg-agent.sh +echo UPDATESTARTUPTTY | gpg-connect-agent # autostart entries setxkbmap us altgr-intl @@ -465,7 +465,11 @@ alias grep='grep --color' alias dmesg='dmesg -T' alias vp='PAGER=vimpager' -alias v='vim' +if type nvim &>/dev/null && [[ -e "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/init.vim" ]] ; then + alias v='nvim' +elif type vim &>/dev/null; then + alias v='vim' +fi alias l='less' alias rf='readlink -f' |