From 5252fc5cd34a060d7545ce91df594c6416c237e2 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Sun, 13 May 2018 15:21:50 -0700
Subject: [PATCH] Tidy vimrc

---
 home/.vimrc   | 37 +++++++++++++++----------------------
 home/.xinitrc |  2 +-
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/home/.vimrc b/home/.vimrc
index c9c72cb5..721cc5a9 100644
--- a/home/.vimrc
+++ b/home/.vimrc
@@ -1,24 +1,18 @@
-" A few sane defaults for use in ArchLabs
+" Sane vim defaults for ArchLabs
 
-" load Arch Linux defaults
+" Arch defaults
 runtime! archlinux.vim
 
-" system clipboard (requires +clipboard)
-set clipboard^=unnamedplus
 
-" enable line numbers
-set number
-
-" ask confirmation for some things, like save when quiting, etc.
-set confirm
-
-" Tab completion menu when using command mode
-set wildmenu
-
-set expandtab           " Tab key inserts spaces not tabs
-set softtabstop=4       " spaces to enter for each tab
-set shiftwidth=4        " amount of spaces for indentation
-set shortmess+=aAcIws   " Hide or shorten certain messages
+set modeline
+set clipboard^=unnamedplus  " system clipboard (requires +clipboard)
+set number                  " enable line numbers
+set confirm                 " ask confirmation for some things, like save before quit, etc.
+set wildmenu                " Tab completion menu when using command mode
+set expandtab               " Tab key inserts spaces not tabs
+set softtabstop=4           " spaces to enter for each tab
+set shiftwidth=4            " amount of spaces for indentation
+set shortmess+=aAcIws       " Hide or shorten certain messages
 
 " enable mouse.. sgr is better but not every term supports it
 set mouse=a
@@ -35,26 +29,25 @@ endif
 " paste while in insert mode
 inoremap <silent><C-v> <Esc>:set paste<CR>a<C-r>+<Esc>:set nopaste<CR>a
 
-" changed default mappings
+" alt defaults
 nnoremap 0 ^
 nnoremap Y y$
 nnoremap n nzzzv
 nnoremap N Nzzzv
 nnoremap <Tab> ==j
 
-" gj/k but preserve numbered jumps ie. 12j or 30k
+" j=gj k=gk but preserve numbered jumps ie. 12j or 30k
 nnoremap <buffer><silent><expr>j v:count ? 'j' : 'gj'
 nnoremap <buffer><silent><expr>k v:count ? 'k' : 'gk'
 
-" Reload changes if file changed outside of vim
-" requires autoread (enabled by default)
+" Reload changes if file changed outside of vim requires autoread
 augroup load_changed_file
     autocmd!
     autocmd FocusGained,BufEnter * if mode() !=? 'c' | checktime | endif
     autocmd FileChangedShellPost * echo "Changes loaded from file"
 augroup END
 
-" when quitting, save cursor position
+" when quitting a file, save the cursor position
 augroup save_cursor_position
     autocmd!
     autocmd BufReadPost * call setpos(".", getpos("'\""))
diff --git a/home/.xinitrc b/home/.xinitrc
index ee49c026..f735bce5 100755
--- a/home/.xinitrc
+++ b/home/.xinitrc
@@ -2,7 +2,7 @@
 
 # this file is executed when calling startx
 
-# To run different WM, run:
+# To run a different WM, set session="WM" below, or run:
 #    startx ~/.xinitrc WM