some vim cleanup

gvimrc

@@ -1,3 +1,4 @@
+" solarized for gvim
 set guioptions=aegimLl
 set mouse=a
 set guifont=Fantasque\ Sans\ Mono\ 11

vimplugins

@@ -3,62 +3,40 @@ autocmd BufRead *vimplugins set ft=vim
 autocmd BufRead *bashplugins set ft=sh
 
 " enable plugins
-set noshowmode
 source ~/.vim/plugged/vim-plug/plug.vim
 silent!call plug#begin('~/.vim/plugged')
 " plugin manager for self updates
 Plug 'junegunn/vim-plug'
 
 " general plugins
-Plug 'Lokaltog/vim-easymotion'         "easy motion
 Plug 'directionalWindowResizer'        "resize windows with simple hotkeys
 Plug 'jeetsukumaran/vim-buffergator'   "buffer management
 Plug 'junegunn/vim-easy-align'         "aligning
 Plug 'mhinz/vim-signify'               "version control system gutter info
 Plug 'nvie/vim-togglemouse'            "hotkey to toggle mouse
-Plug 'vim-airline/vim-airline'         "airline
-Plug 'vim-airline/vim-airline-themes'  "themes for airline
 Plug 'ctrlpvim/ctrlp.vim'              "fuzzy file search
 Plug 'tpope/vim-fugitive'              "moar git awesomeness
 Plug 'vimwiki/vimwiki'                 "vimwiki
 Plug 'sheerun/vim-polyglot'            "syntax
 
-" python, uncomment when needed
+" IDE liek, per filetype
 Plug 'neomake/neomake', { 'for': 'python' }      "linter
 Plug 'davidhalter/jedi-vim', { 'for': 'python' } "python support
 Plug 'ervandew/supertab', { 'for': 'python' }    "TAB autocompletion
 
 " colorschemes
 Plug 'lifepillar/vim-solarized8'
-"Plug 'cocopon/iceberg.vim'
-"Plug 'whatyouhide/vim-gotham'
-"Plug 'KeitaNakamura/neodark.vim'
-"Plug 'morhetz/gruvbox'
+Plug 'KeitaNakamura/neodark.vim'
 
 " syntax highlight plugins
 Plug 'neilhwatson/vim_cf3'
 call plug#end()
 
-" easymotion options
-let g:EasyMotion_do_mapping=0
-let g:EasyMotion_smartcase=1
-nmap f <Plug>(easymotion-s)
-map <Leader>j <Plug>(easymotion-j)
-map <Leader>k <Plug>(easymotion-k)
-
-" airline options
-let g:airline_symbols={}
-let g:airline_symbols.whitespace='!'
-let g:airline_powerline_fonts=1
-let g:airline_exclude_preview=1
-let g:airline_extensions=['hunks']
-let g:airline_section_z='%3p%% %{g:airline_symbols.linenr}%4l:%3v'
-
 " buffergator options
 map <Leader><Tab> :BuffergatorToggle<CR>
 
 " signify options
-let g:signify_vcs_list=[ 'svn', 'git', 'fossil' ]
+let g:signify_vcs_list=[ 'git', 'fossil' ]
 let g:signify_sign_change='~'
 
 " vim-togglemouse options
@@ -83,6 +61,8 @@ let g:neomake_info_sign={
             \ 'texthl': 'InfoMsg',
             \ }
 
-if expand('%:r') == 'index.wiki'
-    set titlestring=vimwiki
+if has('gui_running')
+    colorscheme neodark
+else
+    colorscheme solarized8_light
 endif

vimrc

@@ -13,7 +13,7 @@ set noerrorbells visualbell t_vb=
 set tabstop=3 softtabstop=4 shiftwidth=4 smarttab expandtab
 " status line
 set wildmenu showcmd ruler laststatus=2
-set statusline=%F%m%r%h%w\ [FORMAT=%{&ff}]\ [TYPE=%Y]\ [POS=%04l,%04v][%p%%]\ [LEN=%L]
+set statusline=%F\ %m%r%h%w%=%y\ [%{&ff}]\ [%4l/%L:%3v]\ [%3p%%]
 " termcap fixes
 set t_Co=256 t_ut= termencoding=utf-8 encoding=utf-8
 " enable case indentation
@@ -23,6 +23,9 @@ if has("nvim") || v:version >= 800
     set breakindent
     set keymap=russian-jcukenwintype iminsert=0 imsearch=0
     inoremap <C-@> <C-^>
+    cnoremap <C-@> <C-^>
+    inoremap <C-Space> <C-^>
+    cnoremap <C-Space> <C-^>
 endif
 if has("nvim") || v:version >= 703
     set colorcolumn=80 relativenumber
@@ -30,16 +33,16 @@ if has("nvim") || v:version >= 703
 endif
 
 " maps
-map <Space> <leader>
+" leader
+map <Space> <NOP>
+let mapleader="\<Space>"
+" no more F1
 noremap <F1> <Esc>
 " some toggles
 nnoremap <Leader>n :setlocal number!<CR>
 nnoremap <Leader>l :setlocal list!<CR>
 nnoremap <Leader>c :setlocal cursorline!<CR>
 nnoremap <Leader>/ :nohls<CR>
-"make wrapped lines navigation easier
-noremap <silent> <expr> j (v:count == 0 ? 'gj' : 'j')
-noremap <silent> <expr> k (v:count == 0 ? 'gk' : 'k')
 "home / end
 nnoremap H ^
 nnoremap L $
@@ -64,8 +67,9 @@ nnoremap <Leader>w :w<CR>
 let plugins = expand("$HOME/.vimplugins")
 if filereadable(plugins)
     execute 'source ' . fnameescape(plugins)
+else
+    colorscheme solarized8_light
 endif
 
-colorscheme solarized8_light
 syntax on
 filetype plugin on

xresources

@@ -25,6 +25,7 @@ URxvt.fading:           5
 URxvt.pastableTabs:     true
 URxvt.geometry:         120:36
 URxvt.intensityStyles:  false
+URxvt.secondaryScroll:  false
 
 ! urxvt perl extensions
 URxvt.perl-ext-common:  default,matcher,clipboard