From 2cc874f89110abf53c83ce1da3ad63b3dfdfa508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Gremaud?= Date: Thu, 15 Aug 2024 16:41:07 +0200 Subject: [PATCH] Fix tabufline, auto ft=diff on diffview, add diff highlight syntax + lua tabstop=2 --- after/ftplugin/lua.vim | 2 ++ after/syntax/diff.vim | 11 +++++++++++ lua/configs/diffview.lua | 12 +++++++++++- lua/mappings.lua | 4 ++-- 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 after/ftplugin/lua.vim create mode 100644 after/syntax/diff.vim diff --git a/after/ftplugin/lua.vim b/after/ftplugin/lua.vim new file mode 100644 index 0000000..884dc4c --- /dev/null +++ b/after/ftplugin/lua.vim @@ -0,0 +1,2 @@ +setlocal tabstop=2 +setlocal shiftwidth=2 diff --git a/after/syntax/diff.vim b/after/syntax/diff.vim new file mode 100644 index 0000000..57cffaf --- /dev/null +++ b/after/syntax/diff.vim @@ -0,0 +1,11 @@ +" hi DiffAdd gui=none guifg=NONE guibg=#bada9f +" hi DiffChange gui=none guifg=NONE guibg=#e5d5ac +" hi DiffDelete gui=bold guifg=#ff8080 guibg=#ffb0b0 +" hi DiffText gui=none guifg=NONE guibg=#8cbee2 +hi DiffAdd gui=none guifg=NONE guibg=#003200 +hi DiffChange gui=none guifg=NONE guibg=#000032 +hi DiffDelete gui=bold guifg=#ff8080 guibg=#602020 +hi DiffText gui=bold guifg=NONE guibg=#102040 +hi link @text.diff.add DiffAdd +hi link @text.diff.delete DiffDelete +hi link @text.diff.change DiffChange diff --git a/lua/configs/diffview.lua b/lua/configs/diffview.lua index a564707..78e5eee 100644 --- a/lua/configs/diffview.lua +++ b/lua/configs/diffview.lua @@ -1 +1,11 @@ -return {} +return { + hooks = { + diff_buf_read = function(_) + vim.opt_local.wrap = false + vim.opt_local.list = false + end, + view_opened = function(_) + vim.api.nvim_command "set ft=diff" + end, + }, +} diff --git a/lua/mappings.lua b/lua/mappings.lua index 13c2c17..dcfb96d 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -206,11 +206,11 @@ map( -- Tabufline -- cycle through buffers map("n", "", function() - require("nvchad.tabufline").tabuflineNext() + require("nvchad.tabufline").next() end, { desc = "Goto next buffer" }) map("n", "", function() - require("nvchad.tabufline").tabuflinePrev() + require("nvchad.tabufline").prev() end, { desc = "Goto prev buffer" }) -- close buffer + hide terminal buffer