From 997d87d5d6b6b702eb7690c54b2f675ed3a8c17a Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Mon, 29 Jun 2020 10:38:47 -0500
Subject: [PATCH] Vim: Reorganize vimrc

---
 .vimrc | 56 +++++++++++++++++---------------------------------------
 1 file changed, 17 insertions(+), 39 deletions(-)

diff --git a/.vimrc b/.vimrc
index c892a9bd..59540c8e 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,5 +1,8 @@
 execute pathogen#infect()
 
+syntax on
+filetype plugin indent on
+
 " Theming
 if $TERM != 'linux' && version >= 800
 	colorscheme breezy
@@ -7,10 +10,22 @@ if $TERM != 'linux' && version >= 800
 	set background=light
 endif
 
-syntax on
-filetype plugin indent on
+set autoread " Automatically read when a file is changed outside of Vim
+set clipboard=unnamedplus " Use XA_PRIMARY clipboard by default
+set encoding=utf-8
+set foldmethod=syntax
+set hidden " Allow buffer switching without saving
+set incsearch " Search while you type
+set laststatus=2 " Always show statusbar
 set list
 set listchars=tab:>·,trail:·
+set modeline
+set modelines=5
+set nofoldenable " Fuck autofolding
+set number relativenumber " Relative line numbering
+set t_Co=256
+set viminfo='20,<1000,s1000 " Increase buffer size
+
 " Templates
 let g:email = 'rehashedsalt@cock.li'
 let g:user = 'Vintage Salt'
@@ -37,34 +52,6 @@ let g:lightline = {
 	\}
 let g:lightline.colorscheme = 'breezy'
 
-" Automatically read when a file is changed outside of Vim
-set autoread
-
-" Fuck autofolding
-set foldmethod=syntax
-set nofoldenable
-
-" Allow buffer switching without saving
-set hidden
-" Increase buffer size
-set viminfo='20,<1000,s1000
-
-" Split and tab configuration
-nnoremap <C-H> <C-W><C-H>
-nnoremap <C-J> <C-W><C-J>
-nnoremap <C-K> <C-W><C-K>
-nnoremap <C-L> <C-W><C-L>
-
-set splitbelow
-set splitright
-
-" Enable modelines
-set modeline
-set modelines=5
-
-" Use XA_PRIMARY clipboard by default
-set clipboard=unnamedplus
-
 " Python
 au BufNewFile,BufRead *.py " Set up nice PEP8 indentation
 	\ set tabstop=4 |
@@ -85,12 +72,3 @@ au BufNewFile,BufRead *.html,*.php
 au BufNewFile,BufRead *.php
 	\ set filetype=html
 
-" Miscellaneous options
-set incsearch " Search while you type
-set number relativenumber " Relative line numbering
-set encoding=utf-8
-set laststatus=2 " Always show statusbar
-
-" Enable 256-color support
-" All of my machines support 256-color so this should be fine
-set t_Co=256