From 374428794e1ad241103e5242730e4e7fe31a4314 Mon Sep 17 00:00:00 2001
From: Paul Walko <paulsw.pw@gmail.com>
Date: Tue, 14 Nov 2017 19:34:56 -0500
Subject: [PATCH 1/6] reformat offlineimap file

---
 offlineimaprc | 210 +++++++++++++++++++++++++-------------------------
 1 file changed, 105 insertions(+), 105 deletions(-)

diff --git a/offlineimaprc b/offlineimaprc
index 6253761..439c697 100644
--- a/offlineimaprc
+++ b/offlineimaprc
@@ -1,134 +1,134 @@
 [general]
-ui			= ttyui
-accounts		= vt, walko, gmail
-maxsyncaccounts		= 3
-pythonfile		= ~/.mutt/offlineimap.py
+ui              = ttyui
+accounts        = vt, walko, gmail
+maxsyncaccounts = 3
+pythonfile      = ~/.mutt/offlineimap.py
 
 ############################
 ### Accounts
 # vt
 [Account vt]
-localrepository		= vt-local
-remoterepository	= vt-remote
-autorefresh		= 0.5
-quick			= 10
+localrepository     = vt-local
+remoterepository    = vt-remote
+autorefresh         = 0.5
+quick               = 10
 
 # walko
 [Account walko]
-localrepository		= walko-local
-remoterepository	= walko-remote
-autorefresh		= 0.5
-quick			= 10
+localrepository     = walko-local
+remoterepository    = walko-remote
+autorefresh         = 0.5
+quick               = 10
 
 # gmail
 [Account gmail]
-localrepository		= gmail-local
-remoterepository	= gmail-remote
-autorefresh		= 0.5
-quick			= 10
+localrepository     = gmail-local
+remoterepository    = gmail-remote
+autorefresh         = 0.5
+quick               = 10
 
 ###########################
 ### Repositories
 # vt
 [Repository vt-local]
-type			= Maildir
-localfolders		= ~/.mail/vt
-nametrans		= lambda folder: {
-				'drafts':	'[Gmail]/Drafts',
-				'sent':		'[Gmail]/Sent Mail',
-				'flagged':	'[Gmail]/Starred',
-				'trash':	'[Gmail]/Trash',
-				'archive':	'[Gmail]/All Mail',
-			}.get(folder, folder)
+type            = Maildir
+localfolders        = ~/.mail/vt
+nametrans        = lambda folder: {
+                'drafts':   '[Gmail]/Drafts',
+                'sent':     '[Gmail]/Sent Mail',
+                'flagged':  '[Gmail]/Starred',
+                'trash':    '[Gmail]/Trash',
+                'archive':  '[Gmail]/All Mail',
+            }.get(folder, folder)
 
 [Repository vt-remote]
-sslcacertfile		= /etc/ssl/certs/ca-certificates.crt
-maxconnections		= 1
-type			= Gmail
-keepalive		= 60
-holdconnectionopen	= yes
-remoteuser		= pwalko@vt.edu
-remotepasseval		= get_pass("vt")
-realdelete		= no
-nametrans		= lambda folder: {
-				'[Gmail]/Drafts': 	'drafts',
-				'[Gmail]/Sent Mail':	'sent',
-				'[Gmail]/Starred':	'flagged',
-				'[Gmail]/Trash':	'trash',
-				'[Gmail]/All Mail':	'archive',
-			}.get(folder, folder)
-folderfilter		= lambda folder: folder not in [
-				'[Gmail]/Trash',
-				'[Gmail]/Spam',
-				'[Gmail]/Important',	
-				'[Gmail]/Chats',
-			]
+sslcacertfile       = /etc/ssl/certs/ca-certificates.crt
+maxconnections      = 1
+type                = Gmail
+keepalive           = 60
+holdconnectionopen  = yes
+remoteuser          = pwalko@vt.edu
+remotepasseval      = get_pass("vt")
+realdelete          = no
+nametrans           = lambda folder: {
+                '[Gmail]/Drafts':       'drafts',
+                '[Gmail]/Sent Mail':    'sent',
+                '[Gmail]/Starred':      'flagged',
+                '[Gmail]/Trash':        'trash',
+                '[Gmail]/All Mail':     'archive',
+            }.get(folder, folder)
+folderfilter        = lambda folder: folder not in [
+                '[Gmail]/Trash',
+                '[Gmail]/Spam',
+                '[Gmail]/Important',    
+                '[Gmail]/Chats',
+            ]
 
 # walko
 [Repository walko-local]
-type			= Maildir
-localfolders		= ~/.mail/walko
-nametrans		= lambda folder: {
-				'drafts':	'[Gmail]/Drafts',
-				'sent':		'[Gmail]/Sent Mail',
-				'flagged':	'[Gmail]/Starred',
-				'trash':	'[Gmail]/Trash',
-				'archive':	'[Gmail]/All Mail',
-			}.get(folder, folder)
+type            = Maildir
+localfolders        = ~/.mail/walko
+nametrans        = lambda folder: {
+                'drafts':   '[Gmail]/Drafts',
+                'sent':     '[Gmail]/Sent Mail',
+                'flagged':  '[Gmail]/Starred',
+                'trash':    '[Gmail]/Trash',
+                'archive':  '[Gmail]/All Mail',
+            }.get(folder, folder)
 
 [Repository walko-remote]
-sslcacertfile		= /etc/ssl/certs/ca-certificates.crt
-maxconnections		= 1
-type			= Gmail
-keepalive		= 60
-holdconnectionopen	= yes
-remoteuser		= paul@walko.org
-remotepasseval		= get_pass("walko")
-realdelete		= no
-nametrans		= lambda folder: {
-				'[Gmail]/Drafts': 	'drafts',
-				'[Gmail]/Sent Mail':	'sent',
-				'[Gmail]/Starred':	'flagged',
-				'[Gmail]/Trash':	'trash',
-				'[Gmail]/All Mail':	'archive',
-			}.get(folder, folder)
-folderfilter		= lambda folder: folder not in [
-				'[Gmail]/Trash',
-				'[Gmail]/Important',	
-				'[Gmail]/Chats',
-			]
+sslcacertfile       = /etc/ssl/certs/ca-certificates.crt
+maxconnections      = 1
+type                = Gmail
+keepalive           = 60
+holdconnectionopen  = yes
+remoteuser          = paul@walko.org
+remotepasseval      = get_pass("walko")
+realdelete          = no
+nametrans           = lambda folder: {
+                '[Gmail]/Drafts':       'drafts',
+                '[Gmail]/Sent Mail':    'sent',
+                '[Gmail]/Starred':      'flagged',
+                '[Gmail]/Trash':        'trash',
+                '[Gmail]/All Mail':     'archive',
+            }.get(folder, folder)
+folderfilter        = lambda folder: folder not in [
+                '[Gmail]/Trash',
+                '[Gmail]/Important',    
+                '[Gmail]/Chats',
+            ]
 
 # gmail
 [Repository gmail-local]
-type			= Maildir
-localfolders		= ~/.mail/gmail
-nametrans		= lambda folder: {
-				'drafts':	'[Gmail]/Drafts',
-				'sent':		'[Gmail]/Sent Mail',
-				'flagged':	'[Gmail]/Starred',
-				'trash':	'[Gmail]/Trash',
-				'archive':	'[Gmail]/All Mail',
-			}.get(folder, folder)
+type            = Maildir
+localfolders    = ~/.mail/gmail
+nametrans       = lambda folder: {
+                'drafts':   '[Gmail]/Drafts',
+                'sent':     '[Gmail]/Sent Mail',
+                'flagged':  '[Gmail]/Starred',
+                'trash':    '[Gmail]/Trash',
+                'archive':  '[Gmail]/All Mail',
+            }.get(folder, folder)
 
 [Repository gmail-remote]
-sslcacertfile		= /etc/ssl/certs/ca-certificates.crt
-maxconnections		= 1
-type			= Gmail
-keepalive		= 60
-holdconnectionopen	= yes
-remoteuser		= paulsw.pw@gmail.com
-remotepasseval		= get_pass("gmail")
-realdelete		= no
-nametrans		= lambda folder: {
-				'[Gmail]/Drafts': 	'drafts',
-				'[Gmail]/Sent Mail':	'sent',
-				'[Gmail]/Starred':	'flagged',
-				'[Gmail]/Trash':	'trash',
-				'[Gmail]/All Mail':	'archive',
-			}.get(folder, folder)
-folderfilter		= lambda folder: folder not in [
-				'[Gmail]/Trash',
-				'[Gmail]/Spam',
-				'[Gmail]/Important',
-				'[Gmail]/Chats',
-			]
+sslcacertfile       = /etc/ssl/certs/ca-certificates.crt
+maxconnections      = 1
+type                = Gmail
+keepalive           = 60
+holdconnectionopen  = yes
+remoteuser          = paulsw.pw@gmail.com
+remotepasseval      = get_pass("gmail")
+realdelete          = no
+nametrans           = lambda folder: {
+                '[Gmail]/Drafts':       'drafts',
+                '[Gmail]/Sent Mail':    'sent',
+                '[Gmail]/Starred':      'flagged',
+                '[Gmail]/Trash':        'trash',
+                '[Gmail]/All Mail':     'archive',
+            }.get(folder, folder)
+folderfilter        = lambda folder: folder not in [
+                '[Gmail]/Trash',
+                '[Gmail]/Spam',
+                '[Gmail]/Important',
+                '[Gmail]/Chats',
+            ]

From 2fe4d952b4034ed713b6916d05446370633de965 Mon Sep 17 00:00:00 2001
From: Paul Walko <paulsw.pw@gmail.com>
Date: Wed, 15 Nov 2017 14:38:39 -0500
Subject: [PATCH 2/6] add colors

---
 .gitmodules                     | 3 +++
 vim/bundle/vim-colors-solarized | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 vim/bundle/vim-colors-solarized

diff --git a/.gitmodules b/.gitmodules
index c67bb48..5ad641a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "vim/bundle/vim-unimpaired"]
 	path = vim/bundle/vim-unimpaired
 	url = https://github.com/tpope/vim-unimpaired
+[submodule "vim/bundle/vim-colors-solarized"]
+	path = vim/bundle/vim-colors-solarized
+	url = https://github.com/altercation/vim-colors-solarized.git
diff --git a/vim/bundle/vim-colors-solarized b/vim/bundle/vim-colors-solarized
new file mode 160000
index 0000000..528a59f
--- /dev/null
+++ b/vim/bundle/vim-colors-solarized
@@ -0,0 +1 @@
+Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21

From e51807edc5d4c7fda11736e68a0fe5df79fc8aa8 Mon Sep 17 00:00:00 2001
From: Paul Walko <paulsw.pw@gmail.com>
Date: Wed, 15 Nov 2017 15:11:07 -0500
Subject: [PATCH 3/6] add solarized theme, fix tmux colors in bash

---
 .gitmodules                    |  6 +++---
 bash_profile                   | 22 ++++++++++++++++++++++
 vim/pack/themes/opt/solarized8 |  1 +
 vimrc                          |  9 ++++++++-
 4 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 bash_profile
 create mode 160000 vim/pack/themes/opt/solarized8

diff --git a/.gitmodules b/.gitmodules
index 5ad641a..ade0780 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,6 @@
 [submodule "vim/bundle/vim-unimpaired"]
 	path = vim/bundle/vim-unimpaired
 	url = https://github.com/tpope/vim-unimpaired
-[submodule "vim/bundle/vim-colors-solarized"]
-	path = vim/bundle/vim-colors-solarized
-	url = https://github.com/altercation/vim-colors-solarized.git
+[submodule "vim/pack/themes/opt/solarized8"]
+	path = vim/pack/themes/opt/solarized8
+	url = https://github.com/lifepillar/vim-solarized8.git
diff --git a/bash_profile b/bash_profile
new file mode 100644
index 0000000..8fbea55
--- /dev/null
+++ b/bash_profile
@@ -0,0 +1,22 @@
+#if [[ "$SSH_CONNECTION" != "" && "$MY_SSH_CONNECTION" != "yes" ]]; then
+#    	/bin/zsh
+#fi
+#export SHELL=/bin/zsh
+#exec /bin/zsh -l
+
+if [[ -z $TMUX ]]; then
+    if [ -e /usr/share/terminfo/x/xterm-256color ]; then # may be xterm-256 depending on your distro
+        export TERM='rxvt-256color'
+    else
+        export TERM='rxvt'
+    fi
+else
+    if [ -e /usr/share/terminfo/s/screen-256color ]; then
+        export TERM='screen-256color'
+    else
+        export TERM='screen'
+    fi
+fi
+
+export PS1="\[$(tput bold)\]\[$(tput setaf 1)\][\[$(tput setaf 3)\]\u\[$(tput setaf 2)\]@\[$(tput setaf 13)\]\h \[$(tput setaf 5)\]\W\[$(tput setaf 1)\]]\[$(tput setaf 7)\]\\$ \[$(tput sgr0)\]"
+export PATH=$HOME/.local/bin:$PATH
diff --git a/vim/pack/themes/opt/solarized8 b/vim/pack/themes/opt/solarized8
new file mode 160000
index 0000000..c75b42d
--- /dev/null
+++ b/vim/pack/themes/opt/solarized8
@@ -0,0 +1 @@
+Subproject commit c75b42d8a2207f7b514d2fa697a50051c4170b87
diff --git a/vimrc b/vimrc
index bfde604..75968be 100644
--- a/vimrc
+++ b/vimrc
@@ -1,3 +1,8 @@
+"""Weird tmux settings
+let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
+
+
 """ Start vim.plug
 execute pathogen#infect()
 
@@ -38,8 +43,10 @@ set relativenumber
 " Autoindent
 set autoindent
 
-" Syntax highlighting
+" Colors
 syntax enable
+set background=dark
+colorscheme solarized8
 filetype plugin on
 
 " Fuzzy Finding

From 4cc613d9465dceb7fe7dcf94f0c6e3cd2238829f Mon Sep 17 00:00:00 2001
From: Paul Walko <paulsw.pw@gmail.com>
Date: Wed, 15 Nov 2017 15:11:51 -0500
Subject: [PATCH 4/6] remove old theme

---
 Makefile                        | 4 ++--
 vim/bundle/vim-colors-solarized | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 160000 vim/bundle/vim-colors-solarized

diff --git a/Makefile b/Makefile
index 76fd767..3997acd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 LN_FLAGS = -sfnv
 MKDIR_FLAGS = -pv
 
-home_symlinks = aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc
+home_symlinks = vimrc vim bash_profile
 
 config_copy = 
 
@@ -9,7 +9,7 @@ config_symlinks =
 
 all: install
 
-install: aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc
+install: vimrc vim bash_profile
 
 .PHONY: $(home_symlinks)
 $(home_symlinks):
diff --git a/vim/bundle/vim-colors-solarized b/vim/bundle/vim-colors-solarized
deleted file mode 160000
index 528a59f..0000000
--- a/vim/bundle/vim-colors-solarized
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21

From 78a3ae8fa793ba3b974aeb9eb45f10960f650332 Mon Sep 17 00:00:00 2001
From: Paul Walko <paulsw.pw@gmail.com>
Date: Wed, 15 Nov 2017 18:19:23 -0500
Subject: [PATCH 5/6] use vim's native package manager

---
 .gitmodules                                   |  12 -
 vim/autoload/pathogen.vim                     | 264 ------------------
 vim/bundle/supertab                           |   1 -
 vim/bundle/syntastic                          |   1 -
 .../solarized8 => plugins/opt/vim-solarized8} |   0
 vim/pack/plugins/start/supertab               |   1 +
 vim/pack/plugins/start/syntastic              |   1 +
 .../plugins/start}/vim-unimpaired             |   0
 vimrc                                         |   4 -
 9 files changed, 2 insertions(+), 282 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 100644 vim/autoload/pathogen.vim
 delete mode 160000 vim/bundle/supertab
 delete mode 160000 vim/bundle/syntastic
 rename vim/pack/{themes/opt/solarized8 => plugins/opt/vim-solarized8} (100%)
 create mode 160000 vim/pack/plugins/start/supertab
 create mode 160000 vim/pack/plugins/start/syntastic
 rename vim/{bundle => pack/plugins/start}/vim-unimpaired (100%)

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index ade0780..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,12 +0,0 @@
-[submodule "vim/bundle/syntastic"]
-	path = vim/bundle/syntastic
-	url = https://github.com/vim-syntastic/syntastic.git
-[submodule "vim/bundle/supertab"]
-	path = vim/bundle/supertab
-	url = https://github.com/ervandew/supertab.git
-[submodule "vim/bundle/vim-unimpaired"]
-	path = vim/bundle/vim-unimpaired
-	url = https://github.com/tpope/vim-unimpaired
-[submodule "vim/pack/themes/opt/solarized8"]
-	path = vim/pack/themes/opt/solarized8
-	url = https://github.com/lifepillar/vim-solarized8.git
diff --git a/vim/autoload/pathogen.vim b/vim/autoload/pathogen.vim
deleted file mode 100644
index 3582fbf..0000000
--- a/vim/autoload/pathogen.vim
+++ /dev/null
@@ -1,264 +0,0 @@
-" pathogen.vim - path option manipulation
-" Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      2.4
-
-" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
-"
-" For management of individually installed plugins in ~/.vim/bundle (or
-" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
-" .vimrc is the only other setup necessary.
-"
-" The API is documented inline below.
-
-if exists("g:loaded_pathogen") || &cp
-  finish
-endif
-let g:loaded_pathogen = 1
-
-" Point of entry for basic default usage.  Give a relative path to invoke
-" pathogen#interpose() or an absolute path to invoke pathogen#surround().
-" Curly braces are expanded with pathogen#expand(): "bundle/{}" finds all
-" subdirectories inside "bundle" inside all directories in the runtime path.
-" If no arguments are given, defaults "bundle/{}", and also "pack/{}/start/{}"
-" on versions of Vim without native package support.
-function! pathogen#infect(...) abort
-  if a:0
-    let paths = filter(reverse(copy(a:000)), 'type(v:val) == type("")')
-  else
-    let paths = ['bundle/{}', 'pack/{}/start/{}']
-  endif
-  if has('packages')
-    call filter(paths, 'v:val !~# "^pack/[^/]*/start/[^/]*$"')
-  endif
-  let static = '^\%([$~\\/]\|\w:[\\/]\)[^{}*]*$'
-  for path in filter(copy(paths), 'v:val =~# static')
-    call pathogen#surround(path)
-  endfor
-  for path in filter(copy(paths), 'v:val !~# static')
-    if path =~# '^\%([$~\\/]\|\w:[\\/]\)'
-      call pathogen#surround(path)
-    else
-      call pathogen#interpose(path)
-    endif
-  endfor
-  call pathogen#cycle_filetype()
-  if pathogen#is_disabled($MYVIMRC)
-    return 'finish'
-  endif
-  return ''
-endfunction
-
-" Split a path into a list.
-function! pathogen#split(path) abort
-  if type(a:path) == type([]) | return a:path | endif
-  if empty(a:path) | return [] | endif
-  let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
-  return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
-endfunction
-
-" Convert a list to a path.
-function! pathogen#join(...) abort
-  if type(a:1) == type(1) && a:1
-    let i = 1
-    let space = ' '
-  else
-    let i = 0
-    let space = ''
-  endif
-  let path = ""
-  while i < a:0
-    if type(a:000[i]) == type([])
-      let list = a:000[i]
-      let j = 0
-      while j < len(list)
-        let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
-        let path .= ',' . escaped
-        let j += 1
-      endwhile
-    else
-      let path .= "," . a:000[i]
-    endif
-    let i += 1
-  endwhile
-  return substitute(path,'^,','','')
-endfunction
-
-" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
-function! pathogen#legacyjoin(...) abort
-  return call('pathogen#join',[1] + a:000)
-endfunction
-
-" Turn filetype detection off and back on again if it was already enabled.
-function! pathogen#cycle_filetype() abort
-  if exists('g:did_load_filetypes')
-    filetype off
-    filetype on
-  endif
-endfunction
-
-" Check if a bundle is disabled.  A bundle is considered disabled if its
-" basename or full name is included in the list g:pathogen_blacklist or the
-" comma delimited environment variable $VIMBLACKLIST.
-function! pathogen#is_disabled(path) abort
-  if a:path =~# '\~$'
-    return 1
-  endif
-  let sep = pathogen#slash()
-  let blacklist = get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) + pathogen#split($VIMBLACKLIST)
-  if !empty(blacklist)
-    call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")')
-  endif
-  return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
-endfunction
-
-" Prepend the given directory to the runtime path and append its corresponding
-" after directory.  Curly braces are expanded with pathogen#expand().
-function! pathogen#surround(path) abort
-  let sep = pathogen#slash()
-  let rtp = pathogen#split(&rtp)
-  let path = fnamemodify(a:path, ':s?[\\/]\=$??')
-  let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)')
-  let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
-  call filter(rtp, 'index(before + after, v:val) == -1')
-  let &rtp = pathogen#join(before, rtp, after)
-  return &rtp
-endfunction
-
-" For each directory in the runtime path, add a second entry with the given
-" argument appended.  Curly braces are expanded with pathogen#expand().
-function! pathogen#interpose(name) abort
-  let sep = pathogen#slash()
-  let name = a:name
-  if has_key(s:done_bundles, name)
-    return ""
-  endif
-  let s:done_bundles[name] = 1
-  let list = []
-  for dir in pathogen#split(&rtp)
-    if dir =~# '\<after$'
-      let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
-    else
-      let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)')
-    endif
-  endfor
-  let &rtp = pathogen#join(pathogen#uniq(list))
-  return 1
-endfunction
-
-let s:done_bundles = {}
-
-" Invoke :helptags on all non-$VIM doc directories in runtimepath.
-function! pathogen#helptags() abort
-  let sep = pathogen#slash()
-  for glob in pathogen#split(&rtp)
-    for dir in map(split(glob(glob), "\n"), 'v:val.sep."/doc/".sep')
-      if (dir)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir) == 2 && !empty(split(glob(dir.'*.txt'))) && (!filereadable(dir.'tags') || filewritable(dir.'tags'))
-        silent! execute 'helptags' pathogen#fnameescape(dir)
-      endif
-    endfor
-  endfor
-endfunction
-
-command! -bar Helptags :call pathogen#helptags()
-
-" Execute the given command.  This is basically a backdoor for --remote-expr.
-function! pathogen#execute(...) abort
-  for command in a:000
-    execute command
-  endfor
-  return ''
-endfunction
-
-" Section: Unofficial
-
-function! pathogen#is_absolute(path) abort
-  return a:path =~# (has('win32') ? '^\%([\\/]\|\w:\)[\\/]\|^[~$]' : '^[/~$]')
-endfunction
-
-" Given a string, returns all possible permutations of comma delimited braced
-" alternatives of that string.  pathogen#expand('/{a,b}/{c,d}') yields
-" ['/a/c', '/a/d', '/b/c', '/b/d'].  Empty braces are treated as a wildcard
-" and globbed.  Actual globs are preserved.
-function! pathogen#expand(pattern, ...) abort
-  let after = a:0 ? a:1 : ''
-  let pattern = substitute(a:pattern, '^[~$][^\/]*', '\=expand(submatch(0))', '')
-  if pattern =~# '{[^{}]\+}'
-    let [pre, pat, post] = split(substitute(pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1)
-    let found = map(split(pat, ',', 1), 'pre.v:val.post')
-    let results = []
-    for pattern in found
-      call extend(results, pathogen#expand(pattern))
-    endfor
-  elseif pattern =~# '{}'
-    let pat = matchstr(pattern, '^.*{}[^*]*\%($\|[\\/]\)')
-    let post = pattern[strlen(pat) : -1]
-    let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
-  else
-    let results = [pattern]
-  endif
-  let vf = pathogen#slash() . 'vimfiles'
-  call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""')
-  return filter(results, '!empty(v:val)')
-endfunction
-
-" \ on Windows unless shellslash is set, / everywhere else.
-function! pathogen#slash() abort
-  return !exists("+shellslash") || &shellslash ? '/' : '\'
-endfunction
-
-function! pathogen#separator() abort
-  return pathogen#slash()
-endfunction
-
-" Convenience wrapper around glob() which returns a list.
-function! pathogen#glob(pattern) abort
-  let files = split(glob(a:pattern),"\n")
-  return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")')
-endfunction
-
-" Like pathogen#glob(), only limit the results to directories.
-function! pathogen#glob_directories(pattern) abort
-  return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
-endfunction
-
-" Remove duplicates from a list.
-function! pathogen#uniq(list) abort
-  let i = 0
-  let seen = {}
-  while i < len(a:list)
-    if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i])
-      call remove(a:list,i)
-    elseif a:list[i] ==# ''
-      let i += 1
-      let empty = 1
-    else
-      let seen[a:list[i]] = 1
-      let i += 1
-    endif
-  endwhile
-  return a:list
-endfunction
-
-" Backport of fnameescape().
-function! pathogen#fnameescape(string) abort
-  if exists('*fnameescape')
-    return fnameescape(a:string)
-  elseif a:string ==# '-'
-    return '\-'
-  else
-    return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
-  endif
-endfunction
-
-" Like findfile(), but hardcoded to use the runtimepath.
-function! pathogen#runtime_findfile(file,count) abort
-  let rtp = pathogen#join(1,pathogen#split(&rtp))
-  let file = findfile(a:file,rtp,a:count)
-  if file ==# ''
-    return ''
-  else
-    return fnamemodify(file,':p')
-  endif
-endfunction
-
-" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=':
diff --git a/vim/bundle/supertab b/vim/bundle/supertab
deleted file mode 160000
index 22aac5c..0000000
--- a/vim/bundle/supertab
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 22aac5c2cb6a8ebe906bf1495eb727717390e62e
diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic
deleted file mode 160000
index b0e48d0..0000000
--- a/vim/bundle/syntastic
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b0e48d0f66ef173cb70f83af927ba707b9d50fce
diff --git a/vim/pack/themes/opt/solarized8 b/vim/pack/plugins/opt/vim-solarized8
similarity index 100%
rename from vim/pack/themes/opt/solarized8
rename to vim/pack/plugins/opt/vim-solarized8
diff --git a/vim/pack/plugins/start/supertab b/vim/pack/plugins/start/supertab
new file mode 160000
index 0000000..40fe711
--- /dev/null
+++ b/vim/pack/plugins/start/supertab
@@ -0,0 +1 @@
+Subproject commit 40fe711e088e2ab346738233dd5adbb1be355172
diff --git a/vim/pack/plugins/start/syntastic b/vim/pack/plugins/start/syntastic
new file mode 160000
index 0000000..0293b00
--- /dev/null
+++ b/vim/pack/plugins/start/syntastic
@@ -0,0 +1 @@
+Subproject commit 0293b001763113d0cd7d5c8606835bd81624d9f7
diff --git a/vim/bundle/vim-unimpaired b/vim/pack/plugins/start/vim-unimpaired
similarity index 100%
rename from vim/bundle/vim-unimpaired
rename to vim/pack/plugins/start/vim-unimpaired
diff --git a/vimrc b/vimrc
index 75968be..d73bda6 100644
--- a/vimrc
+++ b/vimrc
@@ -3,10 +3,6 @@ let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
 let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
 
 
-""" Start vim.plug
-execute pathogen#infect()
-
-
 """ Syntastic
 " Recommended settings
 set statusline+=%#warning#

From 99a63b4cd862cc3ca35aeba570bc23aac2c3ec21 Mon Sep 17 00:00:00 2001
From: Paul Walko <paulsw.pw@gmail.com>
Date: Wed, 15 Nov 2017 18:23:49 -0500
Subject: [PATCH 6/6] actually fix vim nwo

---
 .gitmodules                     | 12 ++++++++++++
 vim/pack/plugins/syntastic      |  1 +
 vim/pack/plugins/vim-unimpaired |  1 +
 3 files changed, 14 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 vim/pack/plugins/syntastic
 create mode 160000 vim/pack/plugins/vim-unimpaired

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..dbeea4f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "vim/pack/plugins/opt/vim-solarized8"]
+	path = vim/pack/plugins/opt/vim-solarized8
+	url = https://github.com/lifepillar/vim-solarized8.git
+[submodule "vim/pack/plugins/start/supertab"]
+	path = vim/pack/plugins/start/supertab
+	url = https://github.com/ervandew/supertab.git
+[submodule "vim/pack/plugins/syntastic"]
+	path = vim/pack/plugins/syntastic
+	url = https://github.com/vim-syntastic/syntastic.git
+[submodule "vim/pack/plugins/vim-unimpaired"]
+	path = vim/pack/plugins/vim-unimpaired
+	url = https://github.com/tpope/vim-unimpaired.git
diff --git a/vim/pack/plugins/syntastic b/vim/pack/plugins/syntastic
new file mode 160000
index 0000000..0293b00
--- /dev/null
+++ b/vim/pack/plugins/syntastic
@@ -0,0 +1 @@
+Subproject commit 0293b001763113d0cd7d5c8606835bd81624d9f7
diff --git a/vim/pack/plugins/vim-unimpaired b/vim/pack/plugins/vim-unimpaired
new file mode 160000
index 0000000..3a77590
--- /dev/null
+++ b/vim/pack/plugins/vim-unimpaired
@@ -0,0 +1 @@
+Subproject commit 3a7759075cca5b0dc29ce81f2747489b6c8e36a7