Many changes.

22 files changed, 99 insertions, 28 deletions

diff --git a/after/syntax/c.vim b/after/syntax/c.vim
deleted file mode 120000
index 75c0b62..0000000
--- a/after/syntax/c.vim
+++ /dev/null
@@ -1 +0,0 @@
-../../repos/vim-cpp-modern/after/syntax/c.vim
\ No newline at end of file
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
deleted file mode 120000
index 16ac706..0000000
--- a/after/syntax/cpp.vim
+++ /dev/null
@@ -1 +0,0 @@
-../../repos/vim-cpp-modern/after/syntax/cpp.vim
\ No newline at end of file
diff --git a/colors/cobalt2.vim b/colors/cobalt2.vim
deleted file mode 120000
index 454971d..0000000
--- a/colors/cobalt2.vim
+++ /dev/null
@@ -1 +0,0 @@
-../repos/cobalt2-vim-theme/colors/cobalt2.vim
\ No newline at end of file
diff --git a/colors/default-cterm.vim b/colors/default-cterm.vim
new file mode 100644
index 0000000..6c5f70d
--- /dev/null
+++ b/colors/default-cterm.vim
@@ -0,0 +1,78 @@
+highlight clear
+
+if exists("syntax_on")
+  syntax reset
+endif
+
+let colors_name = "default-cterm"
+
+highlight SpecialKey     ctermfg=4
+highlight TermCursor     cterm=reverse
+highlight NonText        ctermfg=12
+highlight Directory      ctermfg=4
+highlight ErrorMsg       ctermfg=15 ctermbg=1
+highlight IncSearch      cterm=reverse
+highlight MoreMsg        ctermfg=2
+highlight ModeMsg        cterm=bold
+highlight CursorLineNr   ctermfg=3
+highlight Question       ctermfg=2
+highlight Title          ctermfg=5
+highlight WarningMsg     ctermfg=1
+highlight WildMenu       ctermfg=0 ctermbg=11
+highlight Conceal        ctermfg=7 ctermbg=7
+highlight SpellBad       ctermbg=2
+highlight SpellRare      ctermbg=5
+highlight SpellLocal     ctermbg=14
+highlight PmenuSbar      ctermbg=8
+highlight PmenuThumb     ctermbg=0
+highlight TabLine        cterm=underline ctermfg=0 ctermbg=7
+highlight TabLineSel     cterm=bold
+highlight TabLineFill    cterm=reverse
+highlight CursorColumn   ctermbg=7
+highlight CursorLine     cterm=underline
+highlight MatchParen     ctermbg=14
+highlight Constant       ctermfg=1
+highlight Special        ctermfg=13
+highlight Identifier     cterm=NONE ctermfg=6
+highlight Statement      ctermfg=3
+highlight PreProc        ctermfg=5
+highlight Type           ctermfg=2
+highlight Underlined     cterm=underline ctermfg=5
+highlight Ignore         ctermfg=15
+highlight Error          ctermfg=15 ctermbg=9
+highlight Todo           ctermfg=0 ctermbg=11
+
+" In diffs, added lines are green, changed lines are yellow, deleted lines are
+" red, and changed text (within a changed line) is bright yellow and bold.
+highlight DiffText     ctermfg=0    ctermbg=11   cterm=bold
+highlight DiffChange   ctermfg=3    ctermbg=0    cterm=bold
+highlight DiffAdd      ctermfg=2    ctermbg=0    cterm=bold
+highlight DiffDelete   ctermfg=1    ctermbg=0    cterm=bold
+
+" Invert selected lines in visual mode
+highlight Visual         ctermfg=NONE ctermbg=NONE cterm=inverse
+
+" Highlight search matches in black, with a yellow background
+highlight Search         ctermfg=0    ctermbg=11
+
+" Dim line numbers, comments, color columns, the status line, splits and sign
+" columns.
+highlight LineNr       ctermfg=4    ctermbg=0
+highlight Comment      ctermfg=4
+highlight ColorColumn  ctermfg=7    ctermbg=8
+highlight Folded       ctermfg=7    ctermbg=0
+highlight FoldColumn   ctermfg=7    ctermbg=8
+highlight Pmenu        ctermfg=7    ctermbg=8
+highlight PmenuSel     ctermfg=0    ctermbg=11
+highlight SpellCap     ctermfg=7    ctermbg=8
+highlight StatusLine   ctermfg=16   ctermbg=15   cterm=bold
+highlight StatusLineNC ctermfg=7    ctermbg=8    cterm=NONE
+highlight VertSplit    ctermfg=7    ctermbg=8    cterm=NONE
+highlight SignColumn                ctermbg=0
+
+highlight CocWarningSign      ctermbg=0    ctermfg=3
+highlight CocHintSign         ctermbg=0    ctermfg=4
+highlight CocInfoSign         ctermbg=0    ctermfg=4
+highlight CocErrorSign        ctermbg=0    ctermfg=1
+highlight CocWarningFloat     ctermfg=11
+highlight CocErrorFloat       ctermfg=1
diff --git a/indent/bib.vim b/indent/bib.vim
deleted file mode 120000
index 44a2000..0000000
--- a/indent/bib.vim
+++ /dev/null
@@ -1 +0,0 @@
-indent/bib.vim
\ No newline at end of file
diff --git a/indent/tex.vim b/indent/tex.vim
deleted file mode 120000
index d9c4a95..0000000
--- a/indent/tex.vim
+++ /dev/null
@@ -1 +0,0 @@
-indent/tex.vim
\ No newline at end of file
diff --git a/plugged/coc.nvim b/plugged/coc.nvim
deleted file mode 160000
-Subproject d4dd5b318f32790ae9a4cb4945c7eb0063b07d0
diff --git a/plugged/haskell-vim b/plugged/haskell-vim
deleted file mode 160000
-Subproject b1ac46807835423c4a4dd063df6d5b613d89c73
diff --git a/plugged/vim-clang-format b/plugged/vim-clang-format
deleted file mode 160000
-Subproject 95593b67723f23979cd7344ecfd049f2f917830
diff --git a/plugged/vim-cpp-modern b/plugged/vim-cpp-modern
new file mode 160000
+Subproject 5a2c44c38b77999ff04fb70092440a85e789d3f
diff --git a/plugged/vim-fugitive b/plugged/vim-fugitive
deleted file mode 160000
-Subproject 3c3e6ea67b0250db077e4a7c1b033f4537893e2
diff --git a/plugged/vim-hindent b/plugged/vim-hindent
deleted file mode 160000
-Subproject f8e84c199fd00a3ccaf5bbbc97786bde9a4faa1
diff --git a/plugged/vim-mma b/plugged/vim-mma
-Subproject 2784175361fbe167d62686787fb06300cc2f9ff
+Subproject e0dda491e2f4175e5a3e76748c54ab6a212f9eb
diff --git a/plugged/vimtex b/plugged/vimtex
deleted file mode 160000
-Subproject 7827aee949eed7dfb2744512959b1d36ef21d14
diff --git a/repos/cobalt2-vim-theme b/repos/cobalt2-vim-theme
deleted file mode 160000
-Subproject 45973c6083d4f53b71f976b9718a5b663927be1
diff --git a/repos/lsp-wl b/repos/lsp-wl
-Subproject 7adcf02f324c0c16f7afe81e6c3234416c2574b
+Subproject 34bfee18c83460153a9ea4a1fa9378a9cac087f
diff --git a/repos/vim-cpp-enhanced-highlight b/repos/vim-cpp-enhanced-highlight
deleted file mode 160000
-Subproject da1d86aaf42bd4e52272b5a2f62b098c3986c04
diff --git a/repos/vim-cpp-modern b/repos/vim-cpp-modern
deleted file mode 160000
-Subproject a025771d1280cf8767c460a9318be63d50438b9
diff --git a/repos/wolfram-vim b/repos/wolfram-vim
deleted file mode 160000
-Subproject cfc6118100254454199a412997124cedb347771
diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add
index 220a165..4e0f58e 100644
--- a/spell/en.utf-8.add
+++ b/spell/en.utf-8.add
@@ -174,3 +174,7 @@ orthorhombicity
 uniaxial
 hyperribbons
 hyperribbon
+Ising
+coronavirus
+reparameterization
+XY
diff --git a/syntax/wl.vim b/syntax/wl.vim
deleted file mode 120000
index 3b06ac5..0000000
--- a/syntax/wl.vim
+++ /dev/null
@@ -1 +0,0 @@
-../repos/wolfram-vim/syntax/wl.vim
\ No newline at end of file
diff --git a/vimrc b/vimrc
index 2242a4c..e3695f1 100644
--- a/vimrc
+++ b/vimrc
@@ -1,22 +1,23 @@
-
 set shell=/bin/zsh
 
-set t_Co=256
-colorscheme cobalt2
+packadd coc
+packadd vimtex
+
+" colors
+set background=dark
+colorscheme default-cterm
+
 set ruler  " show the cursor position all the time
 set showcmd " display incomplete commands
-set number "show line numbers
-set laststatus=2 "show status bar
+set number " show line numbers
+set laststatus=2 " show status bar
 set foldmethod=syntax
-set background=dark
-
-" allow backspacing over everything in insert mode
-set nocompatible
+set nocompatible " allow backspacing over everything in insert mode
 set backspace=indent,eol,start
 set backupdir=~/.vim/swaps//
 set viminfo+=n~/.vim/info
 set history=200
-set hidden "allow switching buffers without saving
+set hidden " allow switching buffers without saving
 
 set incsearch " do incremental searching
 set hlsearch
@@ -25,11 +26,12 @@ filetype plugin indent on
 syntax on
 
 set list
-set listchars=tab:\|\ 
-set tabstop=2 softtabstop=0 expandtab shiftwidth=2 smarttab
+set listchars=tab:\|\ " show hard tabs
+set tabstop=2 softtabstop=0 expandtab shiftwidth=2 smarttab " tab settings
 
 " latex settings
 let g:vimtex_view_method = 'zathura'
+let g:vimtex_latexmk_continuous = 0
 let g:vimtex_compiler_latexmk = {
     \ 'options' : [
     \   '-pdf',
@@ -37,7 +39,7 @@ let g:vimtex_compiler_latexmk = {
     \   '-verbose',
     \   '-file-line-error',
     \   '-synctex=1',
-    \   '-interaction=nonstopmode',
+    \   '-interaction=nonstopmode'
     \ ],
     \}
 
@@ -95,15 +97,8 @@ nmap ga :CocCommand git.chunkStage<cr>
 nmap gu :CocCommand git.chunkUndo<cr>
 
 call plug#begin()
-
-Plug 'lervag/vimtex'
-Plug 'rhysd/vim-clang-format'
-Plug 'neovimhaskell/haskell-vim'
-Plug 'alx741/vim-hindent' 
-Plug 'tpope/vim-fugitive'
-Plug 'neoclide/coc.nvim'
-Plug 'voldikss/vim-mma'
-
+  Plug 'voldikss/vim-mma'
+  Plug 'bfrg/vim-cpp-modern'
 call plug#end()
 
 " Add format option 'w' to add trailing white space, indicating that paragraph