neovim: added gitsigns, moved color stuff into colors.lua, modified telescope and fyler

homes/modules/programs/neovim/lua/plugins/git.lua

@@ -1,12 +1,12 @@
 return {
 	{
 		"vim-fugitive",
-		enabled = nixCats("git") or false,
+		enabled = nixCats("git.merge") or false,
 		cmd = { "Git", "Gvdiffsplit" },
 	},
 	{
 		"resolve-nvim",
-		enabled = nixCats("git") or false,
+		enabled = nixCats("git.merge") or false,
 		event = { "BufReadPre", "BufNewFile" },
 		after = function(plugin)
 			require("resolve").setup({
@@ -21,4 +21,45 @@ return {
 			})
 		end,
 	},
+	{
+		"gitsigns.nvim",
+		enabled = nixCats("git.gitsigns") or false,
+		after = function(plugin)
+			require("gitsigns").setup({
+				signs = {
+					add = { text = "┃" },
+					change = { text = "┇" },
+					delete = { text = "_" },
+					topdelete = { text = "‾" },
+					changedelete = { text = "~" },
+					untracked = { text = "╎" },
+				},
+				signs_staged = {
+					add = { text = "┃" },
+					change = { text = "┇" },
+					delete = { text = "_" },
+					topdelete = { text = "‾" },
+					changedelete = { text = "~" },
+					untracked = { text = "╎" },
+				},
+				on_attach = function(bufnr)
+					local gitsigns = require("gitsigns")
+
+					-- toggle git blame
+					vim.keymap.set("n", "<leader>gb", function()
+						local wins = vim.api.nvim_list_wins()
+						for _, win in ipairs(wins) do
+							local buf = vim.api.nvim_win_get_buf(win)
+							local ft = vim.api.nvim_get_option_value("filetype", { buf = buf })
+							if ft == "gitsigns-blame" then
+								vim.api.nvim_win_close(win, true)
+								return
+							end
+						end
+						vim.cmd("Gitsigns blame")
+					end)
+				end,
+			})
+		end,
+	},
 }