diff --git a/home/config/nvim/nifoc/keymap.fnl b/home/config/nvim/nifoc/keymap.fnl index b1907ea..46e4c8a 100644 --- a/home/config/nvim/nifoc/keymap.fnl +++ b/home/config/nvim/nifoc/keymap.fnl @@ -42,6 +42,7 @@ {:desc "List VCS Branches"}) (keymap.set :n :vl #(gitsigns.blame_line {:full true}) {:desc "Blame Line"}) + (keymap.set :n :vd :DiffviewOpen {:desc "Open DiffView"}) (keymap.set :n :lk telescope-builtin.keymaps {:desc "Show Keymappings"}) (keymap.set :n :ld #(telescope-builtin.diagnostics telescope-ivy) diff --git a/home/config/nvim/nifoc/tabline.fnl b/home/config/nvim/nifoc/tabline.fnl index 80b32bd..bda951c 100644 --- a/home/config/nvim/nifoc/tabline.fnl +++ b/home/config/nvim/nifoc/tabline.fnl @@ -72,7 +72,7 @@ (vim.cmd.redrawtabline)) :minwid (fn [self] self.bufnr)}}}) - (set mod.close-tabpage {:provider "%999X  %X" :hl :TabLine}) + (set mod.close-tabpage {:provider "%999X 󰅖 %X" :hl :TabLine}) ;; Indicator (set mod.active-indicator {:provider (fn [self] diff --git a/home/config/nvim/plugins/diffview.fnl b/home/config/nvim/plugins/diffview.fnl new file mode 100644 index 0000000..1761641 --- /dev/null +++ b/home/config/nvim/plugins/diffview.fnl @@ -0,0 +1,5 @@ +(let [diffview (require :diffview)] + (diffview.setup {:hooks {:diff_buf_read (fn [_bufnr] + (set vim.opt_local.relativenumber + false) + (set vim.b.toggle_line_style 0))}})) diff --git a/home/config/nvim/plugins/neogit.fnl b/home/config/nvim/plugins/neogit.fnl index 246deac..8f41c4e 100644 --- a/home/config/nvim/plugins/neogit.fnl +++ b/home/config/nvim/plugins/neogit.fnl @@ -1,4 +1,5 @@ (let [neogit (require :neogit) + gitsigns (require :gitsigns) augroup (vim.api.nvim_create_augroup :NifocNeogit {:clear true}) aucmd vim.api.nvim_create_autocmd] (neogit.setup {}) @@ -11,4 +12,10 @@ :NeogitStatus :NeogitTagMessage] :callback #(set vim.b.toggle_line_style 0) - :group augroup})) + :group augroup}) + (aucmd :User {:pattern :NeogitCommitComplete + :callback #(gitsigns.refresh) + :group augroup}) + (aucmd :User {:pattern :NeogitPushComplete + :callback neogit.close + :group augroup})) diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index 2f4b97a..4cd6046 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -321,7 +321,11 @@ in type = "fennel"; } - diffview-nvim + { + plugin = diffview-nvim; + config = builtins.readFile ../../config/nvim/plugins/diffview.fnl; + type = "fennel"; + } { plugin = neogit;