Changes from work

vim/.vimrc

@@ -50,6 +50,9 @@
     Plug 'chrisbra/colorizer'
     " cljfold
     Plug 'christoomey/vim-tmux-navigator'
+    Plug 'tpope/vim-rhubarb'
+    Plug 'zhaozg/vim-diagram'
+    Plug 'arcticicestudio/nord-vim'
     
 
 "    " Todo:
@@ -107,7 +110,8 @@
     set ttyfast                    " Improves smoothness and drawing
     set backspace=indent,eol,start " Always allow backspacing
     set undofile                   " Make .un file for persistent undo
-    set relativenumber             " Make numbers relative to current line
+    " set relativenumber             " Make numbers relative to current line
+    set number
     set lazyredraw                 " Redraw only when necessary
     set updatetime=100             " Make updates happen faster (gitgutter)
     set splitright                 " Make split to right by default
@@ -422,6 +426,25 @@ command! -register CopyMatches call CopyMatches(<q-reg>)
     :nmap <Leader>v :e $MYVIMRC
 "}}}
 
+" hi DiffAdd      ctermfg=NONE          ctermbg=darkgreen
+" hi DiffChange   ctermfg=NONE          ctermbg=darkgrey
+" hi DiffDelete   ctermfg=None            ctermbg=Red
+" hi Search cterm=NONE ctermfg=black ctermbg=lightgray
+"
+" highlight DiffAdd    cterm=bold ctermfg=10 ctermbg=17 gui=none guifg=bg guibg=Red
+" highlight DiffDelete cterm=bold ctermfg=10 ctermbg=17 gui=none guifg=bg guibg=Red
+" highlight DiffChange cterm=bold ctermfg=10 ctermbg=17 gui=none guifg=bg guibg=Red
+" highlight DiffText   cterm=bold ctermfg=10 ctermbg=88 gui=none guifg=bg guibg=Red
+
+hi DiffAdd      cterm=none    ctermfg=NONE          ctermbg=Green
+hi DiffChange   cterm=none    ctermfg=NONE          ctermbg=Grey
+hi DiffDelete   cterm=bold    ctermfg=NONE          ctermbg=Red
+hi DiffText     cterm=none    ctermfg=NONE          ctermbg=Yellow
+
+
+
+" better diffs
+set diffopt+=internal,algorithm:patience
 
 " TODO: rebind c-n
 " TODO: change ,k to ,n and add notes to version control