From 3b209dc0f967e469207beea7d6478ebe1e075c76 Mon Sep 17 00:00:00 2001 From: Thomas Voss Date: Sun, 18 Aug 2024 15:23:47 +0200 Subject: nvim: Prefer *.vim to *.lua --- .config/nvim/after/ftplugin/c.lua | 23 ----------------------- .config/nvim/after/ftplugin/c.vim | 16 ++++++++++++++++ .config/nvim/after/ftplugin/ebnf.lua | 1 - .config/nvim/after/ftplugin/ebnf.vim | 1 + .config/nvim/after/ftplugin/gitcommit.lua | 1 - .config/nvim/after/ftplugin/gitcommit.vim | 1 + .config/nvim/after/ftplugin/json.lua | 1 - .config/nvim/after/ftplugin/json.vim | 1 + .config/nvim/after/ftplugin/mail.lua | 2 -- .config/nvim/after/ftplugin/mail.vim | 1 + .config/nvim/after/ftplugin/markdown.lua | 2 -- .config/nvim/after/ftplugin/markdown.vim | 1 + .config/nvim/after/ftplugin/nroff.lua | 1 - .config/nvim/after/ftplugin/nroff.vim | 1 + .config/nvim/after/ftplugin/oryx.lua | 1 - .config/nvim/after/ftplugin/oryx.vim | 1 + .config/nvim/after/ftplugin/python.lua | 1 - .config/nvim/after/ftplugin/python.vim | 1 + .config/nvim/after/ftplugin/query.lua | 1 - .config/nvim/after/ftplugin/query.vim | 1 + .config/nvim/after/ftplugin/yuck.lua | 1 - .config/nvim/after/ftplugin/yuck.vim | 1 + 22 files changed, 26 insertions(+), 35 deletions(-) delete mode 100644 .config/nvim/after/ftplugin/c.lua create mode 100644 .config/nvim/after/ftplugin/c.vim delete mode 100644 .config/nvim/after/ftplugin/ebnf.lua create mode 100644 .config/nvim/after/ftplugin/ebnf.vim delete mode 100644 .config/nvim/after/ftplugin/gitcommit.lua create mode 100644 .config/nvim/after/ftplugin/gitcommit.vim delete mode 100644 .config/nvim/after/ftplugin/json.lua create mode 100644 .config/nvim/after/ftplugin/json.vim delete mode 100644 .config/nvim/after/ftplugin/mail.lua create mode 100644 .config/nvim/after/ftplugin/mail.vim delete mode 100644 .config/nvim/after/ftplugin/markdown.lua create mode 100644 .config/nvim/after/ftplugin/markdown.vim delete mode 100644 .config/nvim/after/ftplugin/nroff.lua create mode 100644 .config/nvim/after/ftplugin/nroff.vim delete mode 100644 .config/nvim/after/ftplugin/oryx.lua create mode 100644 .config/nvim/after/ftplugin/oryx.vim delete mode 100644 .config/nvim/after/ftplugin/python.lua create mode 100644 .config/nvim/after/ftplugin/python.vim delete mode 100644 .config/nvim/after/ftplugin/query.lua create mode 100644 .config/nvim/after/ftplugin/query.vim delete mode 100644 .config/nvim/after/ftplugin/yuck.lua create mode 100644 .config/nvim/after/ftplugin/yuck.vim (limited to '.config/nvim/after/ftplugin') diff --git a/.config/nvim/after/ftplugin/c.lua b/.config/nvim/after/ftplugin/c.lua deleted file mode 100644 index c65969c..0000000 --- a/.config/nvim/after/ftplugin/c.lua +++ /dev/null @@ -1,23 +0,0 @@ -vim.bo.commentstring = '// %s' - -vim.keymap.set('x', '=', ":'<'>!clang-format -style=file", { - desc = 'Format the current selection with Clang Format', -}) - -vim.keymap.set('n', 'K', function() - local w = vim.fn.expand('') - local proc = vim.system({'man', w}):wait() - if proc.code == 16 then - print('No manual for ‘' .. w .. '’ found') - return - elseif proc.code ~= 0 then - print('An error occured') - return - end - vim.cmd [[ - execute "silent !man -Tpdf '" . expand('') . "' | zathura - &" - ]] -end, { - buffer = 0, - desc = 'View the manual page for the word under the cursor', -}) diff --git a/.config/nvim/after/ftplugin/c.vim b/.config/nvim/after/ftplugin/c.vim new file mode 100644 index 0000000..40ecaf8 --- /dev/null +++ b/.config/nvim/after/ftplugin/c.vim @@ -0,0 +1,16 @@ +setlocal commentstring=//\ %s + +function! s:ManpageAtPoint() + let l:w = expand('') + call system(['env', 'MANSECT=3,2,3p', 'man', l:w]) + if v:shell_error == 0 + execute "silent !MANSECT=3,2,3p man -Tpdf '" . l:w . "' | zathura - &" + elseif v:shell_error == 16 + echomsg 'No manual for ‘' . l:w . '’ found' + else + echomsg 'An error occured running ‘man’' + endif +endfunction + +xnoremap q !clang-format -style=file +nnoremap K :call ManpageAtPoint() diff --git a/.config/nvim/after/ftplugin/ebnf.lua b/.config/nvim/after/ftplugin/ebnf.lua deleted file mode 100644 index 264b539..0000000 --- a/.config/nvim/after/ftplugin/ebnf.lua +++ /dev/null @@ -1 +0,0 @@ -vim.bo.commentstring = '(* %s *)' diff --git a/.config/nvim/after/ftplugin/ebnf.vim b/.config/nvim/after/ftplugin/ebnf.vim new file mode 100644 index 0000000..ac1a448 --- /dev/null +++ b/.config/nvim/after/ftplugin/ebnf.vim @@ -0,0 +1 @@ +setlocal commentstring=(*\ %s\ *) diff --git a/.config/nvim/after/ftplugin/gitcommit.lua b/.config/nvim/after/ftplugin/gitcommit.lua deleted file mode 100644 index 21934e4..0000000 --- a/.config/nvim/after/ftplugin/gitcommit.lua +++ /dev/null @@ -1 +0,0 @@ -vim.bo.expandtab = true diff --git a/.config/nvim/after/ftplugin/gitcommit.vim b/.config/nvim/after/ftplugin/gitcommit.vim new file mode 100644 index 0000000..5245bdc --- /dev/null +++ b/.config/nvim/after/ftplugin/gitcommit.vim @@ -0,0 +1 @@ +setlocal expandtab diff --git a/.config/nvim/after/ftplugin/json.lua b/.config/nvim/after/ftplugin/json.lua deleted file mode 100644 index 1e6245d..0000000 --- a/.config/nvim/after/ftplugin/json.lua +++ /dev/null @@ -1 +0,0 @@ -vim.bo.formatprg = 'jq --tab' diff --git a/.config/nvim/after/ftplugin/json.vim b/.config/nvim/after/ftplugin/json.vim new file mode 100644 index 0000000..09100bf --- /dev/null +++ b/.config/nvim/after/ftplugin/json.vim @@ -0,0 +1 @@ +setlocal formatprg=jq\ --tab diff --git a/.config/nvim/after/ftplugin/mail.lua b/.config/nvim/after/ftplugin/mail.lua deleted file mode 100644 index 72f99e9..0000000 --- a/.config/nvim/after/ftplugin/mail.lua +++ /dev/null @@ -1,2 +0,0 @@ -vim.bo.expandtab = true -vim.bo.textwidth = 73 diff --git a/.config/nvim/after/ftplugin/mail.vim b/.config/nvim/after/ftplugin/mail.vim new file mode 100644 index 0000000..5969086 --- /dev/null +++ b/.config/nvim/after/ftplugin/mail.vim @@ -0,0 +1 @@ +setlocal expandtab textwidth=73 diff --git a/.config/nvim/after/ftplugin/markdown.lua b/.config/nvim/after/ftplugin/markdown.lua deleted file mode 100644 index 72f99e9..0000000 --- a/.config/nvim/after/ftplugin/markdown.lua +++ /dev/null @@ -1,2 +0,0 @@ -vim.bo.expandtab = true -vim.bo.textwidth = 73 diff --git a/.config/nvim/after/ftplugin/markdown.vim b/.config/nvim/after/ftplugin/markdown.vim new file mode 100644 index 0000000..5969086 --- /dev/null +++ b/.config/nvim/after/ftplugin/markdown.vim @@ -0,0 +1 @@ +setlocal expandtab textwidth=73 diff --git a/.config/nvim/after/ftplugin/nroff.lua b/.config/nvim/after/ftplugin/nroff.lua deleted file mode 100644 index 1532c29..0000000 --- a/.config/nvim/after/ftplugin/nroff.lua +++ /dev/null @@ -1 +0,0 @@ -vim.bo.textwidth = 73 diff --git a/.config/nvim/after/ftplugin/nroff.vim b/.config/nvim/after/ftplugin/nroff.vim new file mode 100644 index 0000000..63c4b9b --- /dev/null +++ b/.config/nvim/after/ftplugin/nroff.vim @@ -0,0 +1 @@ +setlocal textwidth=73 diff --git a/.config/nvim/after/ftplugin/oryx.lua b/.config/nvim/after/ftplugin/oryx.lua deleted file mode 100644 index 984111a..0000000 --- a/.config/nvim/after/ftplugin/oryx.lua +++ /dev/null @@ -1 +0,0 @@ -vim.bo.commentstring = '/* %s */' diff --git a/.config/nvim/after/ftplugin/oryx.vim b/.config/nvim/after/ftplugin/oryx.vim new file mode 100644 index 0000000..f059cc8 --- /dev/null +++ b/.config/nvim/after/ftplugin/oryx.vim @@ -0,0 +1 @@ +setlocal commentstring=/*\ %s\ */ diff --git a/.config/nvim/after/ftplugin/python.lua b/.config/nvim/after/ftplugin/python.lua deleted file mode 100644 index c37615b..0000000 --- a/.config/nvim/after/ftplugin/python.lua +++ /dev/null @@ -1 +0,0 @@ -vim.bo.expandtab = false diff --git a/.config/nvim/after/ftplugin/python.vim b/.config/nvim/after/ftplugin/python.vim new file mode 100644 index 0000000..bbd8967 --- /dev/null +++ b/.config/nvim/after/ftplugin/python.vim @@ -0,0 +1 @@ +setlocal noexpandtab diff --git a/.config/nvim/after/ftplugin/query.lua b/.config/nvim/after/ftplugin/query.lua deleted file mode 100644 index 21934e4..0000000 --- a/.config/nvim/after/ftplugin/query.lua +++ /dev/null @@ -1 +0,0 @@ -vim.bo.expandtab = true diff --git a/.config/nvim/after/ftplugin/query.vim b/.config/nvim/after/ftplugin/query.vim new file mode 100644 index 0000000..8c3b996 --- /dev/null +++ b/.config/nvim/after/ftplugin/query.vim @@ -0,0 +1 @@ +setlocal autoindent expandtab lisp diff --git a/.config/nvim/after/ftplugin/yuck.lua b/.config/nvim/after/ftplugin/yuck.lua deleted file mode 100644 index ee8cd37..0000000 --- a/.config/nvim/after/ftplugin/yuck.lua +++ /dev/null @@ -1 +0,0 @@ -vim.bo.commentstring = '; %s' diff --git a/.config/nvim/after/ftplugin/yuck.vim b/.config/nvim/after/ftplugin/yuck.vim new file mode 100644 index 0000000..a13b726 --- /dev/null +++ b/.config/nvim/after/ftplugin/yuck.vim @@ -0,0 +1 @@ +setlocal commentstring=;\ %s -- cgit v1.2.3