Bw

4 files changed, 102 insertions, 144 deletions

diff --git a/.gitignore b/.gitignore
index 2a2a2e4..640f120 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,7 +86,6 @@ linux/sway/autostart
 linux/sway/hid
 Makefile
 config
-Common/nvim/colors/bw.vim
 *.pyc
 
 *.add
diff --git a/Common/nvim/colors/bw.vim b/Common/nvim/colors/bw.vim
new file mode 100644
index 0000000..45a949e
--- /dev/null
+++ b/Common/nvim/colors/bw.vim
@@ -0,0 +1,101 @@
+if exists("syntax_on")
+  syntax reset
+endif
+
+highlight clear
+
+" Function to reset all highlight groups
+function! ResetAllHighlights()
+  " Get all highlight groups
+  let highlight_groups = getcompletion('', 'highlight')
+  
+  " Reset each highlight group
+  for group in highlight_groups
+    exec 'highlight ' . group . ' guibg=NONE ctermbg=NONE guifg=NONE ctermfg=NONE cterm=NONE gui=NONE'
+  endfor
+endfunction
+
+" Call the function to reset all highlights
+call ResetAllHighlights()
+
+let g:colors_name = "bw"
+
+" 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  gui=reverse
+hi link TabLineFill TabLine
+
+hi WinBar        gui=bold                cterm=bold                                                                                       
+
+hi Pmenu         guibg=LightGray guifg=Black
+hi PmenuSbar     term=reverse            cterm=reverse           gui=reverse
+hi link PmenuThumb SBar
+hi PmenuSel     guibg=Gray
+hi link PmenuKind Pmenu
+hi link PmenuExtraSel Pmenu
+hi WildMenu guifg=Black guibg=Yellow ctermfg=Black ctermbg=Yellow                                       
+
+hi link NormalFloat Pmenu
+
+hi Visual        term=reverse            cterm=reverse           gui=reverse
+hi VisualNOS     term=reverse,underline  cterm=reverse,underline gui=reverse,underline
+
+hi SpellBad    term=undercurl  cterm=undercurl  ctermfg=5 gui=undercurl guisp=LightRed
+hi SpellCap    term=undercurl  cterm=undercurl  ctermfg=5 gui=undercurl guisp=DarkYellow 
+hi SpellLocal  term=undercurl  cterm=undercurl  ctermfg=5 gui=undercurl guisp=Green 
+hi SpellRare   term=undercurl  cterm=undercurl  ctermfg=5 gui=undercurl guisp=LightCyan 
+
+"hi DiffAdd     ctermfg=2   guifg=White  guibg=DarkGreen
+"hi DiffChange  ctermfg=94  guifg=White  guibg=DarkYellow
+"hi DiffDelete  ctermfg=1   guifg=White  guibg=DarkRed
+"hi DiffText    ctermfg=4   guifg=Blue
+hi DiffAdd     ctermfg=2   guifg=Green
+hi DiffChange  ctermfg=94  guifg=DarkYellow
+hi DiffDelete  ctermfg=1   guifg=Red
+hi DiffText    ctermfg=4   guifg=Blue
+
+hi Comment        ctermfg=248 guifg=Grey
+hi link  FoldColumn      Comment
+hi link  Folded          Comment
+hi link  LineNr          Comment
+hi link  NonText         Comment
+hi link  SpecialComment  Comment
+hi ColorColumn    ctermbg=240 guibg=LightGrey
+
+hi  Underlined  cterm=bold  gui=bold
+
+hi Error       ctermbg=white   ctermfg=red      cterm=reverse      gui=reverse
+hi Identifier  cterm=bold         gui=bold
+hi Special     cterm=italic       gui=italic
+hi Statement   cterm=bold         gui=bold
+hi Todo        cterm=reverse      gui=reverse
+" hi Type        cterm=bold,italic  gui=bold,italic
+" hi Constant    cterm=bold         
+hi Directory   cterm=bold         
+
+hi MatchParen  ctermbg=LightGray guibg=LightGray guifg=Black ctermfg=Black
+
+hi MoreMsg     ctermfg=magenta
+
+hi Search ctermbg=11 guibg=Yellow ctermfg=Black guifg=Black
+hi link  IncSearch     Search
+hi link  QuickFixLine  Search
+hi link  Substitute  Search
+hi CurSearch  ctermbg=11 guibg=DarkYellow guifg=Black ctermfg=Black
+hi IncSearch cterm=reverse gui=reverse
+
+
+
+"function! SetTheme()
+"  if &background == 'dark'
+"    hi Pmenu         guibg=LightGray guifg=Black
+"  else
+"  endif
+"endfunction
+"autocmd VimEnter * call SetTheme()
+"autocmd OptionSet background call SetTheme()
diff --git a/Common/nvim/colors/bw.vim.m4 b/Common/nvim/colors/bw.vim.m4
deleted file mode 100644
index 282cc30..0000000
--- a/Common/nvim/colors/bw.vim.m4
+++ /dev/null
@@ -1,138 +0,0 @@
-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/Makefile.m4 b/Makefile.m4
index b6f925f..1fd7dc4 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -179,11 +179,7 @@ m4_ifelse(DT_NEOVIM, `yes', `m4_dnl
 	git -C /tmp/neovim checkout tags/v0.9.0
 	(cd /tmp/neovim && sudo make install)
 
-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
+$(HOME_DIR)/.config/nvim/: /usr/local/bin/nvim
 	$(call create_symlink,$(SRC_DIR)/Common/nvim,$(HOME_DIR)/.config/nvim)
 
 ')m4_dnl