From 84f729f3c73803ca67c60fce73d455f9868d8be3 Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Sat, 30 Mar 2024 15:49:56 +0530 Subject: [PATCH] nvim: after/ftplugin/C: Do not run gst-indent after buffer save This seems to interfere with git signs tracking among other things. While at it move the remaining configuration to Lua. --- nvim/.config/nvim/after/ftplugin/c.lua | 5 +++++ nvim/.config/nvim/after/ftplugin/c.vim | 12 ------------ nvim/.config/nvim/autoload/c.vim | 5 ----- 3 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 nvim/.config/nvim/after/ftplugin/c.vim delete mode 100644 nvim/.config/nvim/autoload/c.vim diff --git a/nvim/.config/nvim/after/ftplugin/c.lua b/nvim/.config/nvim/after/ftplugin/c.lua index 6ece482..22b3704 100644 --- a/nvim/.config/nvim/after/ftplugin/c.lua +++ b/nvim/.config/nvim/after/ftplugin/c.lua @@ -2,3 +2,8 @@ local lsp_utils = require('lsp-utils') local clangd_config = lsp_utils.clangd_config() vim.lsp.start(clangd_config) + +vim.bo.makeprg = 'meson compile -C build' + +vim.keymap.set('n', 'gh', ":ClangdSwitchSourceHeader", { noremap=true, buffer=0 }) +vim.keymap.set('n', 'gq', ":!gst-indent %" , { noremap=true, buffer=0 }) diff --git a/nvim/.config/nvim/after/ftplugin/c.vim b/nvim/.config/nvim/after/ftplugin/c.vim deleted file mode 100644 index e93181d..0000000 --- a/nvim/.config/nvim/after/ftplugin/c.vim +++ /dev/null @@ -1,12 +0,0 @@ -setlocal makeprg=ninja\ -C\ build - -nmap gh :ClangdSwitchSourceHeader - -" If we are working with any of the gstreamer projects in C, run gst-ident -" before saving. Assume gst-ident from gstreamer/tools/gst-indent has been -" made available in path. -" -" The '!' after autocmd is required without which, the command gets triggered -" multiple times. Basically, we clear the autocmd. -autocmd! BufWritePost */gst-*/*.c call c#format_with_gst_indent() -autocmd! BufWritePost */gstreamer-*/*.c call c#format_with_gst_indent() diff --git a/nvim/.config/nvim/autoload/c.vim b/nvim/.config/nvim/autoload/c.vim deleted file mode 100644 index 389dbaf..0000000 --- a/nvim/.config/nvim/autoload/c.vim +++ /dev/null @@ -1,5 +0,0 @@ -function! c#format_with_gst_indent() abort - let file = expand('%:p') - silent execute "!gst-indent " . file - silent execute "e" . file -endfunction