Bw

7 files changed, 151 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index 640f120..2a2a2e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,6 +86,7 @@ linux/sway/autostart
 linux/sway/hid
 Makefile
 config
+Common/nvim/colors/bw.vim
 *.pyc
 
 *.add
diff --git a/Common/nvim/after/ftplugin/latex.lua b/Common/nvim/after/ftplugin/latex.lua
new file mode 100644
index 0000000..3792dd7
--- /dev/null
+++ b/Common/nvim/after/ftplugin/latex.lua
@@ -0,0 +1 @@
+vim.cmd [[ syntax on ]]
diff --git a/Common/nvim/after/ftplugin/vimwiki.lua b/Common/nvim/after/ftplugin/vimwiki.lua
new file mode 100644
index 0000000..3792dd7
--- /dev/null
+++ b/Common/nvim/after/ftplugin/vimwiki.lua
@@ -0,0 +1 @@
+vim.cmd [[ syntax on ]]
diff --git a/Common/nvim/colors/bw.vim.m4 b/Common/nvim/colors/bw.vim.m4
new file mode 100644
index 0000000..282cc30
--- /dev/null
+++ b/Common/nvim/colors/bw.vim.m4
@@ -0,0 +1,138 @@
+if exists("syntax_on")
+  syntax reset
+endif
+
+let g:colors_name = "bw"
+
+highlight clear
+
+" Ensure all other common syntax elements use default colors
+m4_define(`hir', `highlight $1 guibg=NONE ctermbg=NONE guifg=NONE ctermfg=NONE cterm=NONE gui=NONE')m4_dnl
+hir(Normal)
+hir(Constant)
+hir(Identifier)
+hir(Statement)
+hir(PreProc)
+hir(Type)
+hir(Special)
+hir(Underlined)
+hir(Todo)
+hir(String)
+hir(Function)
+hir(Conditional)
+hir(Repeat)
+hir(Operator)
+hir(Structure)
+hir(LineNr)
+hir(NonText)
+hir(SpecialKey)
+hir(Title)
+hir(WarningMsg)
+hir(DiffAdd)
+hir(DiffChange)
+hir(DiffDelete)
+hir(DiffText)
+hir(Folded)
+hir(FoldColumn)
+hir(SignColumn)
+hir(VertSplit)
+hir(TabLine)
+hir(TabLineFill)
+hir(TabLineSel)
+hir(CursorLine)
+hir(CursorColumn)
+hir(QuickFixLine)
+hir(PMenu)
+hir(PMenuSel)
+hir(PMenuSbar)
+hir(PMenuThumb)
+hir(ModeMsg)
+hir(StatusLine)
+hir(StatusLineNC)
+hir(WinBar)
+hir(Menu)
+hir(Scrollbar)
+hir(Tooltip)
+hir(Visual)
+
+" Customize comment color
+
+hi Conceal       guifg=LightGrey         guibg=DarkGrey           ctermfg=LightGrey  ctermbg=DarkGrey                                     
+hi NonText       guifg=Blue              gui=bold                 ctermfg=Blue                                                            
+
+hi StatusLine    gui=reverse,bold        cterm=reverse,bold                                                                               
+hi StatusLineNC  gui=reverse             cterm=reverse                                                                                    
+
+hi TabLine       term=reverse            cterm=reverse            ctermfg=NONE       ctermbg=NONE      gui=reverse            guifg=NONE  guibg=NONE
+hi TabLineFill   term=reverse            cterm=reverse            ctermfg=NONE       ctermbg=NONE      gui=reverse            guifg=NONE  guibg=NONE
+
+hi WinBar        gui=bold                cterm=bold                                                                                       
+hi WildMenu      guifg=Black             guibg=Yellow             ctermfg=Black      ctermbg=Yellow                                       
+
+hi PmenuSbar     term=reverse            cterm=reverse            ctermfg=NONE       ctermbg=NONE      gui=reverse            guifg=NONE  guibg=NONE
+hi Pmenu         term=reverse            cterm=reverse            ctermfg=NONE       ctermbg=NONE      gui=reverse            guifg=NONE  guibg=NONE
+hi PmenuThumb    term=reverse            cterm=reverse            ctermfg=NONE       ctermbg=NONE      gui=reverse            guifg=NONE  guibg=NONE
+
+hi Visual        term=reverse            cterm=reverse            ctermfg=NONE       ctermbg=NONE      gui=reverse            guifg=NONE  guibg=NONE
+hi VisualNOS     term=reverse,underline  cterm=reverse,underline  ctermfg=NONE       ctermbg=NONE      gui=reverse,underline  guifg=NONE  guibg=NONE
+
+hi  SpellBad    term=undercurl  cterm=undercurl  ctermfg=5  ctermbg=NONE  gui=undercurl  guifg=NONE  guibg=NONE guisp=DarkRed 
+hi  SpellCap    term=undercurl  cterm=undercurl  ctermfg=5  ctermbg=NONE  gui=undercurl  guifg=NONE  guibg=NONE guisp=DarkYellow 
+hi  SpellLocal  term=undercurl  cterm=undercurl  ctermfg=5  ctermbg=NONE  gui=undercurl  guifg=NONE  guibg=NONE guisp=Green 
+hi  SpellRare   term=undercurl  cterm=undercurl  ctermfg=5  ctermbg=NONE  gui=undercurl  guifg=NONE  guibg=NONE guisp=DarkCyan 
+
+"hi  DiffAdd     term=NONE  cterm=NONE  ctermfg=2   ctermbg=NONE  gui=NONE  guifg=White  guibg=DarkGreen
+"hi  DiffChange  term=NONE  cterm=NONE  ctermfg=94  ctermbg=NONE  gui=NONE  guifg=White  guibg=DarkYellow
+"hi  DiffDelete  term=NONE  cterm=NONE  ctermfg=1   ctermbg=NONE  gui=NONE  guifg=White  guibg=DarkRed
+"hi  DiffText    term=NONE  cterm=NONE  ctermfg=4   ctermbg=NONE  gui=NONE  guifg=Blue   guibg=NONE
+hi  DiffAdd     term=NONE  cterm=NONE  ctermfg=2   ctermbg=NONE  gui=NONE  guifg=Green       guibg=NONE
+hi  DiffChange  term=NONE  cterm=NONE  ctermfg=94  ctermbg=NONE  gui=NONE  guifg=DarkYellow  guibg=NONE
+hi  DiffDelete  term=NONE  cterm=NONE  ctermfg=1   ctermbg=NONE  gui=NONE  guifg=Red         guibg=NONE
+hi  DiffText    term=NONE  cterm=NONE  ctermfg=4   ctermbg=NONE  gui=NONE  guifg=Blue        guibg=NONE
+
+hi  Comment         term=NONE  cterm=NONE  ctermfg=248   ctermbg=NONE  gui=NONE  guifg=Grey  guibg=NONE
+hi  FoldColumn      term=NONE  cterm=NONE  ctermfg=248   ctermbg=NONE  gui=NONE  guifg=Grey  guibg=NONE
+hi  Folded          term=NONE  cterm=NONE  ctermfg=240   ctermbg=NONE  gui=NONE  guifg=Grey  guibg=NONE
+hi  LineNr          term=NONE  cterm=NONE  ctermfg=248   ctermbg=NONE  gui=NONE  guifg=Grey  guibg=NONE
+hi  NonText         term=NONE  cterm=NONE  ctermfg=248   ctermbg=NONE  gui=NONE  guifg=Grey  guibg=NONE
+hi  SignColumn      term=NONE  cterm=NONE  ctermfg=240   ctermbg=NONE  gui=NONE  guifg=Grey  guibg=bg
+hi  SpecialComment  term=NONE  cterm=NONE  ctermfg=248   ctermbg=NONE  gui=NONE  guifg=Grey  guibg=NONE
+hi  SpecialKey      term=NONE  cterm=NONE  ctermfg=240   ctermbg=NONE  gui=NONE  guifg=Grey  guibg=bg
+hi  ColorColumn     term=NONE  cterm=NONE  ctermbg=240   ctermfg=NONE  gui=NONE  guibg=LightGrey  guifg=NONE
+
+"hi  String      ctermbg=NONE  ctermfg=NONE  guifg=Grey  cterm=NONE  gui=NONE
+hi  Underlined  ctermbg=NONE  ctermfg=NONE  guifg=NONE  cterm=bold  gui=bold
+
+hi  Normal           ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  Constant         ctermbg=NONE    ctermfg=NONE     cterm=bold         
+hi  Error            ctermbg=white   ctermfg=red      cterm=reverse      gui=reverse
+hi  WarningMsg       ctermbg=NONE    ctermfg=red      cterm=NONE         
+hi  Identifier       ctermbg=NONE    ctermfg=NONE     cterm=bold         gui=bold
+hi  Ignore           ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  PreProc          ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  Special          ctermbg=NONE    ctermfg=NONE     cterm=italic       gui=italic
+hi  Statement        ctermbg=NONE    ctermfg=NONE     cterm=bold         gui=bold
+hi  Todo             ctermbg=NONE    ctermfg=NONE     cterm=reverse      gui=reverse
+hi  Type             ctermbg=NONE    ctermfg=NONE     cterm=bold,italic  gui=bold,italic
+hi  Title            ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  CursorLine       ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  LineNr           ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  CursorLineNr     ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  helpLeadBlank    ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  helpNormal       ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  PmenuSel         ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  SpecialKey       ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  IncSearch        ctermbg=green   ctermfg=black    cterm=NONE         
+hi  Search           ctermbg=yellow  ctermfg=black    cterm=NONE         
+hi  Directory        ctermbg=NONE    ctermfg=NONE     cterm=bold         
+hi  MatchParen       ctermbg=NONE    ctermfg=NONE     cterm=reverse      gui=reverse
+hi  SignColumn       ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  MoreMsg          ctermbg=NONE    ctermfg=magenta  cterm=NONE         
+hi  Question         ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  Cursor           ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  CursorColumn     ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  QuickFixLine     ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  ToolbarLine      ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  ToolbarButton    ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  debugPC          ctermbg=NONE    ctermfg=NONE     cterm=NONE         
+hi  debugBreakpoint  ctermbg=NONE    ctermfg=NONE     cterm=NONE         
diff --git a/Common/nvim/lua/basic.lua b/Common/nvim/lua/basic.lua
index cb36189..342dde9 100755
--- a/Common/nvim/lua/basic.lua
+++ b/Common/nvim/lua/basic.lua
@@ -1,4 +1,3 @@
-vim.opt.autoread = true
 vim.opt.formatoptions:remove("t")
 vim.opt.path:append("**")
 vim.g.netrw_banner = 0
@@ -29,11 +28,10 @@ vim.cmd [[
 ]]
 
 -- Colorscheme
-vim.cmd [[ colorscheme vim ]]
+vim.cmd [[ colorscheme bw ]]
 vim.opt.background = "light"
 -- No idea why, preview in fzf does at least work extremely porly without this
 vim.cmd [[ let $BAT_THEME = 'gruvbox-light' ]]
 
 -- Show colour column
 vim.opt.colorcolumn = '120'
-vim.api.nvim_set_hl(0, "ColorColumn", { ctermbg = "lightgrey", bg = "#eae7da" })
diff --git a/Common/nvim/lua/plugins.lua b/Common/nvim/lua/plugins.lua
index 1faf832..829ca15 100755
--- a/Common/nvim/lua/plugins.lua
+++ b/Common/nvim/lua/plugins.lua
@@ -17,12 +17,7 @@ return require('packer').startup(function(use)
   -- Packer itself :)
   use 'wbthomason/packer.nvim'
 
-  -- Git plugins
-  use {
-    'tpope/vim-fugitive',
-  }
-
-  -- fzf (Fuzzy finder for various things)
+  use 'tpope/vim-fugitive'
   use {
       'junegunn/fzf.vim',
       requires = { 'junegunn/fzf', 'kyazdani42/nvim-web-devicons' },
@@ -70,6 +65,9 @@ return require('packer').startup(function(use)
         ensure_installed = { "c", "cpp", "python", "php", "java", "lua", "vim", "vimdoc", "query", "php", "sql" },
         sync_install = false,
         auto_install = true,
+        highlight = {
+            enable = false,
+        },
         --ignore_install = { "javascript" },
       }
     end
@@ -94,11 +92,6 @@ return require('packer').startup(function(use)
       end,
   }
 
-  -- Useful for wide screens
-  use {
-      'junegunn/goyo.vim' 
-  }
-
   -- VimWiki stuff
   use {
       'vimwiki/vimwiki',
diff --git a/Makefile.m4 b/Makefile.m4
index aef3475..b6f925f 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -144,7 +144,6 @@ m4_ifelse(DT_TMUX, `yes', `m4_dnl
 linux/tmux.conf: linux/tmux.conf.m4                                           \
                  ${M4_COMMON_DEPS}
 	$(call M4_EXEC)
-	$(call create_symlink,$(SRC_DIR)/Common/nvim,$(HOME_DIR)/.config/nvim)
 
 $(HOME_DIR)/.tmux.conf: linux/tmux.conf
 	$(call create_dotfile_symlink,linux/tmux.conf,.tmux.conf)
@@ -180,7 +179,11 @@ m4_ifelse(DT_NEOVIM, `yes', `m4_dnl
 	git -C /tmp/neovim checkout tags/v0.9.0
 	(cd /tmp/neovim && sudo make install)
 
-$(HOME_DIR)/.config/nvim/: /usr/local/bin/nvim
+Common/nvim/colors/bw.vim: Common/nvim/colors/bw.vim.m4                                                 \
+              ${M4_COMMON_DEPS}
+	$(call M4_EXEC)
+
+$(HOME_DIR)/.config/nvim/: Common/nvim/colors/bw.vim /usr/local/bin/nvim
 	$(call create_symlink,$(SRC_DIR)/Common/nvim,$(HOME_DIR)/.config/nvim)
 
 ')m4_dnl