commit 226d7e2910d8ffa553a5134324738e5f9283362a
parent a433cd7dcf693eda53745bd852a76283aa674ca9
Author: Tomas Nemec <nemi@skaut.cz>
Date: Sat, 13 Nov 2021 12:23:09 +0100
update
Diffstat:
5 files changed, 126 insertions(+), 124 deletions(-)
diff --git a/init.lua b/init.lua
@@ -7,6 +7,7 @@ end
-- Meta setup
vim.cmd [[runtime plugin/astronauta.vim]]
require('impatient')
+vim.g.mapleader = ','
-- disable netrw
vim.g.loaded_netrw = true
@@ -77,7 +78,6 @@ local nnoremap = vim.keymap.nnoremap
local tnoremap = vim.keymap.tnoremap
local vnoremap = vim.keymap.vnoremap
local inoremap = vim.keymap.inoremap
-vim.g.mapleader = ','
-- forget visual
nmap {'Q', '<nop>'}
-- kb.nnoremap('<tab>', 'za')
@@ -170,9 +170,7 @@ au.addListeners({
['user-vifm'] = {[[BufEnter vifm:* startinsert]]},
['user-cursorline'] = {[[WinEnter * setlocal cursorline]], [[WinLeave * setlocal nocursorline]]},
['user-yank-high'] = {[[TextYankPost * silent! lua require'vim.highlight'.on_yank()]]},
- ['user-colorscheme'] = {
- [[ColorScheme * lua require('tms.u.reload').colors()]],
- },
+ ['user-colorscheme'] = {[[ColorScheme * lua require('tms.u.reload').colors()]]},
-- ['java-lsp'] = {
-- [[FileType java lua require('jdtls').start_or_attach({cmd = {'java-lsp.sh'}})]],
-- },
diff --git a/lua/my-default.lua b/lua/my-default.lua
@@ -1,6 +1,6 @@
local Color, colors, Group, groups, styles = require('colorbuddy').setup()
package.path = '/home/tms/.cache/wal/?.lua;' .. package.path
-local c = require('colors-lua')
+local c = require('colors')
-- Special
Color.new('backg', c.background)
Color.new('foreg', c.foreground)
@@ -33,79 +33,79 @@ Color.new('c13', c.color13)
Color.new('c14', c.color14)
Color.new('c15', c.color15)
-Group.new('Normal' , colors.foreg , colors.backg)
-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)
-Group.new('CursorLine' , colors.c0 , colors.c2)
-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 , colors.c8)
-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('Cursor' , colors.cursor , colors.none)
-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('Float' , colors.c5 , 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('Normal', colors.foreg, colors.backg)
+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, groups.Normal.bg:dark(0.02))
+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, colors.c8)
+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('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)
diff --git a/lua/tms/plugins.lua b/lua/tms/plugins.lua
@@ -87,26 +87,30 @@ return packer.startup({
vim.keymap.nmap {'#', '#:Beacon<cr>'}
end,
}
+
+ vim.g.loaded_matchparen = 1
+ vim.g.hiPairs_timeout = 5
+ vim.g.hiPairs_hl_matchPair = {
+ ['term'] = 'underline,bold',
+ ['cterm'] = 'bold',
+ ['ctermfg'] = 'none',
+ ['ctermbg'] = 'none',
+ ['guifg'] = 'none',
+ ['guibg'] = 'none',
+ ['gui'] = 'bold',
+ }
+ vim.g.hiPairs_hl_unmatchPair = {
+ ['term'] = 'underline,bold',
+ ['cterm'] = 'bold',
+ ['ctermfg'] = 'none',
+ ['ctermbg'] = 'none',
+ ['guifg'] = 'none',
+ ['guibg'] = 'none',
+ ['gui'] = 'bold',
+ }
use { -- highlight parens
'Yggdroot/hiPairs',
- config = function()
- vim.g.loaded_matchparen = 1
- vim.g.hiPairs_timeout = 5
- -- vim.g.hiPairs_hl_matchPair = {
- -- ['term'] = 'underline,bold',
- -- ['cterm'] = 'bold',
- -- ['ctermfg'] = '0',
- -- ['ctermbg'] = '180',
- -- ['gui'] = 'bold',
- -- }
- -- vim.g.hiPairs_hl_unmatchPair = {
- -- ['term'] = 'underline,bold',
- -- ['cterm'] = 'bold',
- -- ['ctermfg'] = '0',
- -- ['ctermbg'] = '180',
- -- ['gui'] = 'bold',
- -- }
- end,
+ config = function() end,
}
use 'chaoren/vim-wordmotion' -- word counts with _,.,-,...
use {
diff --git a/lua/tms/u/reload.lua b/lua/tms/u/reload.lua
@@ -4,7 +4,7 @@ local M = {}
M.colors = function()
reloader.reload_module('my-default')
- reloader.reload_module('colors-lua')
+ reloader.reload_module('colors')
require('colorbuddy').colorscheme('my-default')
end
diff --git a/plugin/unimpaired.lua b/plugin/unimpaired.lua
@@ -1,28 +1,28 @@
-- remap ] and [
-vim.keymap.nmap {'>q', ':cnext'}
-vim.keymap.nmap {'>!', ':cnext'}
-vim.keymap.nmap {'<!', ':cprev'}
-vim.keymap.nmap {'<q', ':cprev'}
-vim.keymap.nmap {'>Q', ':clast'}
-vim.keymap.nmap {'<Q', ':cfirst'}
-vim.keymap.nmap {'>a', ':next'}
-vim.keymap.nmap {'<a', ':prev'}
-vim.keymap.nmap {'>A', ':last'}
-vim.keymap.nmap {'<A', ':first'}
-vim.keymap.nmap {'>b', ':bnext'}
-vim.keymap.nmap {'<b', ':bprev'}
-vim.keymap.nmap {'>B', ':blast'}
-vim.keymap.nmap {'<B', ':bfirst'}
-vim.keymap.nmap {'>l', ':lnext'}
-vim.keymap.nmap {'>=', ':lnext'}
-vim.keymap.nmap {'<l', ':lprev'}
-vim.keymap.nmap {'<=', ':lprev'}
-vim.keymap.nmap {'>L', ':llast'}
-vim.keymap.nmap {'<L', ':lfirst'}
-vim.keymap.nmap {'>t', ':tnext'}
-vim.keymap.nmap {'<t', ':tprev'}
-vim.keymap.nmap {'>T', ':tlast'}
-vim.keymap.nmap {'<T', ':tfirst'}
+vim.keymap.nmap {'>q', '<cmd>cnext<cr>'}
+vim.keymap.nmap {'>!', '<cmd>cnext<cr>'}
+vim.keymap.nmap {'<!', '<cmd>cprev<cr>'}
+vim.keymap.nmap {'<q', '<cmd>cprev<cr>'}
+vim.keymap.nmap {'>Q', '<cmd>clast<cr>'}
+vim.keymap.nmap {'<Q', '<cmd>cfirst<cr>'}
+vim.keymap.nmap {'>a', '<cmd>next<cr>'}
+vim.keymap.nmap {'<a', '<cmd>prev<cr>'}
+vim.keymap.nmap {'>A', '<cmd>last<cr>'}
+vim.keymap.nmap {'<A', '<cmd>first<cr>'}
+vim.keymap.nmap {'>b', '<cmd>bnext<cr>'}
+vim.keymap.nmap {'<b', '<cmd>bprev<cr>'}
+vim.keymap.nmap {'>B', '<cmd>blast<cr>'}
+vim.keymap.nmap {'<B', '<cmd>bfirst<cr>'}
+vim.keymap.nmap {'>l', '<cmd>lnext<cr>'}
+vim.keymap.nmap {'>=', '<cmd>lnext<cr>'}
+vim.keymap.nmap {'<l', '<cmd>lprev<cr>'}
+vim.keymap.nmap {'<=', '<cmd>lprev<cr>'}
+vim.keymap.nmap {'>L', '<cmd>llast<cr>'}
+vim.keymap.nmap {'<L', '<cmd>lfirst<cr>'}
+vim.keymap.nmap {'>t', '<cmd>tnext<cr>'}
+vim.keymap.nmap {'<t', '<cmd>tprev<cr>'}
+vim.keymap.nmap {'>T', '<cmd>tlast<cr>'}
+vim.keymap.nmap {'<T', '<cmd>tfirst<cr>'}
vim.keymap.nmap {'>s', ']s'}
vim.keymap.nmap {'<s', '[s'}
vim.keymap.nmap {'>S', ']S'}
