From cf3311e4eeb1515691e89728b8a5a2527740433d Mon Sep 17 00:00:00 2001
From: Von Random <von@mechanus.net>
Date: Wed, 11 May 2016 18:32:30 +0300
Subject: [PATCH] back to solarized, since there is still no better vim theme
 yet, truecolor may wait

---
 rc.lua    |  2 +-
 shellrc   |  8 ++++----
 tmux.conf |  1 -
 vimrc     | 10 ++++++----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/rc.lua b/rc.lua
index 1a500d8..0a7332c 100644
--- a/rc.lua
+++ b/rc.lua
@@ -763,7 +763,7 @@ client.connect_signal(
 -- don't forget you sync this file
 -- this shit runs every time you restart your wm, dumbass.
 ---- set keyboard layouts
-awful.util.spawn_with_shell('setxkbmap -layout us,ru -variant altgr-intl,typewriter -option ctrl:nocaps,grp:win_space_toggle,grp_led:scroll,compose:menu')
+awful.util.spawn_with_shell('setxkbmap -layout us,ru -variant altgr-intl,typewriter -option ctrl:nocaps,grp:win_space_toggle,grp_led:caps,compose:menu')
 ---- populate xrdb with .Xresources config
 if exists('/home/von/.Xresources') then
 	awful.util.spawn_with_shell('xrdb /home/von/.Xresources')
diff --git a/shellrc b/shellrc
index 2dd192e..04b4615 100644
--- a/shellrc
+++ b/shellrc
@@ -33,9 +33,6 @@ dotfiles="${HOME}/vdotfiles"
 comp_enabled=true
 vcs_enabled=true
 
-# nvim true color
-export NVIM_TUI_ENABLE_TRUE_COLOR=1
-
 export MYSQL_PS1="mysql [\d]> "
 export SSH_AUTH_SOCK="${HOME}/.ssh/ssh_auth_sock"
 export TIME_STYLE='long-iso'
@@ -88,9 +85,12 @@ fi
 alias la='ls -FA'
 alias ll='ls -lha'
 alias ld='ls -lhda'
+
+# diff and colordiff
 if is_exec colordiff; then
-	alias diff='command colordiff'
+	alias diff='command colordiff -u'
 fi
+alias rdiff='diff -urx.svn'
 
 # mount
 alias mountiso='sudo mount -t iso9660 -o loop'
diff --git a/tmux.conf b/tmux.conf
index d61c2ec..8e0b46c 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -42,7 +42,6 @@ set -g set-titles "off"
 set -g status-left-length "20"
 set -g status-right-length "40"
 set -g terminal-override "rxvt-unicode*:sitm@,ritm@"
-set -g terminal-override "*-*:Tc"
 set -g default-terminal "screen-256color"
 set -g status-position "top"
 set -g status-justify "centre"
diff --git a/vimrc b/vimrc
index 834e4a7..61d1e19 100644
--- a/vimrc
+++ b/vimrc
@@ -1,7 +1,6 @@
 set nocompatible
-set background=dark
+set background=light
 set backspace=indent,eol,start
-set cursorline
 set foldmethod=marker
 set history=50
 set hlsearch
@@ -91,7 +90,6 @@ if v:version >= 700
 
 		" colorschemes
 		Plug 'vdrandom/forked-solarized.vim'
-		Plug 'NLKNguyen/papercolor-theme'
 
 		" syntax highlight plugins
 		Plug 'puppetlabs/puppet-syntax-vim'
@@ -108,6 +106,7 @@ if v:version >= 700
 		" lightline options
 		" 'active': { 'right': [ ['lineinfo', 'percent'] ] },
 		let g:lightline = {
+			\ 'colorscheme':  'solarized_dark',
 			\ 'separator':    { 'left': "\ue0b0", 'right': "\ue0b2" },
 			\ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" },
 			\ 'component':    { 'readonly': '%{&readonly?"\ue0a2":""}' },
@@ -142,7 +141,10 @@ if v:version >= 700
 		set mouse=
 	endif
 
-	colorscheme PaperColor
+	let g:solarized_bold=0
+	let g:solarized_italic=0
+	let g:solarized_visibility='low'
+	colorscheme solarized
 else
 	set statusline=%F%m%r%h%w\ [FORMAT=%{&ff}]\ [TYPE=%Y]\ [POS=%04l,%04v][%p%%]\ [LEN=%L]