update lua

2 files changed, 42 insertions, 36 deletions

diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua
index a856f96..de61f3b 100644
--- a/.config/nvim/lua/settings.lua
+++ b/.config/nvim/lua/settings.lua
@@ -5,6 +5,8 @@ local home = vim.env.HOME
 local opt  = vim.opt
 local tmp  = home .. '/.config/nvim/cache'
 
+local term = vim.fn.getenv("TERM")
+
 opt.autoindent     = true                              -- maintain indent of current line
 opt.backspace      = 'indent,start,eol'                -- allow unrestricted backspacing in insert mode
 opt.backup         = false                             -- don't make backups before writing
@@ -111,7 +113,11 @@ opt.swapfile      = false                   -- don't create swap files
 opt.switchbuf     = 'usetab'                -- try to reuse windows/tabs when switching buffers
 opt.synmaxcol     = 200                     -- don't bother syntax highlighting long lines
 opt.tabstop       = 4                       -- spaces per tab
-opt.termguicolors = true                    -- use guifg/guibg instead of ctermfg/ctermbg in terminal
+if term ~= "linux" and term ~= "screen-256color" then
+    opt.termguicolors = true                -- use guifg/guibg instead of ctermfg/ctermbg in terminal
+else
+    opt.termguicolors = false
+end
 opt.textwidth     = 0                       -- automatically hard wrap at 0 columns
 
 -- TODO: turn into native lua functions
diff --git a/.config/nvim/lua/theme.lua b/.config/nvim/lua/theme.lua
index 4fb69c6..217bf3c 100644
--- a/.config/nvim/lua/theme.lua
+++ b/.config/nvim/lua/theme.lua
@@ -86,59 +86,59 @@ local theme = {
     Normal            = { },
     EndOfBuffer       = { },
     NonText           = { ctermfg="238", guifg=color.gray[4] },
-    Comment           = { ctermfg="241", guifg=color.gray[3], gui="italic" },
+    Comment           = { ctermfg="8",   guifg=color.gray[3], gui="italic" },
     Conceal           = { ctermfg="241", guifg=color.gray[2] },
-    Constant          = { ctermfg="140", guifg=color.orange[2] },
-    String            = { ctermfg="140", guifg=color.blue[1] },
-    Identifier        = { ctermfg="251", guifg=color.white[2], gui="bold" },
-    Statement         = { ctermfg="243", guifg=color.aqua[2] },
+    Constant          = { ctermfg="3",   guifg=color.orange[2] },
+    String            = { ctermfg="74",  guifg=color.blue[1] },
+    Identifier        = { ctermfg="250", guifg=color.white[2], gui="bold" },
+    Statement         = { ctermfg="10",  guifg=color.aqua[2] },
     Operator          = { ctermfg="251", guifg=color.white[3] },
-    PreProc           = { ctermfg="243", guifg=color.red[2] },
-    Type              = { ctermfg="251", guifg=color.yellow[2] },
-    Special           = { ctermfg="243", guifg=color.purple[1] },
-    Error             = { ctermfg="132", guifg=color.orange[1] },
+    PreProc           = { ctermfg="166", guifg=color.red[2] },
+    Type              = { ctermfg="178", guifg=color.yellow[2] },
+    Special           = { ctermfg="5",   guifg=color.purple[1] },
+    Error             = { ctermfg="1",   guifg=color.orange[1] },
     Warning           = { ctermfg="179", guifg=color.yellow[1] },
     ModeMsg           = { ctermfg="243", guifg=color.blue[1], gui="bold" },
-    Todo              = { ctermfg="167", cterm="bold", guifg=color.red[1], guibg=color.black[1], gui="bold" },
-    Underlined        = { ctermfg="251", cterm="underline", guifg=color.white[3], gui="underline" },
-    StatusLine        = { ctermbg="237", ctermfg="140", guibg=color.white[5], guifg=color.gray[5], gui="bold" },
-    StatusLineNC      = { ctermbg="236", ctermfg="243", guibg=color.gray[4], guifg=color.white[3] },
-    WildMenu          = { ctermbg="236", ctermfg="167", guibg=color.gray[5], guifg=color.red[1] },
+    Todo              = { ctermfg="160", cterm="bold", guifg=color.red[1], guibg=color.black[1], gui="bold" },
+    Underlined        = { ctermfg="251", cterm="bold", guifg=color.white[3], gui="underline" },
+    StatusLine        = { ctermbg="7",   ctermfg="0",  guibg=color.white[5], guifg=color.gray[5], gui="bold" },
+    StatusLineNC      = { ctermbg="236", ctermfg="0", guibg=color.gray[4], guifg=color.white[3] },
+    WildMenu          = { ctermbg="246", ctermfg="167", guibg=color.gray[5], guifg=color.red[1] },
     VertSplit         = { ctermbg="236", ctermfg="236", guibg=color.black[0], guifg=color.gray[2] },
     Title             = { ctermfg="251", cterm="bold", guifg=color.white[3], gui="bold" },
     LineNr            = { ctermfg="241", guifg=color.gray[2] },
-    CursorLineNr      = { ctermbg="236", ctermfg="140", guifg=color.blue[1], gui="bold" },
-    Cursor            = { ctermbg="140", ctermfg="251", guibg=color.blue[1], guifg=color.white[3] },
-    CursorLine        = { ctermbg="236", guibg=color.black[0] },
-    ColorColumn       = { ctermbg="234", guibg=color.black[1] },
+    CursorLineNr      = { ctermfg="4",   guifg=color.blue[1], gui="bold" },
+    Cursor            = { ctermbg="4",   guibg=color.blue[1], guifg=color.white[3] },
+    CursorLine        = { ctermbg="8",   guibg=color.black[0] },
+    ColorColumn       = { ctermbg="236", guibg=color.black[1] },
     SignColumn        = { ctermfg="243", guifg=color.gray[2] },
     Visual            = { ctermbg="237", guibg=color.gray[2] },
     VisualNOS         = { ctermbg="238", guibg=color.gray[1] },
     Pmenu             = { ctermbg="237", guibg=color.gray[3], guifg=color.white[2] },
     PmenuSbar         = { ctermbg="236", guibg=color.black[0] },
     PmenuSel          = { ctermbg="236", ctermfg="140", guibg=color.gray[5], guifg=color.blue[1] },
-    PmenuThumb        = { ctermbg="167", guibg=color.red[1] },
+    PmenuThumb        = { ctermbg="199", guibg=color.red[1] },
     FoldColumn        = { ctermfg="241", guifg=color.gray[2] },
     Folded            = { ctermbg="234", ctermfg="243", guibg=color.black[0], guifg=color.white[5] },
     SpecialKey        = { ctermfg="243", guifg=color.gray[4] },
-    IncSearch         = { ctermbg="167", ctermfg="235", guibg=color.aqua[1], guifg=color.black[1] },
-    Search            = { ctermbg="140", ctermfg="235", guibg=color.blue[1], guifg=color.black[1] },
-    Directory         = { ctermfg="140", guifg=color.blue[1] },
-    MatchParen        = { ctermfg="167", cterm="bold", guifg=color.aqua[1], gui="bold" },
-    SpellBad          = { ctermfg="132", cterm="underline", guifg=color.purple[1], gui="underline" },
-    SpellCap          = { ctermfg="108", cterm="underline", guifg=color.aqua[1], gui="underline" },
-    SpellLocal        = { ctermfg="179", cterm="underline", guifg=color.yellow[1], gui="underline" },
+    IncSearch         = { ctermbg="6",   ctermfg="235", guibg=color.aqua[1], guifg=color.black[1] },
+    Search            = { ctermbg="4",   ctermfg="235", guibg=color.blue[1], guifg=color.black[1] },
+    Directory         = { ctermfg="4",   guifg=color.blue[1] },
+    MatchParen        = { ctermfg="6",   cterm="bold", guifg=color.aqua[1], gui="bold" },
+    SpellBad          = { ctermfg="5",   cterm="underline", guifg=color.purple[1], gui="underline" },
+    SpellCap          = { ctermfg="6",   cterm="underline", guifg=color.aqua[1], gui="underline" },
+    SpellLocal        = { ctermfg="11",  cterm="underline", guifg=color.yellow[1], gui="underline" },
     QuickFixLine      = { ctermbg="234", guibg=color.black[1] },
-    DiffAdd           = { ctermbg="236", ctermfg="108", guifg=color.aqua[1] },
-    DiffChange        = { ctermbg="236", guifg=color.yellow[1] },
-    DiffName          = { ctermbg="236", ctermfg="132", guifg=color.purple[1] },
-    DiffDelete        = { ctermbg="236", ctermfg="132", guifg=color.red[1] },
-    DiffText          = { ctermbg="236", ctermfg="179", guifg=color.yellow[1] },
+    DiffAdd           = { ctermfg="6",   guifg=color.aqua[1] },
+    DiffChange        = { ctermfg="179", guifg=color.yellow[1] },
+    DiffName          = { ctermbg="5", ctermfg="132", guifg=color.purple[1] },
+    DiffDelete        = { ctermbg="1",  ctermfg="132", guifg=color.red[1] },
+    DiffText          = { ctermbg="179", ctermfg="179", guifg=color.yellow[1] },
 
-    helpHyperTextJump = { ctermfg="140",  guifg=color.blue[1] },
-    netrwExe          = { guifg=color.aqua[1] },
-    mailQuoted1       = { guifg=color.gray[1] },
-    mailQuoted2       = { guifg=color.gray[3] },
+    helpHyperTextJump = { ctermfg="4",  guifg=color.blue[1] },
+    netrwExe          = { ctermfg="6",  guifg=color.aqua[1] },
+    mailQuoted1       = { ctermfg="246", guifg=color.gray[1] },
+    mailQuoted2       = { ctermfg="238", guifg=color.gray[3] },
 }
 
 local links = {