From 5a71c25c5701104d59227a8b5aab4e102b843b66 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Wed, 24 May 2023 11:38:52 -0400
Subject: [PATCH] Merge tig with git module

This makes sense since I wouldn't use git without tig.
---
 terminal/default.nix     |  1 -
 terminal/git/default.nix | 34 ++++++++++++++++++++++++----------
 terminal/tig/default.nix | 13 -------------
 3 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 terminal/tig/default.nix

diff --git a/terminal/default.nix b/terminal/default.nix
index 7ff3df36..a404b54a 100644
--- a/terminal/default.nix
+++ b/terminal/default.nix
@@ -11,7 +11,6 @@
     ./neovim
     ./ranger
     ./starship
-    ./tig
   ];
 
   environment.systemPackages = with pkgs; [
diff --git a/terminal/git/default.nix b/terminal/git/default.nix
index c010676a..1bae4f30 100644
--- a/terminal/git/default.nix
+++ b/terminal/git/default.nix
@@ -1,37 +1,50 @@
 { pkgs, ... }:
 
 {
-  environment.systemPackages = [ pkgs.git ];
+
+  environment.systemPackages = with pkgs; [ tig git ];
 
   home-manager.sharedModules = [{
+    xdg.configFile."tig/config".text = ''
+      color cursor black green bold
+      color title-focus black blue bold
+      color title-blur black blue bold
+    '';
+
     programs.git = {
       enable = true;
+
       extraConfig = {
-        include = { path = "~/.gituser"; };
-        commit = { gpgsign = true; };
+        include.path = "~/.gituser";
+        commit.gpgsign = true;
+
         core = {
           editor = "nvim";
           autocrlf = false;
           quotePath = false;
         };
-        web = { browser = "librewolf"; };
-        push = { default = "simple"; };
-        branch = { autosetuprebase = "always"; };
-        init = { defaultBranch = "master"; };
-        rerere = { enabled = true; };
-        color = { ui = true; };
+
+        web.browser = "librewolf";
+        push.default = "simple";
+        branch.autosetuprebase = "always";
+        init.defaultBranch = "master";
+        rerere.enabled = true;
+        color.ui = true;
+
         alias = {
           contrib = "shortlog -n -s";
           remotes = "remote -v";
           praise = "blame";
           verify = "log --show-signature";
         };
+
         "color \"diff-highlight\"" = {
           oldNormal = "red bold";
           oldHighlight = "red bold";
           newNormal = "green bold";
           newHighlight = "green bold";
         };
+
         "color \"diff\"" = {
           meta = "yellow";
           frag = "magenta bold";
@@ -41,7 +54,8 @@
           whitespace = "red reverse";
         };
       };
-      diff-so-fancy = { enable = true; };
+
+      diff-so-fancy.enable = true;
     };
   }];
 }
diff --git a/terminal/tig/default.nix b/terminal/tig/default.nix
deleted file mode 100644
index a3f23ea3..00000000
--- a/terminal/tig/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.systemPackages = [ pkgs.tig ];
-
-  home-manager.sharedModules = [{
-    xdg.configFile."tig/config".text = ''
-      color cursor black green bold
-      color title-focus black blue bold
-      color title-blur black blue bold
-    '';
-  }];
-}