From 650dcd7b40693d83f78f81bc8de4c8e0963bf820 Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Fri, 29 Dec 2023 22:45:27 +0100
Subject: [PATCH] nvim: neogit config improvements

---
 home/config/nvim/plugins/heirline.fnl | 15 +++++++++++----
 home/config/nvim/plugins/neogit.fnl   | 16 ++++++++++++++--
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/home/config/nvim/plugins/heirline.fnl b/home/config/nvim/plugins/heirline.fnl
index d5a4fc7..45b2881 100644
--- a/home/config/nvim/plugins/heirline.fnl
+++ b/home/config/nvim/plugins/heirline.fnl
@@ -24,10 +24,17 @@
          {:condition (fn []
                        (conditions.buffer_matches {:filetype [:TelescopePrompt]}))
           1 (ns.custom-mode :Telescope :black :green)})
-  (local neogit-statusline
-         {:condition (fn []
-                       (conditions.buffer_matches {:filetype [:NeogitStatus]}))
-          1 (ns.custom-mode :Neogit :black :purple)})
+  (local neogit-statusline {:condition (fn []
+                                         (conditions.buffer_matches {:filetype [:NeogitBranchDescription
+                                                                                :NeogitCommitMessage
+                                                                                :NeogitCommitView
+                                                                                :NeogitLogView
+                                                                                :NeogitMergeMessage
+                                                                                :NeogitPopup
+                                                                                :NeogitStatus
+                                                                                :NeogitTagMessage]}))
+                            1 (ns.custom-mode :Neogit :black :purple)
+                            2 ns.git})
   (local shell-statusline
          {:condition #(not= vim.b.nifoc_shell_mode nil)
           1 ns.vi-mode
diff --git a/home/config/nvim/plugins/neogit.fnl b/home/config/nvim/plugins/neogit.fnl
index b360f7b..246deac 100644
--- a/home/config/nvim/plugins/neogit.fnl
+++ b/home/config/nvim/plugins/neogit.fnl
@@ -1,2 +1,14 @@
-(let [neogit (require :neogit)]
-  (neogit.setup {}))
+(let [neogit (require :neogit)
+      augroup (vim.api.nvim_create_augroup :NifocNeogit {:clear true})
+      aucmd vim.api.nvim_create_autocmd]
+  (neogit.setup {})
+  (aucmd :FileType {:pattern [:NeogitBranchDescription
+                              :NeogitCommitMessage
+                              :NeogitCommitView
+                              :NeogitLogView
+                              :NeogitMergeMessage
+                              :NeogitPopup
+                              :NeogitStatus
+                              :NeogitTagMessage]
+                    :callback #(set vim.b.toggle_line_style 0)
+                    :group augroup}))