From acc0aa52ac065bb1ad410be1816bdc1021041e28 Mon Sep 17 00:00:00 2001
From: Von Random <von@vdrandom.org>
Date: Mon, 22 Aug 2016 12:27:33 +0300
Subject: [PATCH] change in plugin set for vim + fixkb as a function, gotta do
 both anyway

---
 shellrc | 7 +++++--
 vimrc   | 3 +--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/shellrc b/shellrc
index 8d1924f..95c6cf2 100644
--- a/shellrc
+++ b/shellrc
@@ -63,8 +63,6 @@ alias fixterm='printf "c"'
 alias vi='command vim'
 alias pg-linux-client='command sudo -u postgres psql'
 alias mysql='mysql --sigint-ignore'
-alias kblayouts='setxkbmap -layout us,ru -variant altgr-intl,typewriter -option ctrl:nocaps,grp:win_space_toggle,grp_led:caps,compose:menu'
-alias kbfix='xkbcomp $DISPLAY - | egrep -v "group . = AltGr;" | xkbcomp - $DISPLAY'
 
 # iconv
 alias iconvwk='command iconv -c -f cp1251 -t koi8-r'
@@ -135,6 +133,11 @@ tmuxrc() { tmux source-file "${HOME}/.tmux.conf"; tmux display-message "Config r
 
 if [[ -z "${DISPLAY}" ]]; then
 	x() { exec xinit -- :0 -nolisten tcp vt$XDG_VTNR; }
+else
+	fixkb() {
+		setxkbmap -layout us,ru -variant altgr-intl,typewriter -option ctrl:nocaps,grp:win_space_toggle,grp_led:caps,compose:menu
+		xkbcomp $DISPLAY - | egrep -v "group . = AltGr;" | xkbcomp - $DISPLAY 2>/dev/null
+	}
 fi
 
 # }}}
diff --git a/vimrc b/vimrc
index e91a9d3..d07914c 100644
--- a/vimrc
+++ b/vimrc
@@ -91,8 +91,7 @@ if v:version >= 700
 		Plug 'vdrandom/forked-solarized.vim'
 
 		" syntax highlight plugins
-		Plug 'puppetlabs/puppet-syntax-vim'
-		Plug 'nagios-syntax'
+		Plug 'neilhwatson/vim_cf3'
 		call plug#end()
 
 		" easymotion options