From 412f69ba15459af3c31d6e51e5ae838063fcb1b0 Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Wed, 3 Feb 2016 22:37:50 -0500
Subject: [PATCH 01/26] Initial commit

---
 spell/en.utf-8.add |  4 ++++
 vimrc              | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 spell/en.utf-8.add
 create mode 100644 vimrc

diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add
new file mode 100644
index 0000000..3b11ded
--- /dev/null
+++ b/spell/en.utf-8.add
@@ -0,0 +1,4 @@
+serializability
+serializable
+pseudocode
+timestamp
diff --git a/vimrc b/vimrc
new file mode 100644
index 0000000..9840f07
--- /dev/null
+++ b/vimrc
@@ -0,0 +1,54 @@
+
+
+filetype plugin indent on
+
+" Tabbing
+function! SetupTabbing()
+  set tabstop=2
+  set expandtab
+  set shiftwidth=2
+  set softtabstop=2
+  set sw=2
+  set autoindent
+  set smartindent
+  set smarttab
+endfunction
+command! -bar SetupTabbing call SetupTabbing()
+SetupTabbing
+
+" Window settings
+set winminwidth=20
+set winwidth=100
+set winheight=20
+
+" Syntax highlighting
+syntax on
+
+" Wrapping settings
+set nowrap " nowrap makes the lines not wrap
+" set wrap " wrap makes the lines wrap
+set linebreak
+
+" keeps lines below the cursor
+set scrolloff=2
+
+" makes LaTeX use spell checking, word wrapping
+autocmd FileType tex set wrap spell
+autocmd FileType make set noexpandtab
+autocmd FileType *gitconfig set noexpandtab
+autocmd FileType python SetupTabbing
+
+" set term=xterm
+
+let java_allow_cpp_keywords = 1
+
+set ruler
+set number
+set backspace=indent,eol,start
+set hlsearch
+
+augroup HiglightTODO
+  autocmd!
+  autocmd WinEnter,VimEnter * :silent! call matchadd('Todo', 'TODO', -1)
+augroup END
+

From d83ef680eaa2b8292db468d14af3e8e962faaec0 Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Wed, 3 Feb 2016 22:38:30 -0500
Subject: [PATCH 02/26] Removed old spelling file

---
 spell/en.utf-8.add | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 spell/en.utf-8.add

diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add
deleted file mode 100644
index 3b11ded..0000000
--- a/spell/en.utf-8.add
+++ /dev/null
@@ -1,4 +0,0 @@
-serializability
-serializable
-pseudocode
-timestamp

From 1d64b7aa92b1349a783d3359a5bc227c17560752 Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Wed, 3 Feb 2016 22:41:17 -0500
Subject: [PATCH 03/26] Installed pathogen

---
 autoload/pathogen.vim | 353 ++++++++++++++++++++++++++++++++++++++++++
 vimrc                 | 105 +++++++------
 2 files changed, 407 insertions(+), 51 deletions(-)
 create mode 100644 autoload/pathogen.vim

diff --git a/autoload/pathogen.vim b/autoload/pathogen.vim
new file mode 100644
index 0000000..59a75c1
--- /dev/null
+++ b/autoload/pathogen.vim
@@ -0,0 +1,353 @@
+" 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() (defaults to "bundle/{}"), 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.
+function! pathogen#infect(...) abort
+  for path in a:0 ? filter(reverse(copy(a:000)), 'type(v:val) == type("")') : ['bundle/{}']
+    if path =~# '^\%({\=[$~\\/]\|{\=\w:[\\/]\).*[{}*]'
+      call pathogen#surround(path)
+    elseif path =~# '^\%([$~\\/]\|\w:[\\/]\)'
+      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
+      call pathogen#surround(path . '/{}')
+    elseif path =~# '[{}*]'
+      call pathogen#interpose(path)
+    else
+      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
+      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 : ''
+  if a:pattern =~# '{[^{}]\+}'
+    let [pre, pat, post] = split(substitute(a: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 a:pattern =~# '{}'
+    let pat = matchstr(a:pattern, '^.*{}[^*]*\%($\|[\\/]\)')
+    let post = a:pattern[strlen(pat) : -1]
+    let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
+  else
+    let results = [a: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
+
+" Section: Deprecated
+
+function! s:warn(msg) abort
+  echohl WarningMsg
+  echomsg a:msg
+  echohl NONE
+endfunction
+
+" Prepend all subdirectories of path to the rtp, and append all 'after'
+" directories in those subdirectories.  Deprecated.
+function! pathogen#runtime_prepend_subdirectories(path) abort
+  call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#infect('.string(a:path.'/{}').')')
+  return pathogen#surround(a:path . pathogen#slash() . '{}')
+endfunction
+
+function! pathogen#incubate(...) abort
+  let name = a:0 ? a:1 : 'bundle/{}'
+  call s:warn('Change pathogen#incubate('.(a:0 ? string(a:1) : '').') to pathogen#infect('.string(name).')')
+  return pathogen#interpose(name)
+endfunction
+
+" Deprecated alias for pathogen#interpose().
+function! pathogen#runtime_append_all_bundles(...) abort
+  if a:0
+    call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#infect('.string(a:1.'/{}').')')
+  else
+    call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#infect()')
+  endif
+  return pathogen#interpose(a:0 ? a:1 . '/{}' : 'bundle/{}')
+endfunction
+
+if exists(':Vedit')
+  finish
+endif
+
+let s:vopen_warning = 0
+
+function! s:find(count,cmd,file,lcd)
+  let rtp = pathogen#join(1,pathogen#split(&runtimepath))
+  let file = pathogen#runtime_findfile(a:file,a:count)
+  if file ==# ''
+    return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
+  endif
+  if !s:vopen_warning
+    let s:vopen_warning = 1
+    let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE'
+  else
+    let warning = ''
+  endif
+  if a:lcd
+    let path = file[0:-strlen(a:file)-2]
+    execute 'lcd `=path`'
+    return a:cmd.' '.pathogen#fnameescape(a:file) . warning
+  else
+    return a:cmd.' '.pathogen#fnameescape(file) . warning
+  endif
+endfunction
+
+function! s:Findcomplete(A,L,P)
+  let sep = pathogen#slash()
+  let cheats = {
+        \'a': 'autoload',
+        \'d': 'doc',
+        \'f': 'ftplugin',
+        \'i': 'indent',
+        \'p': 'plugin',
+        \'s': 'syntax'}
+  if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
+    let request = cheats[a:A[0]].a:A[1:-1]
+  else
+    let request = a:A
+  endif
+  let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*'
+  let found = {}
+  for path in pathogen#split(&runtimepath)
+    let path = expand(path, ':p')
+    let matches = split(glob(path.sep.pattern),"\n")
+    call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
+    call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]')
+    for match in matches
+      let found[match] = 1
+    endfor
+  endfor
+  return sort(keys(found))
+endfunction
+
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve       :execute s:find(<count>,'edit<bang>',<q-args>,0)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit    :execute s:find(<count>,'edit<bang>',<q-args>,0)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen    :execute s:find(<count>,'edit<bang>',<q-args>,1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit   :execute s:find(<count>,'split',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit  :execute s:find(<count>,'vsplit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit   :execute s:find(<count>,'pedit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread    :execute s:find(<count>,'read',<q-args>,<bang>1)
+
+" 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/vimrc b/vimrc
index 9840f07..13e002d 100644
--- a/vimrc
+++ b/vimrc
@@ -1,54 +1,57 @@
+execute pathogen#infect()
 
-
+syntax on
 filetype plugin indent on
 
-" Tabbing
-function! SetupTabbing()
-  set tabstop=2
-  set expandtab
-  set shiftwidth=2
-  set softtabstop=2
-  set sw=2
-  set autoindent
-  set smartindent
-  set smarttab
-endfunction
-command! -bar SetupTabbing call SetupTabbing()
-SetupTabbing
-
-" Window settings
-set winminwidth=20
-set winwidth=100
-set winheight=20
-
-" Syntax highlighting
-syntax on
-
-" Wrapping settings
-set nowrap " nowrap makes the lines not wrap
-" set wrap " wrap makes the lines wrap
-set linebreak
-
-" keeps lines below the cursor
-set scrolloff=2
-
-" makes LaTeX use spell checking, word wrapping
-autocmd FileType tex set wrap spell
-autocmd FileType make set noexpandtab
-autocmd FileType *gitconfig set noexpandtab
-autocmd FileType python SetupTabbing
-
-" set term=xterm
-
-let java_allow_cpp_keywords = 1
-
-set ruler
-set number
-set backspace=indent,eol,start
-set hlsearch
-
-augroup HiglightTODO
-  autocmd!
-  autocmd WinEnter,VimEnter * :silent! call matchadd('Todo', 'TODO', -1)
-augroup END
-
+"filetype plugin indent on
+"
+"" Tabbing
+"function! SetupTabbing()
+"  set tabstop=2
+"  set expandtab
+"  set shiftwidth=2
+"  set softtabstop=2
+"  set sw=2
+"  set autoindent
+"  set smartindent
+"  set smarttab
+"endfunction
+"command! -bar SetupTabbing call SetupTabbing()
+"SetupTabbing
+"
+"" Window settings
+"set winminwidth=20
+"set winwidth=100
+"set winheight=20
+"
+"" Syntax highlighting
+"syntax on
+"
+"" Wrapping settings
+"set nowrap " nowrap makes the lines not wrap
+"" set wrap " wrap makes the lines wrap
+"set linebreak
+"
+"" keeps lines below the cursor
+"set scrolloff=2
+"
+"" makes LaTeX use spell checking, word wrapping
+"autocmd FileType tex set wrap spell
+"autocmd FileType make set noexpandtab
+"autocmd FileType *gitconfig set noexpandtab
+"autocmd FileType python SetupTabbing
+"
+"" set term=xterm
+"
+"let java_allow_cpp_keywords = 1
+"
+"set ruler
+"set number
+"set backspace=indent,eol,start
+"set hlsearch
+"
+"augroup HiglightTODO
+"  autocmd!
+"  autocmd WinEnter,VimEnter * :silent! call matchadd('Todo', 'TODO', -1)
+"augroup END
+"

From 9424e87c59cd4581331903891a9151c731da173b Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Wed, 3 Feb 2016 22:42:25 -0500
Subject: [PATCH 04/26] Installed Fugitive as a submodule.

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

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..3bbcc5e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "bundle/fugitive"]
+	path = bundle/fugitive
+	url = https://github.com/tpope/vim-fugitive.git
diff --git a/bundle/fugitive b/bundle/fugitive
new file mode 160000
index 0000000..9835920
--- /dev/null
+++ b/bundle/fugitive
@@ -0,0 +1 @@
+Subproject commit 9835920a3c91236021fc8c88cc4157304e24356b

From a5676f0b70967e0372fe16d61f3fc64f7cd9fa06 Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Wed, 3 Feb 2016 22:43:53 -0500
Subject: [PATCH 05/26] Added submodules for airline and nerdtree.

---
 .gitmodules     | 6 ++++++
 bundle/airline  | 1 +
 bundle/nerdtree | 1 +
 3 files changed, 8 insertions(+)
 create mode 160000 bundle/airline
 create mode 160000 bundle/nerdtree

diff --git a/.gitmodules b/.gitmodules
index 3bbcc5e..baf3290 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "bundle/fugitive"]
 	path = bundle/fugitive
 	url = https://github.com/tpope/vim-fugitive.git
+[submodule "bundle/nerdtree"]
+	path = bundle/nerdtree
+	url = https://github.com/scrooloose/nerdtree.git
+[submodule "bundle/airline"]
+	path = bundle/airline
+	url = https://github.com/vim-airline/vim-airline
diff --git a/bundle/airline b/bundle/airline
new file mode 160000
index 0000000..9d1196f
--- /dev/null
+++ b/bundle/airline
@@ -0,0 +1 @@
+Subproject commit 9d1196f40aac7bbef5cec0c9307e80e207a4dfca
diff --git a/bundle/nerdtree b/bundle/nerdtree
new file mode 160000
index 0000000..4ebbb53
--- /dev/null
+++ b/bundle/nerdtree
@@ -0,0 +1 @@
+Subproject commit 4ebbb533c3faf2c480211db2b547972bb3b60f2b

From ad18664dedd8d215b9638ee8c07764fa7c39d08b Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Wed, 3 Feb 2016 22:44:32 -0500
Subject: [PATCH 06/26] Added submodule for color schemes

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

diff --git a/.gitmodules b/.gitmodules
index baf3290..ba1d7ab 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "bundle/airline"]
 	path = bundle/airline
 	url = https://github.com/vim-airline/vim-airline
+[submodule "bundle/vim-colorschemes"]
+	path = bundle/vim-colorschemes
+	url = https://github.com/flazz/vim-colorschemes
diff --git a/bundle/vim-colorschemes b/bundle/vim-colorschemes
new file mode 160000
index 0000000..28a989b
--- /dev/null
+++ b/bundle/vim-colorschemes
@@ -0,0 +1 @@
+Subproject commit 28a989b28457e38df620e4c7ab23e224aff70efe

From c2c2eb4c1242d78820a2ce572ba633cd9cd9e0b9 Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Wed, 3 Feb 2016 22:51:15 -0500
Subject: [PATCH 07/26] Restoring some of my old settings.

---
 vimrc | 95 +++++++++++++++++++++++++++--------------------------------
 1 file changed, 43 insertions(+), 52 deletions(-)

diff --git a/vimrc b/vimrc
index 13e002d..b619ebe 100644
--- a/vimrc
+++ b/vimrc
@@ -3,55 +3,46 @@ execute pathogen#infect()
 syntax on
 filetype plugin indent on
 
-"filetype plugin indent on
-"
-"" Tabbing
-"function! SetupTabbing()
-"  set tabstop=2
-"  set expandtab
-"  set shiftwidth=2
-"  set softtabstop=2
-"  set sw=2
-"  set autoindent
-"  set smartindent
-"  set smarttab
-"endfunction
-"command! -bar SetupTabbing call SetupTabbing()
-"SetupTabbing
-"
-"" Window settings
-"set winminwidth=20
-"set winwidth=100
-"set winheight=20
-"
-"" Syntax highlighting
-"syntax on
-"
-"" Wrapping settings
-"set nowrap " nowrap makes the lines not wrap
-"" set wrap " wrap makes the lines wrap
-"set linebreak
-"
-"" keeps lines below the cursor
-"set scrolloff=2
-"
-"" makes LaTeX use spell checking, word wrapping
-"autocmd FileType tex set wrap spell
-"autocmd FileType make set noexpandtab
-"autocmd FileType *gitconfig set noexpandtab
-"autocmd FileType python SetupTabbing
-"
-"" set term=xterm
-"
-"let java_allow_cpp_keywords = 1
-"
-"set ruler
-"set number
-"set backspace=indent,eol,start
-"set hlsearch
-"
-"augroup HiglightTODO
-"  autocmd!
-"  autocmd WinEnter,VimEnter * :silent! call matchadd('Todo', 'TODO', -1)
-"augroup END
-"
+" Window settings
+set winminwidth=20
+set winwidth=100
+set winheight=20
+
+" Wrapping
+set nowrap
+set linebreak " wrap nicer
+
+" Keeps lines below the cursor
+set scrolloff=2
+
+" Tabbing
+" I added this monster because Python doesn't play nice with my usual
+" settings, or some such nonsense. Anyway, it appears to work.
+function! SetupTabbing()
+  set tabstop=2
+  set expandtab
+  set shiftwidth=2
+  set softtabstop=2
+  set sw=2
+  set autoindent
+  set smartindent
+  set smarttab
+endfunction
+command! -bar SetupTabbing call SetupTabbing()
+SetupTabbing
+
+" makes LaTeX use spell checking, word wrapping
+autocmd FileType tex set wrap spell
+autocmd FileType make set noexpandtab
+autocmd FileType python SetupTabbing
+
+let java_allow_cpp_keywords=1
+
+set ruler
+set number
+set backspace=indent,eol,start
+set hlsearch
+
+"" I think this is some command for OS X compatibility? I don't know. Leaving
+"" it here so that I can find it later if I need it.
+"set term=xterm

From 5f920e2a81845e232ca0ccbf4d29729c9a980b4d Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Wed, 3 Feb 2016 23:48:36 -0500
Subject: [PATCH 08/26] Added scala support

---
 .gitmodules                               |  8 +++++++-
 bundle/{vim-colorschemes => colorschemes} |  0
 bundle/syntastic                          |  1 +
 bundle/vim-scala                          |  1 +
 vimrc                                     | 14 +++++++++++++-
 5 files changed, 22 insertions(+), 2 deletions(-)
 rename bundle/{vim-colorschemes => colorschemes} (100%)
 create mode 160000 bundle/syntastic
 create mode 160000 bundle/vim-scala

diff --git a/.gitmodules b/.gitmodules
index ba1d7ab..8d65e68 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,5 +8,11 @@
 	path = bundle/airline
 	url = https://github.com/vim-airline/vim-airline
 [submodule "bundle/vim-colorschemes"]
-	path = bundle/vim-colorschemes
+	path = bundle/colorschemes
 	url = https://github.com/flazz/vim-colorschemes
+[submodule "bundle/vim-scala"]
+	path = bundle/vim-scala
+	url = https://github.com/derekwyatt/vim-scala
+[submodule "bundle/syntastic"]
+	path = bundle/syntastic
+	url = https://github.com/scrooloose/syntastic
diff --git a/bundle/vim-colorschemes b/bundle/colorschemes
similarity index 100%
rename from bundle/vim-colorschemes
rename to bundle/colorschemes
diff --git a/bundle/syntastic b/bundle/syntastic
new file mode 160000
index 0000000..d8af502
--- /dev/null
+++ b/bundle/syntastic
@@ -0,0 +1 @@
+Subproject commit d8af5028ecd541f721dab769479092b643f47a76
diff --git a/bundle/vim-scala b/bundle/vim-scala
new file mode 160000
index 0000000..842baaf
--- /dev/null
+++ b/bundle/vim-scala
@@ -0,0 +1 @@
+Subproject commit 842baaff633b61fcc92e1db10042f0ed9571cf95
diff --git a/vimrc b/vimrc
index b619ebe..4ac5d3a 100644
--- a/vimrc
+++ b/vimrc
@@ -43,6 +43,18 @@ set number
 set backspace=indent,eol,start
 set hlsearch
 
+set splitright
+set splitbelow
+
+map <C-n> :NERDTreeToggle<CR>
+
+let g:airline#extensions#tabline#enabled = 1
+
+set laststatus=2
+"
 "" I think this is some command for OS X compatibility? I don't know. Leaving
 "" it here so that I can find it later if I need it.
-"set term=xterm
+"set term=xterm-color
+
+colorscheme 256-grayvim
+"colorscheme gentooish

From eabf124ec3a20631817cf65f2cf2b8bb77850226 Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Wed, 3 Feb 2016 23:48:57 -0500
Subject: [PATCH 09/26] Removed syntastic.

---
 .gitmodules      | 3 ---
 bundle/syntastic | 1 -
 2 files changed, 4 deletions(-)
 delete mode 160000 bundle/syntastic

diff --git a/.gitmodules b/.gitmodules
index 8d65e68..4520460 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,6 +13,3 @@
 [submodule "bundle/vim-scala"]
 	path = bundle/vim-scala
 	url = https://github.com/derekwyatt/vim-scala
-[submodule "bundle/syntastic"]
-	path = bundle/syntastic
-	url = https://github.com/scrooloose/syntastic
diff --git a/bundle/syntastic b/bundle/syntastic
deleted file mode 160000
index d8af502..0000000
--- a/bundle/syntastic
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d8af5028ecd541f721dab769479092b643f47a76

From eb8e9a4acf510042226f8035a0ad0c4141229b06 Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Tue, 16 Feb 2016 23:24:28 -0500
Subject: [PATCH 10/26] Updating config to work better in screen

---
 vimrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vimrc b/vimrc
index 4ac5d3a..e1b27d6 100644
--- a/vimrc
+++ b/vimrc
@@ -55,6 +55,7 @@ set laststatus=2
 "" I think this is some command for OS X compatibility? I don't know. Leaving
 "" it here so that I can find it later if I need it.
 "set term=xterm-color
+set t_Co=256
 
 colorscheme 256-grayvim
 "colorscheme gentooish

From 441787c46888f33a80c4dae1f0d6594f10593f6e Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Tue, 16 Feb 2016 23:31:53 -0500
Subject: [PATCH 11/26] Updating vimrc

---
 vimrc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vimrc b/vimrc
index e1b27d6..e3f2fcd 100644
--- a/vimrc
+++ b/vimrc
@@ -48,9 +48,14 @@ set splitbelow
 
 map <C-n> :NERDTreeToggle<CR>
 
+
+" Enable airline by default
+set laststatus=2
 let g:airline#extensions#tabline#enabled = 1
 
-set laststatus=2
+" Ignore *.pyc files.
+let NERDTreeIgnore = ['\.pyc$']
+
 "
 "" I think this is some command for OS X compatibility? I don't know. Leaving
 "" it here so that I can find it later if I need it.

From 728e102b576133e181e27e015be1d46b518d318b Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Tue, 22 Mar 2016 11:45:42 -0400
Subject: [PATCH 12/26] Update vimrc

---
 vimrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vimrc b/vimrc
index e3f2fcd..12dbe4a 100644
--- a/vimrc
+++ b/vimrc
@@ -64,3 +64,6 @@ set t_Co=256
 
 colorscheme 256-grayvim
 "colorscheme gentooish
+
+let mapleader = "/"
+set pastetoggle=<Leader>p

From f4ef7828f086ab0b6ffc6a9eb7d91ba14eda943f Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Tue, 22 Mar 2016 14:15:35 -0400
Subject: [PATCH 13/26] Added wrap/nowrap leader keys

---
 vimrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vimrc b/vimrc
index 12dbe4a..d3a223a 100644
--- a/vimrc
+++ b/vimrc
@@ -67,3 +67,5 @@ colorscheme 256-grayvim
 
 let mapleader = "/"
 set pastetoggle=<Leader>p
+map <Leader>w :set wrap<CR>
+map <Leader>e :set nowrap<CR>

From c7300bdef9d17cb9b082a634aca1596b4f2867cf Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Wed, 23 Mar 2016 23:04:53 -0400
Subject: [PATCH 14/26] old leader key was a dumb choice

---
 vimrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vimrc b/vimrc
index d3a223a..b640b37 100644
--- a/vimrc
+++ b/vimrc
@@ -65,7 +65,7 @@ set t_Co=256
 colorscheme 256-grayvim
 "colorscheme gentooish
 
-let mapleader = "/"
+let mapleader = "'"
 set pastetoggle=<Leader>p
 map <Leader>w :set wrap<CR>
 map <Leader>e :set nowrap<CR>

From 9d07f98860701b41924f887c85b1c28e653a3f5f Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Sun, 17 Apr 2016 11:07:10 -0400
Subject: [PATCH 15/26] leader key is annoying me right now

---
 vimrc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vimrc b/vimrc
index b640b37..74e2cd2 100644
--- a/vimrc
+++ b/vimrc
@@ -65,7 +65,7 @@ set t_Co=256
 colorscheme 256-grayvim
 "colorscheme gentooish
 
-let mapleader = "'"
-set pastetoggle=<Leader>p
-map <Leader>w :set wrap<CR>
-map <Leader>e :set nowrap<CR>
+"let mapleader = "'"
+"set pastetoggle=<Leader>p
+"map <Leader>w :set wrap<CR>
+"map <Leader>e :set nowrap<CR>

From 0d1bb5d6d173012bbb97e3df33cb3e272dd0976e Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Mon, 30 May 2016 20:38:43 -0400
Subject: [PATCH 16/26] Added relative numbers

---
 vimrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vimrc b/vimrc
index 74e2cd2..2856b67 100644
--- a/vimrc
+++ b/vimrc
@@ -40,6 +40,7 @@ let java_allow_cpp_keywords=1
 
 set ruler
 set number
+set relativenumber
 set backspace=indent,eol,start
 set hlsearch
 

From 153038bcc147c0421eac3927a6cda402245452e3 Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Sun, 31 Jul 2016 16:42:05 -0400
Subject: [PATCH 17/26] Minor tweaks: relative numbering; numbering; and set
 wrap and spell for *.markdown files.

---
 vimrc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/vimrc b/vimrc
index 74e2cd2..5e3c8fc 100644
--- a/vimrc
+++ b/vimrc
@@ -35,6 +35,7 @@ SetupTabbing
 autocmd FileType tex set wrap spell
 autocmd FileType make set noexpandtab
 autocmd FileType python SetupTabbing
+autocmd FileType markdown set wrap spell
 
 let java_allow_cpp_keywords=1
 
@@ -69,3 +70,7 @@ colorscheme 256-grayvim
 "set pastetoggle=<Leader>p
 "map <Leader>w :set wrap<CR>
 "map <Leader>e :set nowrap<CR>
+
+set number
+set relativenumber
+

From 54745c3bf47fd87d6eca0ebc813fd1d8d9c94b69 Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Sun, 31 Jul 2016 16:47:43 -0400
Subject: [PATCH 18/26] Remove duplicated lines

---
 vimrc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/vimrc b/vimrc
index 9376a79..e313769 100644
--- a/vimrc
+++ b/vimrc
@@ -72,6 +72,3 @@ colorscheme 256-grayvim
 "map <Leader>w :set wrap<CR>
 "map <Leader>e :set nowrap<CR>
 
-set number
-set relativenumber
-

From 6797bd90c707013501ecfe71ca7158fbe73ca079 Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Sun, 8 Jan 2017 22:34:30 -0500
Subject: [PATCH 19/26] Added vimwiki submodule

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

diff --git a/.gitmodules b/.gitmodules
index 4520460..eee701e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "bundle/vim-scala"]
 	path = bundle/vim-scala
 	url = https://github.com/derekwyatt/vim-scala
+[submodule "bundle/vimwiki"]
+	path = bundle/vimwiki
+	url = https://github.com/vimwiki/vimwiki.git
diff --git a/bundle/vimwiki b/bundle/vimwiki
new file mode 160000
index 0000000..3a87437
--- /dev/null
+++ b/bundle/vimwiki
@@ -0,0 +1 @@
+Subproject commit 3a8743700581923c6fd2684510dad48a8b2b8c64

From d5a5893a489a4df8b8e0608202c5d3951442875e Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Tue, 10 Jan 2017 22:14:38 -0500
Subject: [PATCH 20/26] Added multiple wikis

---
 vimrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vimrc b/vimrc
index e313769..4cdc0ad 100644
--- a/vimrc
+++ b/vimrc
@@ -72,3 +72,5 @@ colorscheme 256-grayvim
 "map <Leader>w :set wrap<CR>
 "map <Leader>e :set nowrap<CR>
 
+let g:vimwiki_list = [ {'path': '~/vimwiki'}, {'path': '~/Code/vimwiki-client-notes'} ]
+

From 26f78e3b7c9a7c58386450c728ecffa0ece2e91a Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Mon, 13 Mar 2017 11:51:19 -0400
Subject: [PATCH 21/26] Add setting for webpack

---
 vimrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vimrc b/vimrc
index 4cdc0ad..402fe6f 100644
--- a/vimrc
+++ b/vimrc
@@ -74,3 +74,6 @@ colorscheme 256-grayvim
 
 let g:vimwiki_list = [ {'path': '~/vimwiki'}, {'path': '~/Code/vimwiki-client-notes'} ]
 
+" fixes webpack file watchers
+set backupcopy=yes
+

From 922e28dbb70c2258dc2b97a74dbee54382e57b4b Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Mon, 8 May 2017 14:19:07 -0400
Subject: [PATCH 22/26] Add graphql support

---
 .gitmodules        | 5 ++++-
 bundle/vim-graphql | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 160000 bundle/vim-graphql

diff --git a/.gitmodules b/.gitmodules
index eee701e..8fc050c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,4 +15,7 @@
 	url = https://github.com/derekwyatt/vim-scala
 [submodule "bundle/vimwiki"]
 	path = bundle/vimwiki
-	url = https://github.com/vimwiki/vimwiki.git
+  url = https://github.com/vimwiki/vimwiki.git
+[submodule "bundle/vim-graphql"]
+	path = bundle/vim-graphql
+	url = https://github.com/jparise/vim-graphql
diff --git a/bundle/vim-graphql b/bundle/vim-graphql
new file mode 160000
index 0000000..88abf6e
--- /dev/null
+++ b/bundle/vim-graphql
@@ -0,0 +1 @@
+Subproject commit 88abf6e7f418f399478359c8bf279f000615c2ef

From d0d5e2809d5315bb63c94908cd5e7580bf6ca4f7 Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Mon, 15 May 2017 13:44:47 -0400
Subject: [PATCH 23/26] Add typescript support

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

diff --git a/.gitmodules b/.gitmodules
index 8fc050c..9c2680f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "bundle/vim-graphql"]
 	path = bundle/vim-graphql
 	url = https://github.com/jparise/vim-graphql
+[submodule "bundle/typescript-vim"]
+	path = bundle/typescript-vim
+	url = https://github.com/leafgarland/typescript-vim
diff --git a/bundle/typescript-vim b/bundle/typescript-vim
new file mode 160000
index 0000000..4dc79bd
--- /dev/null
+++ b/bundle/typescript-vim
@@ -0,0 +1 @@
+Subproject commit 4dc79bd1b0c43c16cae146bee065f2acc6d2b789

From 3a4a1dd2d48b50777ee28aa7b39edb7264d6af6d Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Tue, 30 May 2017 16:24:40 -0400
Subject: [PATCH 24/26] Add file change detection

---
 vimrc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/vimrc b/vimrc
index 402fe6f..8b793ce 100644
--- a/vimrc
+++ b/vimrc
@@ -77,3 +77,13 @@ let g:vimwiki_list = [ {'path': '~/vimwiki'}, {'path': '~/Code/vimwiki-client-no
 " fixes webpack file watchers
 set backupcopy=yes
 
+" put swap files out of the current directory
+set dir=$HOME/.vim/tmp/swap
+if !isdirectory(&dir) | call mkdir(&dir, 'p', 0700) | endif
+
+set autoread
+set updatetime=100
+au FileChangedShell * checktime
+au CursorHold * checktime
+au CursorHoldI * checktime
+

From 59cadfdd6cebf39222089d93ce6d38ae0716fa66 Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Mon, 17 Jul 2017 22:43:52 -0400
Subject: [PATCH 25/26] Install elixir support

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

diff --git a/.gitmodules b/.gitmodules
index 9c2680f..be95b13 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,6 @@
 [submodule "bundle/typescript-vim"]
 	path = bundle/typescript-vim
 	url = https://github.com/leafgarland/typescript-vim
+[submodule "bundle/vim-elixir"]
+	path = bundle/vim-elixir
+	url = https://github.com/elixir-lang/vim-elixir.git
diff --git a/bundle/vim-elixir b/bundle/vim-elixir
new file mode 160000
index 0000000..1c9344d
--- /dev/null
+++ b/bundle/vim-elixir
@@ -0,0 +1 @@
+Subproject commit 1c9344d8032374ca3767b1aaa0001edee9602e35

From 8ed62743bba32e3b63850a75fbec0448e4a3bf98 Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Tue, 12 Sep 2017 12:24:52 -0400
Subject: [PATCH 26/26] Moving into subdirectory

---
 .gitmodules                             | 18 +++++++++---------
 vimrc => vim/.vimrc                     |  0
 {autoload => vim/autoload}/pathogen.vim |  0
 {bundle => vim/bundle}/airline          |  0
 {bundle => vim/bundle}/colorschemes     |  0
 {bundle => vim/bundle}/fugitive         |  0
 {bundle => vim/bundle}/nerdtree         |  0
 {bundle => vim/bundle}/typescript-vim   |  0
 {bundle => vim/bundle}/vim-elixir       |  0
 {bundle => vim/bundle}/vim-graphql      |  0
 {bundle => vim/bundle}/vim-scala        |  0
 {bundle => vim/bundle}/vimwiki          |  0
 12 files changed, 9 insertions(+), 9 deletions(-)
 rename vimrc => vim/.vimrc (100%)
 rename {autoload => vim/autoload}/pathogen.vim (100%)
 rename {bundle => vim/bundle}/airline (100%)
 rename {bundle => vim/bundle}/colorschemes (100%)
 rename {bundle => vim/bundle}/fugitive (100%)
 rename {bundle => vim/bundle}/nerdtree (100%)
 rename {bundle => vim/bundle}/typescript-vim (100%)
 rename {bundle => vim/bundle}/vim-elixir (100%)
 rename {bundle => vim/bundle}/vim-graphql (100%)
 rename {bundle => vim/bundle}/vim-scala (100%)
 rename {bundle => vim/bundle}/vimwiki (100%)

diff --git a/.gitmodules b/.gitmodules
index be95b13..9e9c33e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,27 +1,27 @@
 [submodule "bundle/fugitive"]
-	path = bundle/fugitive
+	path = vim/bundle/fugitive
 	url = https://github.com/tpope/vim-fugitive.git
 [submodule "bundle/nerdtree"]
-	path = bundle/nerdtree
+	path = vim/bundle/nerdtree
 	url = https://github.com/scrooloose/nerdtree.git
 [submodule "bundle/airline"]
-	path = bundle/airline
+	path = vim/bundle/airline
 	url = https://github.com/vim-airline/vim-airline
 [submodule "bundle/vim-colorschemes"]
-	path = bundle/colorschemes
+	path = vim/bundle/colorschemes
 	url = https://github.com/flazz/vim-colorschemes
 [submodule "bundle/vim-scala"]
-	path = bundle/vim-scala
+	path = vim/bundle/vim-scala
 	url = https://github.com/derekwyatt/vim-scala
 [submodule "bundle/vimwiki"]
-	path = bundle/vimwiki
+	path = vim/bundle/vimwiki
   url = https://github.com/vimwiki/vimwiki.git
 [submodule "bundle/vim-graphql"]
-	path = bundle/vim-graphql
+	path = vim/bundle/vim-graphql
 	url = https://github.com/jparise/vim-graphql
 [submodule "bundle/typescript-vim"]
-	path = bundle/typescript-vim
+	path = vim/bundle/typescript-vim
 	url = https://github.com/leafgarland/typescript-vim
 [submodule "bundle/vim-elixir"]
-	path = bundle/vim-elixir
+	path = vim/bundle/vim-elixir
 	url = https://github.com/elixir-lang/vim-elixir.git
diff --git a/vimrc b/vim/.vimrc
similarity index 100%
rename from vimrc
rename to vim/.vimrc
diff --git a/autoload/pathogen.vim b/vim/autoload/pathogen.vim
similarity index 100%
rename from autoload/pathogen.vim
rename to vim/autoload/pathogen.vim
diff --git a/bundle/airline b/vim/bundle/airline
similarity index 100%
rename from bundle/airline
rename to vim/bundle/airline
diff --git a/bundle/colorschemes b/vim/bundle/colorschemes
similarity index 100%
rename from bundle/colorschemes
rename to vim/bundle/colorschemes
diff --git a/bundle/fugitive b/vim/bundle/fugitive
similarity index 100%
rename from bundle/fugitive
rename to vim/bundle/fugitive
diff --git a/bundle/nerdtree b/vim/bundle/nerdtree
similarity index 100%
rename from bundle/nerdtree
rename to vim/bundle/nerdtree
diff --git a/bundle/typescript-vim b/vim/bundle/typescript-vim
similarity index 100%
rename from bundle/typescript-vim
rename to vim/bundle/typescript-vim
diff --git a/bundle/vim-elixir b/vim/bundle/vim-elixir
similarity index 100%
rename from bundle/vim-elixir
rename to vim/bundle/vim-elixir
diff --git a/bundle/vim-graphql b/vim/bundle/vim-graphql
similarity index 100%
rename from bundle/vim-graphql
rename to vim/bundle/vim-graphql
diff --git a/bundle/vim-scala b/vim/bundle/vim-scala
similarity index 100%
rename from bundle/vim-scala
rename to vim/bundle/vim-scala
diff --git a/bundle/vimwiki b/vim/bundle/vimwiki
similarity index 100%
rename from bundle/vimwiki
rename to vim/bundle/vimwiki