commit 86e9d12085b4c30342bd1966bc1ccdf8df8ce9c4
parent 68337b2279add1096c8bbad51b11b75d7863c429
Author: Tomas Nemec <nemi@skaut.cz>
Date: Mon, 5 Sep 2022 08:31:28 +0200
update
Diffstat:
9 files changed, 107 insertions(+), 81 deletions(-)
diff --git a/after/plugin/colorizer.lua b/after/plugin/colorizer.lua
@@ -1,12 +1,16 @@
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
+ require'colorizer'.setup({
+ filetypes = { 'css', 'scss', 'less' },
+ user_default_options = {
+ -- RGB = true,
+ -- RRGGBB = true,
+ -- RRGGBBAA = true,
+ -- names = true,
+ -- rgb_fn = true,
+ -- hsl_fn = true,
+ -- css_fn = true, -- Enable all CSS *functions*: rgb_fn, hsl_fn
+ css = true, -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB
+ mode = 'background',
+ },
})
end
diff --git a/after/plugin/neorg.lua b/after/plugin/neorg.lua
@@ -7,9 +7,6 @@ require('neorg').setup({
['core.mode'] = {},
['core.norg.news'] = {}, -- Handles the displaying of Neorg news and other forms of media in a popup.
['core.norg.qol.todo_items'] = {},
- ['core.norg.esupports'] = {},
- ['core.norg.esupports.metagen'] = {},
- ['core.norg.esupports.hop'] = {},
['core.norg.manoeuvre'] = {},
['core.neorgcmd'] = {},
['core.autocommands'] = {},
diff --git a/after/plugin/ufo.lua b/after/plugin/ufo.lua
@@ -0,0 +1,26 @@
+if not pcall(require, 'ufo') then
+ return
+end
+
+local ufo = require('ufo')
+
+-- vim.o.foldcolumn = 1
+vim.o.foldlevel = 99
+vim.o.foldlevelstart = 99
+vim.o.foldenable = true
+vim.o.foldmethod = 'manual'
+
+vim.keymap.set('n', 'zL', ufo.openAllFolds, {})
+vim.keymap.set('n', 'zH', ufo.closeAllFolds, {})
+
+ufo.setup({
+ open_fold_hl_timeout = 150,
+ ---@diagnostic disable-next-line: unused-local
+ -- provider_selector = function(bufnr, filetype, buftype)
+ -- return { 'treesitter', 'indent' }
+ -- end,
+})
+
+require('tms.colors').update(function(t)
+ t.Group.new('UfoFoldedEllipsis', nil, t.dimm(t.groups.Normal.bg, 0.05))
+end)
diff --git a/colors/tms.lua b/colors/tms.lua
@@ -44,7 +44,7 @@ colorscheme.update(function(t)
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('Folded', colors.c8, dimm(groups.Normal.bg, 0.025))
Group.new('WildMenu', colors.c0, colors.c2)
Group.new('SpecialKey', colors.c8, colors.none)
Group.new('DiffAdd', colors.c2, colors.none)
@@ -52,6 +52,7 @@ colorscheme.update(function(t)
Group.new('DiffDelete', colors.c1, colors.none)
Group.new('DiffText', colors.c4, colors.none)
Group.new('IncSearch', colors.c0, colors.c3)
+ Group.new('CurSearch', colors.c0, dimm(colors.c3, -0.1))
Group.new('Search', colors.c0, colors.c3)
Group.new('Directory', colors.c4, colors.none)
Group.new('MatchParen', colors.c8, colors.c1)
diff --git a/init.lua b/init.lua
@@ -1,4 +1,5 @@
vim.g.mapleader = ','
+vim.g.loaded_matchparen = 1
require('tms.first_load')
require('impatient')
require('colorbuddy').colorscheme('tms')
diff --git a/lua/plugins.lua b/lua/plugins.lua
@@ -35,20 +35,21 @@ return packer.startup({
use 'numToStr/Comment.nvim'
use 'mbbill/undotree'
use 'camspiers/animate.vim'
- use 'norcalli/nvim-colorizer.lua'
+ use 'nvchad/nvim-colorizer.lua'
use 'ziontee113/color-picker.nvim'
use 'rainbowhxch/beacon.nvim'
-- use 'Yggdroot/hiPairs'
use 'jandamm/cryoline.nvim'
use 'karb94/neoscroll.nvim'
use { 'sidebar-nvim/sidebar.nvim', requires = { 'kyazdani42/nvim-web-devicons' } }
+ -- use { 'kevinhwang91/nvim-ufo', requires = { 'kevinhwang91/promise-async' } }
-- lua
use 'nanotee/luv-vimdocs'
use 'milisims/nvim-luaref'
-- Notes
- use { 'nvim-neorg/neorg', requires = { 'nvim-lua/plenary.nvim' } }
+ -- use { 'nvim-neorg/neorg', requires = { 'nvim-lua/plenary.nvim' } }
use { 'mickael-menu/zk-nvim', requires = { 'neovim/nvim-lspconfig' } }
-- quickfix list
@@ -120,12 +121,8 @@ return packer.startup({
use 'leoluz/nvim-dap-go'
use 'rcarriga/nvim-dap-ui'
use 'theHamsta/nvim-dap-virtual-text'
- use "mxsdev/nvim-dap-vscode-js"
- use {
- "microsoft/vscode-js-debug",
- opt = true,
- run = "npm install --legacy-peer-deps && npm run compile"
- }
+ use 'mxsdev/nvim-dap-vscode-js'
+ use { 'microsoft/vscode-js-debug', opt = true, run = 'npm install --legacy-peer-deps && npm run compile' }
-- treesitter
use 'nvim-treesitter/nvim-treesitter'
diff --git a/lua/tms/keymap.lua b/lua/tms/keymap.lua
@@ -1,67 +1,67 @@
-- forget visual
-vim.keymap.set('n', 'Q', '<nop>')
+vim.keymap.set('n', 'Q', '<nop>', {})
vim.keymap.set('n', '<esc>', '<cmd>nohl<cr>', { silent = true })
-vim.keymap.set('n', 'gA', 'ga')
-vim.keymap.set('n', 'Y', 'y$')
-vim.keymap.set('n', 'n', 'nzzzv')
-vim.keymap.set('n', 'N', 'Nzzzv')
-vim.keymap.set('n', 'J', 'mzJ`z')
-vim.keymap.set('i', ',', ',<c-g>u')
-vim.keymap.set('i', '.', '.<c-g>u')
-vim.keymap.set('i', '!', '!<c-g>u')
-vim.keymap.set('i', '?', '?<c-g>u')
+vim.keymap.set('n', 'gA', 'ga', {})
+vim.keymap.set('n', 'Y', 'y$', {})
+vim.keymap.set('n', 'n', 'nzzzv', {})
+vim.keymap.set('n', 'N', 'Nzzzv', {})
+vim.keymap.set('n', 'J', 'mzJ`z', {})
+vim.keymap.set('i', ',', ',<c-g>u', {})
+vim.keymap.set('i', '.', '.<c-g>u', {})
+vim.keymap.set('i', '!', '!<c-g>u', {})
+vim.keymap.set('i', '?', '?<c-g>u', {})
-- shortcuts
-vim.keymap.set('n', '<leader>w', '<cmd>write<cr>')
-vim.keymap.set('n', '<leader>W', '<cmd>wall<cr>')
-vim.keymap.set('n', '<leader>e', '<cmd>edit<cr>')
-vim.keymap.set('n', '<leader>E', ':e %:h/')
-vim.keymap.set('n', '<leader>q', '<cmd>quit<cr>')
-vim.keymap.set('n', '<leader>Q', '<cmd>quit!<cr>')
-vim.keymap.set('n', '<leader>M', '<cmd>messages<cr>')
-vim.keymap.set('n', '<leader>so', '<cmd>source<cr>')
+vim.keymap.set('n', '<leader>w', '<cmd>write<cr>', {})
+vim.keymap.set('n', '<leader>W', '<cmd>wall<cr>', {})
+vim.keymap.set('n', '<leader>e', '<cmd>edit<cr>', {})
+vim.keymap.set('n', '<leader>E', ':e %:h/', {})
+vim.keymap.set('n', '<leader>q', '<cmd>quit<cr>', {})
+vim.keymap.set('n', '<leader>Q', '<cmd>quit!<cr>', {})
+vim.keymap.set('n', '<leader>M', '<cmd>messages<cr>', {})
+vim.keymap.set('n', '<leader>so', '<cmd>source<cr>', {})
-- window movement
-vim.keymap.set('n', '<a-h>', '<c-w>h')
-vim.keymap.set('n', '<a-j>', '<c-w>j')
-vim.keymap.set('n', '<a-k>', '<c-w>k')
-vim.keymap.set('n', '<a-l>', '<c-w>l')
+vim.keymap.set('n', '<a-h>', '<c-w>h', {})
+vim.keymap.set('n', '<a-j>', '<c-w>j', {})
+vim.keymap.set('n', '<a-k>', '<c-w>k', {})
+vim.keymap.set('n', '<a-l>', '<c-w>l', {})
-- window movement in terminal
-vim.keymap.set('t', '<a-l>', '<c-\\><c-n><c-w>l')
-vim.keymap.set('t', '<a-j>', '<c-\\><c-n><c-w>j')
-vim.keymap.set('t', '<a-k>', '<c-\\><c-n><c-w>k')
-vim.keymap.set('t', '<a-h>', '<c-\\><c-n><c-w>h')
-vim.keymap.set('t', '<a-r>', '<c-\\><c-n>')
+vim.keymap.set('t', '<a-l>', '<c-\\><c-n><c-w>l', {})
+vim.keymap.set('t', '<a-j>', '<c-\\><c-n><c-w>j', {})
+vim.keymap.set('t', '<a-k>', '<c-\\><c-n><c-w>k', {})
+vim.keymap.set('t', '<a-h>', '<c-\\><c-n><c-w>h', {})
+vim.keymap.set('t', '<a-r>', '<c-\\><c-n>', {})
-- window split
-vim.keymap.set('n', '<c-w><c-v>', '<cmd>vnew<cr>')
-vim.keymap.set('n', '<c-w><c-s>', '<cmd>new<cr>')
+vim.keymap.set('n', '<c-w><c-v>', '<cmd>vnew<cr>', {})
+vim.keymap.set('n', '<c-w><c-s>', '<cmd>new<cr>', {})
-- line movement
-vim.keymap.set('n', '<c-j>', ':m .+1<cr>==')
-vim.keymap.set('n', '<c-k>', ':m .-2<cr>==')
-vim.keymap.set('i', '<c-j>', '<esc>:m .+1<cr>==')
-vim.keymap.set('i', '<c-k>', '<esc>:m .-2<cr>==')
-vim.keymap.set('v', '<c-j>', ':m \'>+1<cr>gv=gv')
-vim.keymap.set('v', '<c-k>', ':m \'<-2<cr>gv=gv')
+vim.keymap.set('n', '<c-j>', ':m .+1<cr>==', {})
+vim.keymap.set('n', '<c-k>', ':m .-2<cr>==', {})
+vim.keymap.set('i', '<c-j>', '<esc>:m .+1<cr>==', {})
+vim.keymap.set('i', '<c-k>', '<esc>:m .-2<cr>==', {})
+vim.keymap.set('v', '<c-j>', ':m \'>+1<cr>gv=gv', {})
+vim.keymap.set('v', '<c-k>', ':m \'<-2<cr>gv=gv', {})
-- quickfix/loclist
-vim.keymap.set('n', '<leader>c', '<cmd>call ToggleList("Quickfix List", "c")<cr>')
-vim.keymap.set('n', '<leader>C', '<cmd>cexpr []|cclose<cr>')
-vim.keymap.set('n', '<leader>l', '<cmd>call ToggleList("Location List", "l")<cr>')
-vim.keymap.set('n', '<leader>L', '<cmd>lexpr []|lclose<cr>')
+vim.keymap.set('n', '<leader>c', '<cmd>call ToggleList("Quickfix List", "c")<cr>', {})
+vim.keymap.set('n', '<leader>C', '<cmd>cexpr []|cclose<cr>', {})
+vim.keymap.set('n', '<leader>l', '<cmd>call ToggleList("Location List", "l")<cr>', {})
+vim.keymap.set('n', '<leader>L', '<cmd>lexpr []|lclose<cr>', {})
-- fold
-vim.keymap.set('n', 'zH', 'zM')
-vim.keymap.set('n', 'zh', 'zm')
-vim.keymap.set('n', 'zj', 'zo')
-vim.keymap.set('n', 'zJ', 'zO')
-vim.keymap.set('n', 'zk', 'zc')
-vim.keymap.set('n', 'zK', 'zC')
-vim.keymap.set('n', 'zl', 'zr')
-vim.keymap.set('n', 'zL', 'zR')
+vim.keymap.set('n', 'zH', 'zM', {})
+vim.keymap.set('n', 'zh', 'zm', {})
+vim.keymap.set('n', 'zj', 'zo', {})
+vim.keymap.set('n', 'zJ', 'zO', {})
+vim.keymap.set('n', 'zk', 'zc', {})
+vim.keymap.set('n', 'zK', 'zC', {})
+vim.keymap.set('n', 'zl', 'zr', {})
+vim.keymap.set('n', 'zL', 'zR', {})
-- remap double usage
-vim.keymap.set('n', 'y.', 'yy')
-vim.keymap.set('n', 'z.', 'mmz.`m')
-vim.keymap.set('n', 'd.', 'dd')
-vim.keymap.set('n', 'c.', 'cc')
-vim.keymap.set('n', 'g.', 'gg')
-vim.keymap.set('n', 'v.', 'V')
-vim.keymap.set('n', '=.', '==')
-vim.keymap.set('n', 'gc.', 'gcc')
+vim.keymap.set('n', 'y.', 'yy', {})
+vim.keymap.set('n', 'z.', 'mmz.`m', {})
+vim.keymap.set('n', 'd.', 'dd', {})
+vim.keymap.set('n', 'c.', 'cc', {})
+vim.keymap.set('n', 'g.', 'gg', {})
+vim.keymap.set('n', 'v.', 'V', {})
+vim.keymap.set('n', '=.', '==', {})
+vim.keymap.set('n', 'gc.', 'gcc', {})
-vim.keymap.set('n', '<leader>D', '<cmd>!tree %:h<cr>')
+vim.keymap.set('n', '<leader>D', '<cmd>!tree %:h<cr>', {})
diff --git a/lua/tms/lsp/init.lua b/lua/tms/lsp/init.lua
@@ -2,12 +2,13 @@ local M = {}
M.capabilities = function()
local cap = vim.lsp.protocol.make_client_capabilities()
+
local has_cmp, cmp = pcall(require, 'cmp_nvim_lsp')
if has_cmp then
- return cmp.update_capabilities(cap)
- else
- return cap
+ cap = cmp.update_capabilities(cap)
end
+
+ return cap
end
M.make_opts = function(name)
diff --git a/lua/tms/options.lua b/lua/tms/options.lua
@@ -31,7 +31,6 @@ vim.opt.tabstop = 2
vim.opt.undofile = true
vim.opt.foldlevel = 999
vim.opt.foldmethod = 'indent'
-vim.opt.foldtext = 'MyFoldText()'
vim.opt.list = false
vim.opt.laststatus = 3
vim.opt.statusline = ' '
