From 540dafe4ae4eea5d311562d8774bb6203ac067cd Mon Sep 17 00:00:00 2001
From: Von Random <von@vdrandom.org>
Date: Thu, 23 Nov 2017 02:36:11 +0300
Subject: [PATCH] some new vim keymaps

---
 tmux.conf  |  1 +
 vimplugins |  1 +
 vimrc      | 19 +++++--------------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/tmux.conf b/tmux.conf
index e9d305f..0a56061 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -29,6 +29,7 @@ set -g status-left-length "20"
 set -g status-right-length "40"
 set -g default-terminal "tmux"
 set -g terminal-overrides ',xterm-256color:Tc'
+set -g terminal-overrides ',rxvt-unicode:Tc'
 set -g status-position "bottom"
 set -g status-justify "left"
 set -g status-left-length "100"
diff --git a/vimplugins b/vimplugins
index 81f5437..424ce51 100644
--- a/vimplugins
+++ b/vimplugins
@@ -22,6 +22,7 @@ Plug 'w0rp/ale', { 'for': 'python' }
 
 " colorschemes
 Plug 'lifepillar/vim-solarized8'
+Plug 'KeitaNakamura/neodark.vim'
 
 " syntax highlight plugins
 Plug 'sheerun/vim-polyglot'
diff --git a/vimrc b/vimrc
index 6587916..6992826 100644
--- a/vimrc
+++ b/vimrc
@@ -1,6 +1,6 @@
 " various settings
-set nobackup number nomodeline backspace=indent,eol,start
-set bg=light foldmethod=marker ttymouse=xterm2 mouse=
+set nobackup nomodeline backspace=indent,eol,start foldmethod=marker mouse=
+set cursorline bg=light
 " hidden characters
 set list listchars=tab:\|_,nbsp:x,trail:*
 " search
@@ -20,7 +20,7 @@ set statusline=[%F]\ %R%H%W%M\ %=[%{&fenc}/%{&ff}]\ %y\ [%4l/%L:%3v]
 let g:sh_indent_case_labels=1
 " version specific settings
 if v:version >= 703
-    set colorcolumn=80 relativenumber formatoptions+=j
+    set colorcolumn=80 relativenumber formatoptions+=j ttymouse=sgr
 endif
 if v:version >= 800
     set breakindent
@@ -38,16 +38,11 @@ inoremap <F1> <Esc>
 lnoremap <F1> <Esc>
 cnoremap <F1> <Esc>
 "some toggles
-nnoremap <Leader>n :setlocal number!<CR>
-nnoremap <Leader>r :setlocal relativenumber!<CR>
 nnoremap <Leader>l :setlocal list!<CR>
 nnoremap <Leader>c :setlocal cursorline!<CR>
-nnoremap <Leader>v :setlocal wrap!<CR>
+nnoremap <Leader>w :setlocal wrap!<CR>
 "turn off highlight until next search
 nnoremap <Leader>/ :noh<CR>
-"home / end
-noremap H ^
-noremap L $
 "copy to / paste from clipboard
 vmap <Leader>y "+y
 vmap <Leader>d "+d
@@ -56,13 +51,9 @@ nmap <Leader>P "+P
 vmap <Leader>p "+p
 vmap <Leader>P "+P
 "move macro somewhere I won't accidentally use it
-noremap Q q
 noremap q <NOP>
 "quit / save
-nnoremap qq :q<CR>
-nnoremap qf :q!<CR>
-nnoremap qa :qa<CR>
-nnoremap qs :wq<CR>
+nnoremap <Leader>q :q<CR>
 nnoremap <Leader>s :w<CR>
 
 " mouse toggle