From 0c80bd0e1e05ecfec98439df531ccd18facc6d09 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Thu, 1 Aug 2019 00:25:20 -0400
Subject: [PATCH] vim: use 1 space tabs by default (overridden by vconf)

---
 vim/vconf | 12 +++++++-----
 vim/vimrc | 27 ++++++++++++++-------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/vim/vconf b/vim/vconf
index 8811867..0b78636 100644
--- a/vim/vconf
+++ b/vim/vconf
@@ -1,13 +1,15 @@
 " vim: syntax=vim:
 
-let _agw.columns=80
-let _agw.rows=24
+" settings for workstations - servers need not apply ;)
 let _agw.cr_scheme=-1
-let _agw.use_number=1
+let _agw.g_columns=80
+let _agw.g_rows=24
+let _agw.tab_wid=3
+let _agw.use_ft=1
 let _agw.use_list=1
+let _agw.use_number=1
+let _agw.use_ruby=1
 let _agw.use_tagbar=0
 let _agw.use_vsp=0
-let _agw.use_ruby=1
-let _agw.use_ft=1
 
 " EOF
diff --git a/vim/vimrc b/vim/vimrc
index d220312..625512f 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -48,16 +48,17 @@ let _agw.colors=[
 \	'base16-unikitty-dark',
 \]
 
-let _agw.columns=80    " GUI columns
-let _agw.rows=24       " GUI rows
 let _agw.cr_scheme=-2  " color from s:colors, -1=random, -2=default
-let _agw.use_number=0  " 0=no number, 1=enable relativenumber, 2=enable number
+let _agw.g_columns=80  " GUI columns
+let _agw.g_rows=24     " GUI rows
+let _agw.tab_wid=1     " Tab width
+let _agw.use_ft=0      " enable filetype plugins
 let _agw.use_list=1    " enable whitespace visibility (2=also newlines)
+let _agw.use_number=0  " 0=no number, 1=enable relativenumber, 2=enable number
+let _agw.use_rainbow=0 " enable rainbow addon
+let _agw.use_ruby=0    " enable ruby scripts
 let _agw.use_tagbar=0  " enable tagbar addon
 let _agw.use_vsp=0     " enable vertical split on enter
-let _agw.use_ruby=0    " enable ruby scripts
-let _agw.use_rainbow=0 " enable rainbow addon
-let _agw.use_ft=0      " enable filetype plugins
 
 runtime! vconf
 
@@ -155,12 +156,12 @@ set noshowmode
 if _agw.use_number == 1
 	set numberwidth=2
 	set relativenumber
-	let _agw.columns+=2
+	let _agw.g_columns+=2
 elseif _agw.use_number == 2
 	set numberwidth=4
 	set relativenumber
 	set number
-	let _agw.columns+=4
+	let _agw.g_columns+=4
 endif
 
 set colorcolumn=80
@@ -209,15 +210,15 @@ set smartcase
 set ignorecase
 set incsearch
 
-" tabulation (3 space hard tabs, auto-indent when my muscle memory demands it)
+" tabulation (hard tabs, auto-indent when my muscle memory demands it)
 set autoindent
 set smarttab
 set noexpandtab
 set copyindent
 set preserveindent
 set softtabstop=0
-set shiftwidth=3
-set tabstop=3
+let &shiftwidth=_agw.tab_wid
+let &tabstop=_agw.tab_wid
 
 " limits, what/when/how to save and encodings
 set undolevels=10000
@@ -284,8 +285,8 @@ if has('gui_running')
 	set guioptions=agit
 	set guitablabel=%N.%t
 
-	let &lines=_agw.rows
-	let &columns=_agw.columns
+	let &lines=_agw.g_rows
+	let &columns=_agw.g_columns
 else
 	" use high-color terminal capabilities
 	let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"