From b2100914bb16ac21fbdb662886d01815fa70e1a4 Mon Sep 17 00:00:00 2001
From: Von Random <von@vdrandom.org>
Date: Tue, 21 Jun 2016 11:48:21 +0300
Subject: [PATCH] enable modeline, disable mouse in vim, also dont switch from
 koi8-r in shell

---
 shellrc | 12 +++++++-----
 vimrc   |  5 +----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/shellrc b/shellrc
index 538c0c4..697d4b6 100644
--- a/shellrc
+++ b/shellrc
@@ -36,11 +36,13 @@ vcs_enabled=true
 export MYSQL_PS1="mysql [\d]> "
 export SSH_AUTH_SOCK="${HOME}/.ssh/ssh_auth_sock"
 export TIME_STYLE='long-iso'
-export LANG='en_US.utf8'
-export LANGUAGE="$LANG"
-if [[ ${OSTYPE} != 'cygwin' ]]; then
-	export LC_TIME='en_DK.utf8'
-	export LC_MEASUREMENT='en_DK.utf8'
+if [[ ${LANG} != 'ru_RU.KOI8-R' ]]; then
+	export LANG='en_US.utf8'
+	export LANGUAGE="$LANG"
+	if [[ ${OSTYPE} != 'cygwin' ]]; then
+		export LC_TIME='en_DK.utf8'
+		export LC_MEASUREMENT='en_DK.utf8'
+	fi
 fi
 export EDITOR='vim'
 export PAGER='less -R'
diff --git a/vimrc b/vimrc
index 999ea82..7bfee6d 100644
--- a/vimrc
+++ b/vimrc
@@ -21,7 +21,6 @@ set noerrorbells visualbell t_vb=
 set shiftwidth=3
 set tabstop=3
 set noexpandtab
-set nomodeline
 
 " 256 colours at almost all times
 if $TERM =~ '^[xterm|rxvt-unicode|screen]'
@@ -138,10 +137,8 @@ if v:version >= 700
 		set guicursor+=a:blinkon0               "and none of them should blink
 		map <S-Insert> <MiddleMouse>
 		map! <S-Insert> <MiddleMouse>
-	elseif empty($TMUX) && $TERM =~ "^screen"
-		set mouse=
 	else
-		set mouse=a
+		set mouse=
 	endif
 
 	let g:solarized_bold=0