From fc67eecc8a40bf28d3d2b190702e58c580bfba9f Mon Sep 17 00:00:00 2001 From: Robert Günzler Date: Thu, 19 Jan 2023 18:33:43 +0100 Subject: vim: format config with stylua MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert Günzler --- .vim/after/ftplugin/gitrebase.lua | 30 +++++++++++++---------- .vim/after/ftplugin/go.lua | 33 +++++++++++++------------- .vim/after/ftplugin/ledger.lua | 1 - .vim/after/ftplugin/mail.lua | 1 - .vim/after/ftplugin/markdown.lua | 50 ++++++++++++++++++++++++++------------- .vim/after/ftplugin/norg.lua | 1 - .vim/after/ftplugin/tex.lua | 3 +-- 7 files changed, 68 insertions(+), 51 deletions(-) (limited to '.vim/after/ftplugin') diff --git a/.vim/after/ftplugin/gitrebase.lua b/.vim/after/ftplugin/gitrebase.lua index 50684f4..e48b296 100644 --- a/.vim/after/ftplugin/gitrebase.lua +++ b/.vim/after/ftplugin/gitrebase.lua @@ -1,12 +1,16 @@ - local commit_preview = function() local commit = vim.api.nvim_get_current_line():match([[ ([0-9a-f]+) ]]) - local result = require('internal.job').jobstart({ - command = 'git', - args = { 'show', commit }, - format_title = function(_, _) return 'git-show' end, - populate_quickfix = false, - }):wait():result() + local result = require('internal.job') + .jobstart({ + command = 'git', + args = { 'show', commit }, + format_title = function(_, _) + return 'git-show' + end, + populate_quickfix = false, + }) + :wait() + :result() -- create buffer local bufnr = vim.api.nvim_create_buf(false, true) @@ -21,18 +25,18 @@ local commit_preview = function() -- create window local winpos = 'belowright' local winheight = #result <= 25 and #result or 25 - vim.cmd(string.format("%s %dsplit", winpos, winheight)) + vim.cmd(string.format('%s %dsplit', winpos, winheight)) local winid = vim.api.nvim_get_current_win() -- vim.cmd(string.format("buffer %d", bufnr)) vim.api.nvim_win_set_buf(winid, bufnr) - vim.cmd("wincmd p") + vim.cmd('wincmd p') local close = function() pcall(vim.api.nvim_win_close, winid, true) pcall(vim.api.nvim_buf_delete, bufnr, { force = true }) end -- close with q - vim.keymap.set('n', 'q', close, {buffer = bufnr}) + vim.keymap.set('n', 'q', close, { buffer = bufnr }) -- close on CursorMoved local old_cursor = vim.api.nvim_win_get_cursor(0) local group = vim.api.nvim_create_augroup('gitcommit_win_' .. winid, {}) @@ -40,8 +44,10 @@ local commit_preview = function() group = group, callback = function() local cursor = vim.api.nvim_win_get_cursor(0) - if (old_cursor[1] ~= cursor[1] or old_cursor[2] ~= cursor[2]) and - vim.api.nvim_get_current_win() ~= winid then + if + (old_cursor[1] ~= cursor[1] or old_cursor[2] ~= cursor[2]) + and vim.api.nvim_get_current_win() ~= winid + then close() return end diff --git a/.vim/after/ftplugin/go.lua b/.vim/after/ftplugin/go.lua index c881292..94eaa0e 100644 --- a/.vim/after/ftplugin/go.lua +++ b/.vim/after/ftplugin/go.lua @@ -1,20 +1,19 @@ -- vim.opt.shiftwidth = 4 -vim.keymap.set('n', - 'i', - function() - local iface = vim.fn.input('Impl: ') - if not iface or iface == '' then return end - require('misc').word_under_cursor(function(word) - vim.cmd ('normal ][o') - local args = { - 'impl', - '-dir', - vim.fn.expand('%:h:p'), - '"'..string.lower(word:sub(0,1))..' *'..word..'"', - iface, - } - vim.cmd ('r!' .. table.concat(args, ' ')) - end) +vim.keymap.set('n', 'i', function() + local iface = vim.fn.input('Impl: ') + if not iface or iface == '' then + return end -) + require('misc').word_under_cursor(function(word) + vim.cmd('normal ][o') + local args = { + 'impl', + '-dir', + vim.fn.expand('%:h:p'), + '"' .. string.lower(word:sub(0, 1)) .. ' *' .. word .. '"', + iface, + } + vim.cmd('r!' .. table.concat(args, ' ')) + end) +end) diff --git a/.vim/after/ftplugin/ledger.lua b/.vim/after/ftplugin/ledger.lua index 0baeab5..bcdcf9a 100644 --- a/.vim/after/ftplugin/ledger.lua +++ b/.vim/after/ftplugin/ledger.lua @@ -1,3 +1,2 @@ - vim.opt_local.commentstring = '; %s' vim.opt_local.cursorcolumn = true diff --git a/.vim/after/ftplugin/mail.lua b/.vim/after/ftplugin/mail.lua index 8abc2df..1aa5caf 100644 --- a/.vim/after/ftplugin/mail.lua +++ b/.vim/after/ftplugin/mail.lua @@ -1,3 +1,2 @@ - require('internal.spell') vim.opt.cursorline = false diff --git a/.vim/after/ftplugin/markdown.lua b/.vim/after/ftplugin/markdown.lua index 65fc646..87fe69d 100644 --- a/.vim/after/ftplugin/markdown.lua +++ b/.vim/after/ftplugin/markdown.lua @@ -8,47 +8,63 @@ vim.fn.matchadd('Conceal', '- \\[ \\]\\&- \\zs\\[ ', 0, -1, { conceal = '☐ ' } vim.fn.matchadd('Conceal', '- \\[x\\]\\&- \\zs\\[x', 0, -1, { conceal = '🞕 ' }) vim.fn.matchadd('Conceal', '- \\[[ x]\\zs\\]', 0, -1, { conceal = ' ' }) -vim.keymap.set('n', 'Markdown_OpenUrlUnderCursor', - function() require('internal.misc').open_under_cursor('url-launcher') end) +vim.keymap.set('n', 'Markdown_OpenUrlUnderCursor', function() + require('internal.misc').open_under_cursor('url-launcher') +end) -vim.keymap.set('n', 'l', require('internal.misc').link_preview, {desc='link preview'}) +vim.keymap.set( + 'n', + 'l', + require('internal.misc').link_preview, + { desc = 'link preview' } +) local function toggle_checkbox() local ln, n = vim.api.nvim_get_current_line(), 0 ln, n = string.gsub(ln, '%[ %]', '[x]', 1) - if n > 0 then goto set_line end + if n > 0 then + goto set_line + end ln, n = string.gsub(ln, '%[x%]', '[ ]', 1) - if n > 0 then goto set_line end + if n > 0 then + goto set_line + end ln, n = string.gsub(ln, 'TODO', 'DONE', 1) - if n > 0 then goto set_line end + if n > 0 then + goto set_line + end ln, n = string.gsub(ln, 'DONE', 'TODO', 1) - if n > 0 then goto set_line end + if n > 0 then + goto set_line + end -::set_line:: + ::set_line:: vim.api.nvim_set_current_line(ln) end -vim.keymap.set('n', '', toggle_checkbox, {desc='toggle checkbox', buffer=true}) -vim.keymap.set('i', '', toggle_checkbox, {desc='toggle checkbox', buffer=true}) + +vim.keymap.set('n', '', toggle_checkbox, { desc = 'toggle checkbox', buffer = true }) +vim.keymap.set('i', '', toggle_checkbox, { desc = 'toggle checkbox', buffer = true }) -- vim.keymap.set('n', 'zn', function() require('zk').new() end, {buffer=true}) -- vim.keymap.set('n', 'zi', function() require('zk').index() end, {buffer=true}) -- vim.cmd [[ command! -nargs=* ZettelkastenNew lua require('zk').new(nil, ) ]] vim.keymap.set('n', 'gt', function() - require('telescope._extensions.todo-comments').exports.todo {cwd=vim.env.ZK_NOTEBOOK_DIR} -end, {desc='show zk todos', buffer=true}) + require('telescope._extensions.todo-comments').exports.todo({ cwd = vim.env.ZK_NOTEBOOK_DIR }) +end, { desc = 'show zk todos', buffer = true }) vim.keymap.set('n', 'o', function() local cursor = vim.api.nvim_win_get_cursor(0) -- need to decrement the row number here, to account for 0 indexing - local node = vim.treesitter.get_node_at_pos(0, cursor[1]-1, cursor[2], {}) + local node = vim.treesitter.get_node_at_pos(0, cursor[1] - 1, cursor[2], {}) while node do if node:type() == 'list_item' then local ln = vim.treesitter.get_node_text(node:child(0), 0, {}) - local ln_start = string.match(ln, '^(%d+)%.'); if ln_start ~= nil then - ln = ln:gsub(ln_start, tonumber(ln_start)+1) + local ln_start = string.match(ln, '^(%d+)%.') + if ln_start ~= nil then + ln = ln:gsub(ln_start, tonumber(ln_start) + 1) end - vim.api.nvim_buf_set_lines(0, cursor[1], cursor[1], false, {ln}) + vim.api.nvim_buf_set_lines(0, cursor[1], cursor[1], false, { ln }) vim.api.nvim_feedkeys('jA', 'n', false) return end @@ -56,4 +72,4 @@ vim.keymap.set('n', 'o', function() end vim.api.nvim_feedkeys('o', 'n', false) -end, {desc='smart-o', buffer=true}) +end, { desc = 'smart-o', buffer = true }) diff --git a/.vim/after/ftplugin/norg.lua b/.vim/after/ftplugin/norg.lua index 506e4bd..9bf66e6 100644 --- a/.vim/after/ftplugin/norg.lua +++ b/.vim/after/ftplugin/norg.lua @@ -1,2 +1 @@ - vim.keymap.set('n', 'im', [[:Neorg inject-metadata]]) diff --git a/.vim/after/ftplugin/tex.lua b/.vim/after/ftplugin/tex.lua index 031c63b..740ad48 100644 --- a/.vim/after/ftplugin/tex.lua +++ b/.vim/after/ftplugin/tex.lua @@ -1,3 +1,2 @@ - -vim.opt_local.makeprg = "latexmk -1 -n %" +vim.opt_local.makeprg = 'latexmk -1 -n %' vim.opt_local.textwidth = 80 -- cgit 1.4.1