diff options
Diffstat (limited to '.vim/after')
28 files changed, 145 insertions, 406 deletions
diff --git a/.vim/after/ftplugin/c.lua b/.vim/after/ftplugin/c.lua new file mode 100644 index 0000000..8b2cea9 --- /dev/null +++ b/.vim/after/ftplugin/c.lua @@ -0,0 +1 @@ +vim.opt_local.commentstring = '// %s' diff --git a/.vim/after/ftplugin/dirbuf.lua b/.vim/after/ftplugin/dirbuf.lua deleted file mode 100644 index 4f41efc..0000000 --- a/.vim/after/ftplugin/dirbuf.lua +++ /dev/null @@ -1,3 +0,0 @@ -vim.opt_local.list = false - -vim.keymap.set('n', '/', ':Telescope current_buffer_fuzzy_find<cr>', { buffer = vim.api.nvim_get_current_buf() }) diff --git a/.vim/after/ftplugin/gitmessengerpopup.lua b/.vim/after/ftplugin/gitmessengerpopup.lua deleted file mode 100644 index ab4688f..0000000 --- a/.vim/after/ftplugin/gitmessengerpopup.lua +++ /dev/null @@ -1 +0,0 @@ -vim.keymap.set('n', 'gd', require('internal.commit-preview').under_cursor, { buffer = 0, desc = 'commit preview' }) diff --git a/.vim/after/ftplugin/gitrebase.lua b/.vim/after/ftplugin/gitrebase.lua deleted file mode 100644 index 6b9e5dc..0000000 --- a/.vim/after/ftplugin/gitrebase.lua +++ /dev/null @@ -1,34 +0,0 @@ -local function commit_preview() - local beforewin = vim.api.nvim_get_current_win() - local commit = vim.api.nvim_get_current_line():match([[ ([0-9a-f]+) ]]) - if not commit then - return - end - require('internal.commit-preview').commit_preview(commit, function(bufnr, winid) - -- keymaps: - local close = function() - pcall(vim.api.nvim_win_close, winid, true) - pcall(vim.api.nvim_buf_delete, bufnr, { force = true }) - end - vim.keymap.set('n', 'q', close, { buffer = bufnr }) - - local goup = function() - vim.api.nvim_set_current_win(beforewin) - vim.cmd('normal k') - vim.cmd('normal cp') - end - vim.keymap.set('n', '<up>', goup, { buffer = bufnr }) - vim.keymap.set('n', '<C-p>', goup, { buffer = bufnr }) - - local godown = function() - vim.api.nvim_set_current_win(beforewin) - vim.cmd('normal j') - vim.cmd('normal cp') - end - vim.keymap.set('n', '<down>', godown, { buffer = bufnr }) - vim.keymap.set('n', '<C-n>', godown, { buffer = bufnr }) - end) -end - -vim.keymap.set('n', 'cp', commit_preview, { buffer = 0, desc = 'commit preview' }) -vim.keymap.set('n', '<leader>c', commit_preview, { buffer = 0, desc = 'commit preview' }) diff --git a/.vim/after/ftplugin/go.lua b/.vim/after/ftplugin/go.lua deleted file mode 100644 index cda6a34..0000000 --- a/.vim/after/ftplugin/go.lua +++ /dev/null @@ -1,19 +0,0 @@ --- vim.opt.shiftwidth = 4 - -vim.keymap.set('n', '<leader>i', function() - local iface = vim.fn.input('Impl: ') - if not iface or iface == '' then - return - end - require('internal.cursor').word(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/html.lua b/.vim/after/ftplugin/html.lua new file mode 100644 index 0000000..35f0bd1 --- /dev/null +++ b/.vim/after/ftplugin/html.lua @@ -0,0 +1,20 @@ +local function get_visual_selection() + local start_pos = vim.fn.getpos('v') + local end_pos = vim.fn.getpos('.') + local text = vim.fn.getregion(vim.fn.getpos('v'), vim.fn.getpos('.'), { type = vim.fn.mode() }) + return { start_pos = start_pos, end_pos = end_pos, text = text } +end + +vim.keymap.set('x', '<c-l>', function() + local sel = get_visual_selection() + vim.print(sel) + vim.api.nvim_buf_set_text( + sel.start_pos[1], -- bufnum + sel.start_pos[2] - 1, -- vim.api funcs use 0-based indexing + sel.start_pos[3] - 1, + sel.end_pos[2] - 1, + sel.end_pos[3], + { '<a href="TODO">' .. table.concat(sel.text, '') .. '</a>' } + ) + vim.api.nvim_input('<esc>') +end, { desc = 'html: make link' }) diff --git a/.vim/after/ftplugin/ledger.lua b/.vim/after/ftplugin/ledger.lua deleted file mode 100644 index bcdcf9a..0000000 --- a/.vim/after/ftplugin/ledger.lua +++ /dev/null @@ -1,2 +0,0 @@ -vim.opt_local.commentstring = '; %s' -vim.opt_local.cursorcolumn = true diff --git a/.vim/after/ftplugin/lua.lua b/.vim/after/ftplugin/lua.lua new file mode 100644 index 0000000..ff08e11 --- /dev/null +++ b/.vim/after/ftplugin/lua.lua @@ -0,0 +1,2 @@ +vim.keymap.set('n', '<leader><leader>x', '<cmd>source %<cr>', { desc = 'Reload buf' }) +vim.keymap.set('n', '<leader><leader>X', ':Lazy reload ', { desc = 'Reload plugin' }) diff --git a/.vim/after/ftplugin/mail.lua b/.vim/after/ftplugin/mail.lua index 6e0fa20..fba17a2 100644 --- a/.vim/after/ftplugin/mail.lua +++ b/.vim/after/ftplugin/mail.lua @@ -1,4 +1,2 @@ -require('internal.spell') - vim.opt_local.cursorline = false vim.opt_local.commentstring = '> %s' diff --git a/.vim/after/ftplugin/markdown.lua b/.vim/after/ftplugin/markdown.lua index 7e6b22e..9b98392 100644 --- a/.vim/after/ftplugin/markdown.lua +++ b/.vim/after/ftplugin/markdown.lua @@ -1,68 +1,6 @@ --- require('internal.spell') -vim.opt_local.foldenable = false -vim.opt_local.foldlevel = 1 - -vim.fn.matchadd('Conceal', '- \\[ \\]\\&- \\zs\\[ ', 0, -1, { conceal = '☐ ' }) --- vim.fn.matchadd('Conceal', '\\[x\\]', 0, -1, { conceal = '☑ ' }) --- vim.fn.matchadd('Conceal', '\\[-\\]', 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', '<Plug>Markdown_OpenUrlUnderCursor', vim.ui.open) - -vim.keymap.set( - 'n', - '<localleader>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 - ln, n = string.gsub(ln, '%[x%]', '[ ]', 1) - if n > 0 then - goto set_line - end - ln, n = string.gsub(ln, 'TODO', 'DONE', 1) - if n > 0 then - goto set_line - end - ln, n = string.gsub(ln, 'DONE', 'TODO', 1) - if n > 0 then - goto set_line - end - - ::set_line:: - vim.api.nvim_set_current_line(ln) -end - -vim.keymap.set('n', '<space><space>', toggle_checkbox, { desc = 'toggle checkbox', buffer = true }) -vim.keymap.set('i', '<c-space>', toggle_checkbox, { desc = 'toggle checkbox', 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({ --- bufnr = 0, --- pos = { 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) --- end --- vim.api.nvim_buf_set_lines(0, cursor[1], cursor[1], false, { ln }) --- vim.api.nvim_feedkeys('jA', 'n', false) --- return --- end --- node = node:parent() --- end --- --- vim.api.nvim_feedkeys('o', 'n', false) --- end, { desc = 'smart-o', buffer = true }) +-- TODO: no idea if this is the best way to do this +-- the part that makes this work lives in ../../../after/ftplugin/markdown.lua +require('null-ls').disable('vale') +vim.keymap.set('n', '<leader>v', function() + require('null-ls').toggle('vale') +end) diff --git a/.vim/after/ftplugin/mediawiki.lua b/.vim/after/ftplugin/mediawiki.lua new file mode 100644 index 0000000..5011e85 --- /dev/null +++ b/.vim/after/ftplugin/mediawiki.lua @@ -0,0 +1,5 @@ +vim.opt.wrap = true +vim.opt.linebreak = true + +vim.keymap.set({ 'n', 'v' }, 'j', 'gj', { buffer = true }) +vim.keymap.set({ 'n', 'v' }, 'k', 'gk', { buffer = true }) diff --git a/.vim/after/ftplugin/norg.lua b/.vim/after/ftplugin/norg.lua deleted file mode 100644 index 9bf66e6..0000000 --- a/.vim/after/ftplugin/norg.lua +++ /dev/null @@ -1 +0,0 @@ -vim.keymap.set('n', '<leader>im', [[:Neorg inject-metadata<cr>]]) diff --git a/.vim/after/ftplugin/rust.lua b/.vim/after/ftplugin/rust.lua deleted file mode 100644 index a26bebe..0000000 --- a/.vim/after/ftplugin/rust.lua +++ /dev/null @@ -1 +0,0 @@ -vim.opt_local.makeprg = [[cargo run]] diff --git a/.vim/after/ftplugin/scd.lua b/.vim/after/ftplugin/scd.lua deleted file mode 100644 index e69de29..0000000 --- a/.vim/after/ftplugin/scd.lua +++ /dev/null diff --git a/.vim/after/ftplugin/tex.lua b/.vim/after/ftplugin/tex.lua deleted file mode 100644 index bf62d26..0000000 --- a/.vim/after/ftplugin/tex.lua +++ /dev/null @@ -1,8 +0,0 @@ -local find_doc_root = require('lspconfig.util').root_pattern('Tectonic.toml') -if find_doc_root(vim.fn.expand('%:p:h')) then - vim.opt_local.makeprg = 'latextbx mk -1' -else - vim.opt_local.makeprg = 'latextbx mk -1 %' -end - -vim.opt_local.textwidth = 80 diff --git a/.vim/after/ftplugin/todofile.lua b/.vim/after/ftplugin/todofile.lua deleted file mode 100644 index 2080d39..0000000 --- a/.vim/after/ftplugin/todofile.lua +++ /dev/null @@ -1,23 +0,0 @@ -local function toggle_todo() - local ln, n = vim.api.nvim_get_current_line(), 0 - ln, n = string.gsub(ln, 'TODO', 'DONE', 1) - if n > 0 then - goto set_line - end - ln, n = string.gsub(ln, 'DONE', 'TODO', 1) - if n > 0 then - goto set_line - end - ln, n = string.gsub(ln, '^(-|*) ', '%1 TODO ') - if n > 0 then - goto set_line - end - - goto exit -- skip over set_current_line - - ::set_line:: - vim.api.nvim_set_current_line(ln) - - ::exit:: -end -vim.keymap.set('n', '<space><space>', toggle_todo, { desc = 'toggle todo', buffer = true }) diff --git a/.vim/after/queries.bak/markdown/highlights.scm b/.vim/after/queries.bak/markdown/highlights.scm new file mode 100644 index 0000000..9aba385 --- /dev/null +++ b/.vim/after/queries.bak/markdown/highlights.scm @@ -0,0 +1,100 @@ +;; inherits: markdown +;; extends + +;From MDeiml/tree-sitter-markdown & Helix + +(list_item (task_list_marker_checked)) @comment (#set! "priority" 90) + +[ + (list_marker_plus) + (list_marker_minus) + (list_marker_star) + (list_marker_dot) + (list_marker_parenthesis) + (thematic_break) +] @string + +[ + (task_list_marker_checked) + (task_list_marker_unchecked) +] @task_marker + +[ + (atx_h1_marker) + (atx_h2_marker) + (atx_h3_marker) + (atx_h4_marker) + (atx_h5_marker) + (atx_h6_marker) +] @header_marker + +(atx_heading) @header_content + +; concealing +((atx_h1_marker) @header_marker.h1 + (#offset! @header_marker.h1 0 0 0 0) + ;(#set! conceal " ") +) + +((atx_h2_marker) @header_marker.h2 + (#offset! @header_marker.h2 0 0 0 0) + ;(#set! conceal " ") +) + +((atx_h3_marker) @header_marker.h3 + (#offset! @header_marker.h3 0 0 0 0) + ;(#set! conceal " ") +) + +((atx_h4_marker) @header_marker.h4 + (#offset! @header_marker.h4 0 0 0 0) + ;(#set! conceal " ") +) + +((atx_h5_marker) @header_marker.h5 + (#offset! @header_marker.h5 0 0 0 0) + ;(#set! conceal " ") +) + +((atx_h6_marker) @header_marker.h6 + (#offset! @header_marker.h6 0 0 0 0) + ;(#set! conceal " ") +) + +; used for first level list items +((list_marker_star) @list_marker.star + (#offset! @list_marker.star 0 0 0 -1) + ;(#set! conceal " ") +) +; used for second level list items +((list_marker_minus) @list_marker.minus + (#offset! @list_marker.minus 0 0 0 -1) + ;(#set! conceal " ") +) + +((list_marker_plus) @list_marker.plus + (#offset! @list_marker.plus 0 0 0 -1) + ;(#set! conceal " ") +) +((list_marker_dot) @list_marker.dot + (#offset! @list_marker.dot 0 0 0 -1) + ;(#set! conceal " ") +) +((list_marker_parenthesis) @list_marker.parenthesis + (#offset! @list_marker.parenthesis 0 0 0 -1) + ;(#set! conceal " ") +) + +;; replace '[x]' with +((task_list_marker_checked) @text.todo.checked + (#offset! @text.todo.checked 0 -2 0 0) + (#set! conceal "☑ ") +) + +;; replace '[ ]' with +((task_list_marker_unchecked) @text.todo.unchecked + (#offset! @text.todo.unchecked 0 -2 0 0) + (#set! conceal "☐ ") +) + +([(minus_metadata)] @comment) diff --git a/.vim/after/queries.bak/markdown_inline/highlights.scm b/.vim/after/queries.bak/markdown_inline/highlights.scm new file mode 100644 index 0000000..ab0a7f4 --- /dev/null +++ b/.vim/after/queries.bak/markdown_inline/highlights.scm @@ -0,0 +1,11 @@ +;; inherits: markdown_inline +;; extends + +([ + (code_span_delimiter) + (shortcut_link) +] @comment) + +([ + (link_text) +] @string) diff --git a/.vim/after/snippets/c.snippets b/.vim/after/snippets/c.snippets deleted file mode 100644 index 8b13789..0000000 --- a/.vim/after/snippets/c.snippets +++ /dev/null @@ -1 +0,0 @@ - diff --git a/.vim/after/snippets/dockerfile.snippets.todo b/.vim/after/snippets/dockerfile.snippets.todo deleted file mode 100644 index c8d7502..0000000 --- a/.vim/after/snippets/dockerfile.snippets.todo +++ /dev/null @@ -1,31 +0,0 @@ -# vim: ft=snippets: - -snippet FROM:skel "skeleton" b -#syntax=docker/dockerfile:1.2 - -FROM docker.io/library/alpine:3${1} -$0 - -#vim: ft=Dockerfile: -endsnippet - -snippet FROM:alpine "FROM --platform=$BUILDPLATFORM" -FROM --platform=$BUILDPLATFORM docker.io/library/alpine:3${1} AS base -ARG TARGETPLATFORM -RUN apk -U add --no-cache $0 -endsnippet - -snippet FROM:final "FROM scratch AS final" -FROM scratch AS final -COPY --from=build /out/* / -endsnippet - -snippet RUN "RUN" b -RUN --mount=target=. \ - --mount=target=${1:/root/.cache},type=cache \ - ${0} -endsnippet - -snippet FROM:xx "tonistiigi/xx" b -FROM --platform=$BUILDPLATFORM docker.io/tonistiigi/xx:${1:golang} AS xx -endsnippet diff --git a/.vim/after/snippets/ebuild.snippets.todo b/.vim/after/snippets/ebuild.snippets.todo deleted file mode 100644 index 6856c61..0000000 --- a/.vim/after/snippets/ebuild.snippets.todo +++ /dev/null @@ -1,25 +0,0 @@ -snippet eapi7 "eapi7" -# Copyright `!v strftime('%Y')` Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="$2" -HOMEPAGE="$3" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/$1/${PN}.git" -else - SRC_URI="https://github.com/$1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="" -KEYWORDS="~amd64 ~arm64 ~x86" - -DEPEND="$0" -RDEPEND="${DEPEND}" -BDEPEND="" -endsnippet diff --git a/.vim/after/snippets/go.snippets b/.vim/after/snippets/go.snippets deleted file mode 100644 index 84df9a1..0000000 --- a/.vim/after/snippets/go.snippets +++ /dev/null @@ -1,20 +0,0 @@ -snippet memfd - func newMemFd(data []byte) (*io.File, error) { - fd, err := unix.MemfdCreate("memfd", 0) - if err != nil { - return nil, err - } - if err := unix.Ftruncate(fd, int64(len(data))); err != nil { - return nil, err - } - var mem []byte - mem, err = unix.Mmap(fd, 0, len(data), unix.PROT_READ|unix.PROT_WRITE, unix.MAP_SHARED) - if err != nil { - return nil, err - } - copy(mem, data) - if err := unix.Munmap(mem); err != nil { - return nil, err - } - return os.NewFile(uintptr(fd), fmt.Sprintf("/proc/self/fd/%d", fd)), nil - } diff --git a/.vim/after/snippets/go.snippets.todo b/.vim/after/snippets/go.snippets.todo deleted file mode 100644 index 3152e3a..0000000 --- a/.vim/after/snippets/go.snippets.todo +++ /dev/null @@ -1,11 +0,0 @@ -snippet main "func main()" -func main() { - ${0} -} -endsnippet - -snippet hfn "http.HandlerFunc" -func $1(w http.ResponseWriter, r *http.Request) { - $0 -} -endsnippet diff --git a/.vim/after/snippets/mail.snippets b/.vim/after/snippets/mail.snippets deleted file mode 100644 index afca39f..0000000 --- a/.vim/after/snippets/mail.snippets +++ /dev/null @@ -1,15 +0,0 @@ - -snippet sehr "Sehr geehrte (...)" - Sehr geehrte Damen und Herren, - - $0 - -snippet mfg "Mit freundlichen Grüßen" - Mit freundlichen Grüßen, - - Robert Günzler - -snippet sign "Signature" - ${1:Cheers}, - - Robert Günzler diff --git a/.vim/after/snippets/markdown.snippets.todo b/.vim/after/snippets/markdown.snippets.todo deleted file mode 100644 index 641e77c..0000000 --- a/.vim/after/snippets/markdown.snippets.todo +++ /dev/null @@ -1,43 +0,0 @@ -snippet new "new page" b ---- -date: "`now`" -title: "$0" ---- -endsnippet - -snippet link "Link" -[$1](${2:${VISUAL}}) -endsnippet - -snippet code "Code block" b -\`\`\`$1 -${2:${VISUAL}} -\`\`\` -$0 -endsnippet - -snippet detail "Detail block" b -<details> -<summary>$1<summary> - -${2:${VISUAL}} - -</details> -$0 -endsnippet - -snippet todo "todo: generic" -* [ ] $0 -endsnippet - -snippet todoKV "todo: krankenversicherung" -* [ ] $0 - - [ ] überweisung - - [ ] beleg einreichen - - [ ] filings - - [ ] refund -endsnippet - -snippet furigana -$\stackrel{\text{$2}}{\text{$1}}$$0 -endsnippet diff --git a/.vim/after/snippets/readme b/.vim/after/snippets/readme deleted file mode 100644 index c71464a..0000000 --- a/.vim/after/snippets/readme +++ /dev/null @@ -1 +0,0 @@ -move to ~/.vim/snippets and implement in lua diff --git a/.vim/after/snippets/sh.snippets b/.vim/after/snippets/sh.snippets deleted file mode 100644 index d87442e..0000000 --- a/.vim/after/snippets/sh.snippets +++ /dev/null @@ -1,16 +0,0 @@ -snippet deps "for app in" - # check requirements - for tool in $1; do - if ! command -v "$tool" >/dev/null; then - printf "%s: %s not installed but required\n" "$(basename "\$0")" "$tool" >&2 - exit 1 - fi - done - - $0 -snippet doc "script docs" - # - # DESCRIPTION: - # $1 - # - $0 diff --git a/.vim/after/snippets/tex.snippets.todo b/.vim/after/snippets/tex.snippets.todo deleted file mode 100644 index de9a974..0000000 --- a/.vim/after/snippets/tex.snippets.todo +++ /dev/null @@ -1,81 +0,0 @@ -snippet frac "\\frac" iA -\\frac{$1}{$2}$0 -endsnippet - -snippet fun "Function" wA -f: \R \to \R -endsnippet -snippet sum "\sum_" wA -\sum_{n=1}^{${1:\infty}} $0 -endsnippet -snippet !> "\mapsto" wA -\mapsto -endsnippet -snippet -> "\to" wA -\to -endsnippet - -snippet report "\documentclass{report}" -\documentclass{report} -\usepackage[a4paper,margin=30truemm]{geometry} -\usepackage{polyglossia} -% font -\usepackage{fontspec} -\setmainfont{IBM Plex Sans} -\setmonofont{IBM Plex Mono} - -\title{$1} -\author{Robert Günzler} -\date{\today} - -\begin{document} - -$0 - -\end{document} -endsnippet - -snippet brief "\documentclass{dinbrief}" -\documentclass{dinbrief} -\usepackage{graphicx} -\usepackage[a4paper,margin=30truemm]{geometry} -% language -\usepackage{polyglossia} -\setdefaultlanguage[spelling=new]{german} -% font -\usepackage{fontspec} -\setmainfont{IBM Plex Sans} -\setmonofont{IBM Plex Mono} -% dinbrief options -\nowindowtics -\nowindowrules - -% unterschrift -\newcommand{\setsign}{\includegraphics[height=30truemm]{/home/robert/Pictures/sign.png}} -\signature{Robert Günzler} -\address{ -% absender - Robert Günzler \\\\ - STREET \\\\ - PLZ Berlin} - -\date{\today} -\place{Berlin} - -% betreff -% \subject{{\bf anliegen}} - -\begin{document} -\begin{letter}{ -% empfänger - $1} - -\opening{${2:Sehr geehrte Damen und Herren,}} - -$0 - -\vspace{10truemm} -\closing[\protect\setsign]{${3:Mit freundlichen Grüßen}} -\end{letter} -\end{document} -endsnippet |