From a549c57b472a54098b80c1c484e7ee4074842333 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Thu, 20 Apr 2023 11:37:13 +0100
Subject: [PATCH] Add neogit and config

Fix various UI issues for better consistency
Enable winblend properly for blur in neovide
---
 config/nvim/lua/config/catppuccin.lua |  3 ++-
 config/nvim/lua/config/dashboard.lua  | 17 +++++------------
 config/nvim/lua/config/init.lua       | 10 +++-------
 config/nvim/lua/config/lazy.lua       | 19 +++++++++++++++++--
 config/nvim/lua/config/neogit.lua     |  6 ++++++
 config/nvim/lua/config/neovide.lua    |  3 ++-
 config/nvim/lua/config/notify.lua     |  4 +++-
 config/nvim/lua/config/telescope.lua  |  1 +
 config/nvim/lua/plugins/barbecue.lua  |  3 ++-
 config/nvim/lua/plugins/neogit.lua    |  9 +++++++++
 config/nvim/lua/plugins/project.lua   |  1 +
 11 files changed, 51 insertions(+), 25 deletions(-)
 create mode 100644 config/nvim/lua/config/neogit.lua
 create mode 100644 config/nvim/lua/plugins/neogit.lua

diff --git a/config/nvim/lua/config/catppuccin.lua b/config/nvim/lua/config/catppuccin.lua
index a7ac271e..2e19a369 100644
--- a/config/nvim/lua/config/catppuccin.lua
+++ b/config/nvim/lua/config/catppuccin.lua
@@ -1,7 +1,7 @@
 return {
     flavour = "macchiato",
     term_colors = true,
-    -- transparent_background = true,
+    transparent_background = false,
     integrations = {
         barbecue = {
             dim_dirname = true,
@@ -17,6 +17,7 @@ return {
         native_lsp = {
             enabled = true,
         },
+        neogit = true,
         notify = true,
         nvimtree = true,
         navic = {
diff --git a/config/nvim/lua/config/dashboard.lua b/config/nvim/lua/config/dashboard.lua
index 88f68bf7..571dfd16 100644
--- a/config/nvim/lua/config/dashboard.lua
+++ b/config/nvim/lua/config/dashboard.lua
@@ -5,9 +5,9 @@ return {
             enable = true,
         },
         shortcut = {
-            { icon = " ", desc = "Lazy", group = "@property", action = "Lazy", key = "l" },
+            { icon = " ", desc = "Lazy", group = "@property", action = "Lazy", key = "l" },
             {
-                icon = " ",
+                icon = " ",
                 icon_hl = "@variable",
                 desc = "Files",
                 group = "Label",
@@ -22,20 +22,13 @@ return {
                 key = "n",
             },
             {
-                icon = " ",
+                icon = " ",
                 icon_hl = "@variable",
-                desc = "Git DiffView",
+                desc = "Neogit",
                 group = "Label",
-                action = "DiffviewOpen",
+                action = "Neogit",
                 key = "g",
             },
-            {
-                icon = " ",
-                desc = "Mason",
-                group = "@property",
-                action = "Mason",
-                key = "m",
-            },
         },
     },
 }
diff --git a/config/nvim/lua/config/init.lua b/config/nvim/lua/config/init.lua
index 81ed7f21..37c9b753 100644
--- a/config/nvim/lua/config/init.lua
+++ b/config/nvim/lua/config/init.lua
@@ -24,7 +24,9 @@ vim.keymap.set("n", "<leader>l", "<cmd>Lazy<CR>")
 vim.keymap.set("n", "<leader>m", "<cmd>Mason<CR>")
 vim.keymap.set("n", "<leader>s", "<cmd>Dashboard<CR>")
 vim.keymap.set("n", "<leader>z", "<cmd>ZenMode<CR>")
-vim.keymap.set("n", "<leader>g", "<cmd>Git<CR>")
+vim.keymap.set("n", "<leader>gg", "<cmd>Neogit<CR>")
+vim.keymap.set("n", "<leader>/", "<cmd>ToggleTerm<CR>")
+vim.keymap.set("n", "<leader>tt", "<cmd>ToggleTerm direction=float<CR>")
 vim.keymap.set({ "n", "t" }, "<A-h>", "<CMD>NavigatorLeft<CR>")
 vim.keymap.set({ "n", "t" }, "<A-l>", "<CMD>NavigatorRight<CR>")
 vim.keymap.set({ "n", "t" }, "<A-k>", "<CMD>NavigatorUp<CR>")
@@ -49,12 +51,6 @@ vim.keymap.set("n", "<leader>\\", "<cmd>Neotree reveal<cr>")
 -- Aerial
 vim.keymap.set("n", "<leader>a", "<cmd>AerialToggle!<CR>")
 
--- diffview
-vim.keymap.set("n", "<leader>do", "<cmd>DiffviewOpen<cr>")
-vim.keymap.set("n", "<leader>dc", "<cmd>DiffviewClose<cr>")
-vim.keymap.set("n", "<leader>dh", "<cmd>DiffviewFileHistory<cr>")
-vim.keymap.set("n", "<leader>df", "<cmd>DiffviewFileHistory %<cr>")
-
 -- Trouble
 vim.keymap.set("n", "<leader>xx", "<cmd>TroubleToggle<cr>")
 vim.keymap.set("n", "<leader>xw", "<cmd>TroubleToggle workspace_diagnostics<cr>")
diff --git a/config/nvim/lua/config/lazy.lua b/config/nvim/lua/config/lazy.lua
index fd540b03..1ddf64b0 100644
--- a/config/nvim/lua/config/lazy.lua
+++ b/config/nvim/lua/config/lazy.lua
@@ -9,12 +9,27 @@ return {
         },
     },
     ui = {
+        border = "rounded",
         icons = {
-            lazy = "💤 ",
+            cmd = "⌘",
+            config = "",
+            event = "",
+            ft = "",
+            init = "",
+            keys = "",
+            plugin = "",
+            runtime = "",
+            source = "",
+            start = "",
+            task = "",
+            lazy = " ",
         },
     },
+    diff = {
+        cmd = "diffview.nvim",
+    },
     checker = {
         enabled = true,
-        frequency = 86400,
+        frequency = 3600,
     },
 }
diff --git a/config/nvim/lua/config/neogit.lua b/config/nvim/lua/config/neogit.lua
new file mode 100644
index 00000000..18043abf
--- /dev/null
+++ b/config/nvim/lua/config/neogit.lua
@@ -0,0 +1,6 @@
+return {
+    kind = "floating",
+    integrations = {
+        diffview = true,
+    },
+}
diff --git a/config/nvim/lua/config/neovide.lua b/config/nvim/lua/config/neovide.lua
index 04ce6439..5a4ff391 100644
--- a/config/nvim/lua/config/neovide.lua
+++ b/config/nvim/lua/config/neovide.lua
@@ -1,4 +1,5 @@
-vim.opt.guifont = "FiraCode Nerd Font:h14"
+vim.opt.winblend = 50
+vim.opt.pumblend = 50
 
 vim.g.neovide_padding_top = 5
 vim.g.neovide_padding_bottom = 5
diff --git a/config/nvim/lua/config/notify.lua b/config/nvim/lua/config/notify.lua
index e847a85e..3d880fbf 100644
--- a/config/nvim/lua/config/notify.lua
+++ b/config/nvim/lua/config/notify.lua
@@ -1,3 +1,5 @@
 return {
-    background_colour = "#000000",
+    -- background_colour = "NONE",
+    fps = 60,
+    render = "default", -- "minimal", "simple"
 }
diff --git a/config/nvim/lua/config/telescope.lua b/config/nvim/lua/config/telescope.lua
index 7e6413ac..1e4baf12 100644
--- a/config/nvim/lua/config/telescope.lua
+++ b/config/nvim/lua/config/telescope.lua
@@ -6,6 +6,7 @@ return {
             i = { ["<c-t>"] = trouble.open_with_trouble },
             n = { ["<c-t>"] = trouble.open_with_trouble },
         },
+        winblend = vim.o.winblend,
     },
     extensions = {
         fzf = {
diff --git a/config/nvim/lua/plugins/barbecue.lua b/config/nvim/lua/plugins/barbecue.lua
index 7ac1eec1..995b0880 100644
--- a/config/nvim/lua/plugins/barbecue.lua
+++ b/config/nvim/lua/plugins/barbecue.lua
@@ -7,5 +7,6 @@ return {
         "nvim-tree/nvim-web-devicons",
     },
     event = { "BufReadPre", "BufNewFile" },
-    opts = require "config.barbecue",
+    -- opts = require "config.barbecue",
+    config = function() require("barbecue").setup(require "config.barbecue") end,
 }
diff --git a/config/nvim/lua/plugins/neogit.lua b/config/nvim/lua/plugins/neogit.lua
new file mode 100644
index 00000000..f3cc6b1a
--- /dev/null
+++ b/config/nvim/lua/plugins/neogit.lua
@@ -0,0 +1,9 @@
+return {
+    "TimUntersberger/neogit",
+    config = function() require("neogit").setup(require "config.neogit") end,
+    cmd = "Neogit",
+    dependencies = {
+        "nvim-lua/plenary.nvim",
+        "sindrets/diffview.nvim",
+    },
+}
diff --git a/config/nvim/lua/plugins/project.lua b/config/nvim/lua/plugins/project.lua
index e92bd042..e97cf62e 100644
--- a/config/nvim/lua/plugins/project.lua
+++ b/config/nvim/lua/plugins/project.lua
@@ -1,4 +1,5 @@
 return {
     "ahmedkhalf/project.nvim",
+    event = { "BufReadPre", "BufNewFile" },
     config = function() require("project_nvim").setup(require "config.project") end,
 }