more hacking on configuration

3 files changed, 32 insertions, 46 deletions

diff --git a/colors/meltdown_ng.vim b/colors/meltdown_ng.vim
index 7e59d56..c12a386 100644
--- a/colors/meltdown_ng.vim
+++ b/colors/meltdown_ng.vim
@@ -41,7 +41,7 @@ hi Blue1 guifg=#80a0ff ctermfg=111
 hi Blue3 guifg=#80ffdf ctermfg=122
 hi Blue2 guifg=#af80ff ctermfg=141
 hi Blue4 guifg=#c3bbff ctermfg=189
-hi Teal1 guifg=#34ffd6 ctermfg=050
+hi Teal1 guifg=#76dbd8 ctermfg=050
 hi CursorLineNr guifg=#ff5d34 ctermfg=202 guibg=#272424 ctermbg=235
 hi StatusLineNC guifg=#686060 ctermfg=241 guibg=#0f0e0e ctermbg=233 gui=bold cterm=bold
 hi Folded guifg=#000000 ctermfg=000 guibg=#9f9a84 ctermbg=144
@@ -52,7 +52,7 @@ hi Yellow1 guifg=#ffb700 ctermfg=179
 hi Error guifg=#ff0000 ctermfg=009 guibg=#1a1818 ctermbg=234
 hi Directory guifg=#80a0ff ctermfg=111 gui=bold cterm=bold
 hi CursorLine guibg=#313030 ctermbg=236
-hi NonText guifg=#ff5d34 ctermfg=111 guibg=#000000 ctermbg=235 gui=bold cterm=bold
+hi NonText guifg=#ff5d34 ctermfg=111 guibg=#1f1d2a ctermbg=235 gui=bold cterm=bold
 hi DarkTeal guifg=#346063 ctermfg=023
 hi Orange5 guifg=#ffd780 ctermfg=222
 hi Orange4 guifg=#ffb780 ctermfg=215
@@ -94,7 +94,7 @@ hi! link RadiationCppEnum Type
 hi! link RadiationJavaLocalVar Sage2
 hi! link TagbarAccessPublic Green1
 hi! link xmlEndTag Red1
-hi! link Identifier Orange4
+hi! link Identifier Teal1
 hi! link javaOperator Operator
 hi! link RadiationJavaEnhancedForIterator RadiationJavaForIterator
 hi! link String Green1
@@ -121,22 +121,21 @@ hi! link @lsp.type.class Type
 hi! link @lsp.type.property Salmon
 hi! link @lsp.type.parameter Red1
 hi! link @lsp.mod.functionScope Orange1
+hi! link @lsp.typemod.variable.functionScope.cpp Teal1
 hi! link @punctuation Blue1
 hi! link @variable Identifier
 hi! link @variable.parameter Red1
 hi! link @lsp.typemod.parameter.functionScope Red1
 hi! link @lsp.mod.classScope Salmon
 hi! link @variable.member Salmon
-hi! link @variable.java Orange1
-hi! link @type.qualifier Red1
+hi! link @type.qualifier Blue1
 hi! link @lsp.type.interface.java Red5
 hi! link @lsp.type.enum.java Red4
-hi! link @lsp.type.variable.java @variable.java
-hi! link @lsp.type.variable Orange1
+hi! link @lsp.type.variable @variable
+hi! link @lsp.type.variable.jjjjjk @variable
 hi! link @lsp.typemod.property.static.java Sage3
 hi! link @attribute PreProc
 hi! link @lsp.type.property.java @variable.member
-hi! link Identifier Sage3
 hi! link luaTable @punctuation 
 hi! link vimUserFunc vimFunction
 hi! link vimFunction Function
@@ -150,6 +149,7 @@ hi! link @lsp.type.namespace @module
 hi! link @module DarkGrey
 hi! link @lsp.type.enum Type
 hi! link @lsp.mod.readonly PreProc
+hi! link @lsp.type.struct Type
 
 hi CmpItemAbbrDeprecated gui=strikethrough guifg=#ff7779 ctermfg=241 guibg=#14151d ctermbg=238
 hi CmpItemAbbrMatch guifg=#1f1d2a guibg=#ff7779 gui=bold
diff --git a/lua/lsp.lua b/lua/lsp.lua
index 35f36be..dca84dd 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -167,8 +167,9 @@ cmp.setup({
         end
 
         local verbosity = 1
+        local over_9000 = 2
         if vim.bo.filetype == 'java' then
-          verbosity = 2
+          verbosity = over_9000
           if vim_item.kind == "Method" then
             local name, args = split_silly_function_arguments(vim_item.abbr)
             vim_item.abbr = name
@@ -187,6 +188,7 @@ cmp.setup({
     { name = "path" },
     { name = "vim_vsnip" },
     { name = "buffer", keyword_length = 5 },
+    com
   },
 
   sorting = {
diff --git a/lua/tabby.lua b/lua/tabby.lua
index a189656..c2a1475 100644
--- a/lua/tabby.lua
+++ b/lua/tabby.lua
@@ -9,40 +9,24 @@ local theme = {
   close_sel = 'TabLineCloseSel',
   close = 'TabLineClose',
 }
-require('tabby.tabline').set(function(line)
-  return {
-    {
-      { '   ', hl = theme.head },
-      line.sep(' ', theme.head, theme.fill),
-    },
-    line.tabs().foreach(function(tab)
-      local hl = tab.is_current() and theme.current_tab or theme.tab
-      return {
-        line.sep(' ', hl, theme.fill),
-        tab.is_current() and '' or '',
-        tab.number(),
-        tab.name(),
-        tab.close_btn({' ', hl = tab.is_current() and theme.close_sel or theme.close}),
-        line.sep(' ', hl, theme.fill),
-        hl = hl,
-        margin = ' ',
-      }
-    end),
-    line.spacer(),
-    line.wins_in_tab(line.api.get_current_tab()).foreach(function(win)
-      return {
-        line.sep(' ', theme.win, theme.fill),
-        win.is_current() and '·' or ' ',
-        win.buf_name(),
-        line.sep(' ', theme.win, theme.fill),
-        hl = theme.win,
-        margin = ' ',
-      }
-    end),
-    {
-      line.sep(' ', theme.tail, theme.fill),
-      { '   ', hl = theme.tail },
-    },
-    hl = theme.fill,
-  }
-end)
+require('tabby.tabline').use_preset('active_wins_at_tail', {
+  theme = {
+    fill = 'TabLineFill',       -- tabline background
+    head = 'TabLine',           -- head element highlight
+    current_tab = 'TabLineSel', -- current tab label highlight
+    tab = 'TabLine',            -- other tab label highlight
+    win = 'TabLine',            -- window highlight
+    tail = 'TabLine',           -- tail element highlight
+  },
+  nerdfont = true,              -- whether use nerdfont
+  lualine_theme = nil,          -- lualine theme name
+  -- tab_name = {
+  --   name_fallback = function(tabid)
+  --     return tabid
+  --   end,
+  -- },
+  buf_name = {
+    mode = 'tail',
+  },
+
+})