commit 7a4fd504ec08e9e8c065ff26debbf49a225e4978
parent 0d79443370b0bcd0ef6d71622ce460aab116a7e5
Author: Tomas Nemec <nemi@skaut.cz>
Date: Thu, 14 Apr 2022 08:45:41 +0200
update
Diffstat:
11 files changed, 182 insertions(+), 212 deletions(-)
diff --git a/after/plugin/cmp.lua b/after/plugin/cmp.lua
@@ -5,7 +5,7 @@ require('cmp_dictionary').setup({ dic = {} })
-- cmp.register_source('exe', require('tms.p.cmp.exe_source').new())
cmp.setup({
- documentation = { border = 'single' },
+ window = { completion = cmp.config.window.bordered(), documentation = cmp.config.window.bordered() },
snippet = { expand = function(args) require('luasnip').lsp_expand(args.body) end },
mapping = {
['<c-space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
@@ -16,12 +16,8 @@ cmp.setup({
['<c-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
['<c-d>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
},
- sources = cmp.config.sources({ { name = 'nvim_lsp' }, { name = 'nvim_lua' }, { name = 'luasnip' }, { name = 'path' } }, {
- { name = 'buffer' },
- { name = 'spell' },
- { name = 'calc' },
- { name = 'treesitter' },
- { name = 'dictionary' },
- }),
+ sources = cmp.config.sources(
+ { { name = 'nvim_lsp' }, { name = 'nvim_lua' }, { name = 'luasnip' }, { name = 'path' } },
+ { { name = 'buffer' }, { name = 'spell' }, { name = 'calc' }, { name = 'treesitter' }, { name = 'dictionary' } }),
experimental = { ghost_text = true },
})
diff --git a/after/plugin/colorizer.lua b/after/plugin/colorizer.lua
@@ -0,0 +1,12 @@
+if pcall(require, 'colorizer') then
+ require'colorizer'.setup({ 'css', 'scss', 'less' }, {
+ RGB = true, -- #RGB hex codes
+ RRGGBB = true, -- #RRGGBB hex codes
+ names = true, -- "Name" codes like Blue
+ RRGGBBAA = true, -- #RRGGBBAA hex codes
+ rgb_fn = true, -- CSS rgb() and rgba() functions
+ hsl_fn = true, -- CSS hsl() and hsla() functions
+ css = true, -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB
+ css_fn = true, -- Enable all CSS *functions*: rgb_fn, hsl_fn
+ })
+end
diff --git a/after/plugin/colors.lua b/after/plugin/colors.lua
@@ -1,12 +0,0 @@
- if pcall(require, 'colorizer') then
- require'colorizer'.setup({ 'css', 'scss', 'less' }, {
- RGB = true, -- #RGB hex codes
- RRGGBB = true, -- #RRGGBB hex codes
- names = true, -- "Name" codes like Blue
- RRGGBBAA = true, -- #RRGGBBAA hex codes
- rgb_fn = true, -- CSS rgb() and rgba() functions
- hsl_fn = true, -- CSS hsl() and hsla() functions
- css = true, -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB
- css_fn = true, -- Enable all CSS *functions*: rgb_fn, hsl_fn
- })
- end
diff --git a/colors/my-default.vim b/colors/my-default.vim
diff --git a/colors/tms.lua b/colors/tms.lua
@@ -0,0 +1,161 @@
+local Color = require('colorbuddy.color').Color
+local colors = require('colorbuddy.color').colors
+local Group = require('colorbuddy.group').Group
+local groups = require('colorbuddy.group').groups
+local styles = require('colorbuddy.style').styles
+local c = {}
+if vim.fn.empty('/home/tms/.cache/wal') > 0 then
+ -- gruvbox
+ c.background = '#1d2021'
+ c.foreground = '#d5c4a1'
+ c.cursor = '#d5c4a1'
+ c.color0 = '#1d2021'
+ c.color1 = '#fb4934'
+ c.color2 = '#b8bb26'
+ c.color3 = '#fabd2f'
+ c.color4 = '#83a598'
+ c.color5 = '#d3869b'
+ c.color6 = '#8ec07c'
+ c.color7 = '#d5c4a1'
+ c.color8 = '#665c54'
+ c.color9 = '#fb4934'
+ c.color10 = '#b8bb26'
+ c.color11 = '#fabd2f'
+ c.color12 = '#83a598'
+ c.color13 = '#d3869b'
+ c.color14 = '#8ec07c'
+ c.color15 = '#fbf1c7'
+else
+ c = dofile('/home/tms/.cache/wal/colors.lua')
+end
+-- Special
+Color.new('backg', c.background)
+Color.new('foreg', c.foreground)
+Color.new('cursor', c.cursor)
+
+local is_dark = false
+if (colors.foreg.L > colors.backg.L) then is_dark = true end
+local dimm = function(color, amount)
+ if is_dark then
+ return color:light(amount)
+ else
+ return color:dark(amount)
+ end
+end
+
+-- colors
+Color.new('black', c.color0)
+Color.new('red', c.color1)
+Color.new('green', c.color2)
+Color.new('yellow', c.color3)
+Color.new('blue', c.color4)
+Color.new('magenta', c.color5)
+Color.new('cyan', c.color6)
+Color.new('white', c.color7)
+
+Color.new('c0', c.color0)
+Color.new('c1', c.color1)
+Color.new('c2', c.color2)
+Color.new('c3', c.color3)
+Color.new('c4', c.color4)
+Color.new('c5', c.color5)
+Color.new('c6', c.color6)
+Color.new('c7', c.color7)
+Color.new('c8', c.color8)
+Color.new('c9', c.color9)
+Color.new('c10', c.color10)
+Color.new('c11', c.color11)
+Color.new('c12', c.color12)
+Color.new('c13', c.color13)
+Color.new('c14', c.color14)
+Color.new('c15', c.color15)
+
+Group.new('Normal', colors.foreg, colors.backg)
+local N = groups.Normal
+Group.new('NonText', colors.c0, colors.none)
+Group.new('Comment', colors.c8, colors.none)
+Group.new('Conceal', colors.none, colors.none)
+Group.new('Constant', colors.c3, colors.none)
+Group.new('Error', colors.c7, colors.c1)
+Group.new('Identifier', colors.c1, colors.none, styles.bold)
+Group.new('Ignore', colors.c0, colors.c8)
+Group.new('PreProc', colors.c3, colors.none)
+Group.new('Special', colors.c6, colors.none)
+Group.new('Statement', colors.c1, colors.none)
+Group.new('String', colors.c2, colors.none)
+Group.new('Number', colors.c3, colors.none)
+Group.new('Todo', colors.c0, colors.c2)
+Group.new('Type', colors.c3, colors.none)
+Group.new('Underlined', colors.c1, colors.none, styles.underline)
+Group.new('StatusLine', colors.c0, colors.c7)
+Group.new('StatusLineNC', colors.c0, colors.c8)
+Group.new('TabLine', colors.c8, colors.none)
+Group.new('TabLineFill', colors.c8, colors.none)
+Group.new('TabLineSel', colors.c0, colors.c4)
+Group.new('TermCursorNC', colors.c0, colors.c3)
+Group.new('VertSplit', colors.c0, colors.c8)
+Group.new('Title', colors.c4, colors.none, styles.bold)
+Group.new('CursorLine', colors.none, dimm(N.bg, 0.03))
+Group.new('LineNr', colors.c8, colors.none)
+Group.new('CursorLineNr', colors.c8, colors.none)
+Group.new('helpLeadBlank', colors.c7, colors.none)
+Group.new('helpNormal', colors.c7, colors.none)
+Group.new('Visual', colors.c0, colors.c1)
+Group.new('VisualNOS', colors.c1, colors.none)
+Group.new('Pmenu', colors.c7, dimm(N.bg, 0.01))
+Group.new('PmenuSbar', colors.c7, colors.c6)
+Group.new('PmenuSel', colors.c0, colors.c4)
+Group.new('PmenuThumb', colors.c8, colors.c8)
+Group.new('FoldColumn', colors.c7, colors.none)
+Group.new('Folded', colors.c8, colors.none)
+Group.new('WildMenu', colors.c0, colors.c2)
+Group.new('SpecialKey', colors.c8, colors.none)
+Group.new('DiffAdd', colors.c2, colors.none)
+Group.new('DiffChange', colors.c8, colors.none)
+Group.new('DiffDelete', colors.c1, colors.none)
+Group.new('DiffText', colors.c4, colors.none)
+Group.new('IncSearch', colors.c0, colors.c3)
+Group.new('Search', colors.c0, colors.c3)
+Group.new('Directory', colors.c4, colors.none)
+Group.new('MatchParen', colors.c8, colors.c1)
+Group.new('ColorColumn', colors.c0, colors.c4)
+Group.new('signColumn', colors.c4, colors.none)
+Group.new('ErrorMsg', colors.c8, colors.none)
+Group.new('ModeMsg', colors.c2, colors.none)
+Group.new('MoreMsg', colors.c2, colors.none)
+Group.new('Question', colors.c4, colors.none)
+Group.new('WarningMsg', colors.c0, colors.c1)
+Group.new('Structure', colors.c5, colors.none)
+Group.new('CursorColumn', colors.c7, colors.c8)
+Group.new('ModeMsg', colors.c7, colors.none)
+Group.new('SpellBad', colors.c1, colors.none, styles.underline)
+Group.new('SpellCap', colors.c4, colors.none, styles.underline)
+Group.new('SpellLocal', colors.c5, colors.none, styles.underline)
+Group.new('SpellRare', colors.c6, colors.none, styles.underline)
+Group.new('Boolean', colors.c5, colors.none)
+Group.new('Character', colors.c1, colors.none)
+Group.new('Conditional', colors.c5, colors.none)
+Group.new('Define', colors.c5, colors.none)
+Group.new('Delimiter', colors.c5, colors.none)
+Group.new('NormalFloat', colors.none, colors.none)
+Group.new('Float', colors.c5, colors.none)
+Group.new('FloatBorder', N, colors.none)
+Group.new('Include', colors.c4, colors.none)
+Group.new('Keyword', colors.c5, colors.none)
+Group.new('Label', colors.c3, colors.none)
+Group.new('Operator', colors.c7, colors.none)
+Group.new('Repeat', colors.c3, colors.none)
+Group.new('SpecialChar', colors.c5, colors.none)
+Group.new('Tag', colors.c3, colors.none)
+Group.new('Typedef', colors.c3, colors.none)
+Group.new('WinSeparator', nil, colors.none)
+
+-- Telescope
+Group.new('TelescopeSelection', nil, dimm(N.bg, 0.05))
+Group.new('TelescopeMatching', nil, nil, styles.underline + styles.bold)
+
+-- leap
+Group.link('LeapBackdrop', groups.Comment)
+-- Group.new('LeapMatch', colors.c5, nil, styles.underline)
+Group.new('LeapLabelPrimary', N, N, styles.reverse)
+Group.link('LeapLabelSecondary', groups.Comment)
diff --git a/init.lua b/init.lua
@@ -2,7 +2,7 @@ require('tms.first_load')
require('impatient') -- faster `require`
-require('colorbuddy').colorscheme('my-default')
+require('colorbuddy').colorscheme('tms')
vim.g.mapleader = ','
diff --git a/lua/my-default.lua b/lua/my-default.lua
@@ -1,157 +0,0 @@
-local Color, colors, Group, groups, styles = require('colorbuddy').setup()
-local c = {}
-if vim.fn.empty('/home/tms/.cache/wal') > 0 then
- -- gruvbox
- c.background = '#1d2021'
- c.foreground = '#d5c4a1'
- c.cursor = '#d5c4a1'
- c.color0 = '#1d2021'
- c.color1 = '#fb4934'
- c.color2 = '#b8bb26'
- c.color3 = '#fabd2f'
- c.color4 = '#83a598'
- c.color5 = '#d3869b'
- c.color6 = '#8ec07c'
- c.color7 = '#d5c4a1'
- c.color8 = '#665c54'
- c.color9 = '#fb4934'
- c.color10 = '#b8bb26'
- c.color11 = '#fabd2f'
- c.color12 = '#83a598'
- c.color13 = '#d3869b'
- c.color14 = '#8ec07c'
- c.color15 = '#fbf1c7'
-else
- c = dofile('/home/tms/.cache/wal/colors.lua')
-end
--- Special
-Color.new('backg', c.background)
-Color.new('foreg', c.foreground)
-Color.new('cursor', c.cursor)
-
-local is_dark = false
-if (colors.foreg.L > colors.backg.L) then is_dark = true end
-local dimm = function(color, amount)
- if is_dark then
- return color:light(amount)
- else
- return color:dark(amount)
- end
-end
-
--- colors
-Color.new('black', c.color0)
-Color.new('red', c.color1)
-Color.new('green', c.color2)
-Color.new('yellow', c.color3)
-Color.new('blue', c.color4)
-Color.new('magenta', c.color5)
-Color.new('cyan', c.color6)
-Color.new('white', c.color7)
-
-Color.new('c0', c.color0)
-Color.new('c1', c.color1)
-Color.new('c2', c.color2)
-Color.new('c3', c.color3)
-Color.new('c4', c.color4)
-Color.new('c5', c.color5)
-Color.new('c6', c.color6)
-Color.new('c7', c.color7)
-Color.new('c8', c.color8)
-Color.new('c9', c.color9)
-Color.new('c10', c.color10)
-Color.new('c11', c.color11)
-Color.new('c12', c.color12)
-Color.new('c13', c.color13)
-Color.new('c14', c.color14)
-Color.new('c15', c.color15)
-
-Group.new('Normal', colors.foreg, colors.backg)
-local N = groups.Normal
-Group.new('NonText', colors.c0, colors.none)
-Group.new('Comment', colors.c8, colors.none)
-Group.new('Conceal', colors.none, colors.none)
-Group.new('Constant', colors.c3, colors.none)
-Group.new('Error', colors.c7, colors.c1)
-Group.new('Identifier', colors.c1, colors.none, styles.bold)
-Group.new('Ignore', colors.c0, colors.c8)
-Group.new('PreProc', colors.c3, colors.none)
-Group.new('Special', colors.c6, colors.none)
-Group.new('Statement', colors.c1, colors.none)
-Group.new('String', colors.c2, colors.none)
-Group.new('Number', colors.c3, colors.none)
-Group.new('Todo', colors.c0, colors.c2)
-Group.new('Type', colors.c3, colors.none)
-Group.new('Underlined', colors.c1, colors.none, styles.underline)
-Group.new('StatusLine', colors.c0, colors.c7)
-Group.new('StatusLineNC', colors.c0, colors.c8)
-Group.new('TabLine', colors.c8, colors.none)
-Group.new('TabLineFill', colors.c8, colors.none)
-Group.new('TabLineSel', colors.c0, colors.c4)
-Group.new('TermCursorNC', colors.c0, colors.c3)
-Group.new('VertSplit', colors.c0, colors.c8)
-Group.new('Title', colors.c4, colors.none, styles.bold)
-Group.new('CursorLine', colors.none, dimm(N.bg, 0.03))
-Group.new('LineNr', colors.c8, colors.none)
-Group.new('CursorLineNr', colors.c8, colors.none)
-Group.new('helpLeadBlank', colors.c7, colors.none)
-Group.new('helpNormal', colors.c7, colors.none)
-Group.new('Visual', colors.c0, colors.c1)
-Group.new('VisualNOS', colors.c1, colors.none)
-Group.new('Pmenu', colors.c7, dimm(N.bg, 0.01))
-Group.new('PmenuSbar', colors.c7, colors.c6)
-Group.new('PmenuSel', colors.c0, colors.c4)
-Group.new('PmenuThumb', colors.c8, colors.c8)
-Group.new('FoldColumn', colors.c7, colors.none)
-Group.new('Folded', colors.c8, colors.none)
-Group.new('WildMenu', colors.c0, colors.c2)
-Group.new('SpecialKey', colors.c8, colors.none)
-Group.new('DiffAdd', colors.c2, colors.none)
-Group.new('DiffChange', colors.c8, colors.none)
-Group.new('DiffDelete', colors.c1, colors.none)
-Group.new('DiffText', colors.c4, colors.none)
-Group.new('IncSearch', colors.c0, colors.c3)
-Group.new('Search', colors.c0, colors.c3)
-Group.new('Directory', colors.c4, colors.none)
-Group.new('MatchParen', colors.c8, colors.c1)
-Group.new('ColorColumn', colors.c0, colors.c4)
-Group.new('signColumn', colors.c4, colors.none)
-Group.new('ErrorMsg', colors.c8, colors.none)
-Group.new('ModeMsg', colors.c2, colors.none)
-Group.new('MoreMsg', colors.c2, colors.none)
-Group.new('Question', colors.c4, colors.none)
-Group.new('WarningMsg', colors.c0, colors.c1)
-Group.new('Structure', colors.c5, colors.none)
-Group.new('CursorColumn', colors.c7, colors.c8)
-Group.new('ModeMsg', colors.c7, colors.none)
-Group.new('SpellBad', colors.c1, colors.none, styles.underline)
-Group.new('SpellCap', colors.c4, colors.none, styles.underline)
-Group.new('SpellLocal', colors.c5, colors.none, styles.underline)
-Group.new('SpellRare', colors.c6, colors.none, styles.underline)
-Group.new('Boolean', colors.c5, colors.none)
-Group.new('Character', colors.c1, colors.none)
-Group.new('Conditional', colors.c5, colors.none)
-Group.new('Define', colors.c5, colors.none)
-Group.new('Delimiter', colors.c5, colors.none)
-Group.new('NormalFloat', colors.none, colors.none)
-Group.new('Float', colors.c5, colors.none)
-Group.new('FloatBorder', N, colors.none)
-Group.new('Include', colors.c4, colors.none)
-Group.new('Keyword', colors.c5, colors.none)
-Group.new('Label', colors.c3, colors.none)
-Group.new('Operator', colors.c7, colors.none)
-Group.new('Repeat', colors.c3, colors.none)
-Group.new('SpecialChar', colors.c5, colors.none)
-Group.new('Tag', colors.c3, colors.none)
-Group.new('Typedef', colors.c3, colors.none)
-Group.new('WinSeparator', nil, colors.none)
-
--- Telescope
-Group.new('TelescopeSelection', nil, dimm(N.bg, 0.05))
-Group.new('TelescopeMatching', nil, nil, styles.underline + styles.bold)
-
--- leap
-Group.link('LeapBackdrop', groups.Comment)
--- Group.new('LeapMatch', colors.c5, nil, styles.underline)
-Group.new('LeapLabelPrimary', N, N, styles.reverse)
-Group.link('LeapLabelSecondary', groups.Comment)
diff --git a/lua/tms/colors.lua b/lua/tms/colors.lua
@@ -1,26 +0,0 @@
-local gruvbox = require('tms.colors.gruvbox')
-local solarized = require('tms.colors.solarized')
-local M = {}
-
-M.setup = function()
- local color = string.sub(vim.g.colors_name, 0, 5)
- if color == 'solar' then
- solarized.setup()
- elseif color == 'gruvb' then
- gruvbox.setup()
- end
-end
-
-M.get_theme = function()
- if os.getenv('SCHEME') then
- local theme = io.open(os.getenv('THEME') or os.getenv('CONFIG') .. '/theme'):read();
- return theme
- end
-end
-
-M.get_scheme = function()
- local scheme = os.getenv('SCHEME')
- if scheme then return scheme end
-end
-
-return M
diff --git a/lua/tms/u/reload.lua b/lua/tms/u/reload.lua
@@ -1,12 +1,10 @@
local M = {}
M.colors = function()
- package.loaded['colors'] = nil
- package.loaded['my-default'] = nil
- require('my-default')
- require('colorbuddy').colorscheme('my-default')
+ -- package.loaded['colors'] = nil
+ -- package.loaded['my-default'] = nil
+ -- require('colors')
+ -- require('colorbuddy').colorscheme('my-default')
end
-M.nvim = function() require('plenary.reload').reload_module('tms') end
-
return M
diff --git a/plugin/keymap.lua b/plugin/keymap.lua
@@ -1,6 +1,5 @@
-- forget visual
vim.keymap.set('n', 'Q', '<nop>')
--- kb.nnoremap('<tab>', 'za')
vim.keymap.set('n', '<esc>', '<cmd>nohl<cr>', { silent = true })
vim.keymap.set('n', 'gA', 'ga', { noremap = true })
vim.keymap.set('n', 'Y', 'y$', { noremap = true })
diff --git a/plugin/options.lua b/plugin/options.lua
@@ -1,6 +1,5 @@
vim.opt.exrc = true
vim.opt.secure = true
--- utilsions
vim.opt.clipboard = 'unnamedplus'
vim.opt.completeopt = 'menu,menuone,noselect'
vim.opt.equalalways = false
