From 34355b6c1a678c63f44150e30aff5cb5b283cdf6 Mon Sep 17 00:00:00 2001
From: John Bowdre <john@bowdre.net>
Date: Fri, 28 Jul 2023 21:09:22 -0500
Subject: [PATCH] modularize git

---
 nix/home/features/cli/default.nix |  1 +
 nix/home/features/cli/git.nix     | 16 ++++++++++++++++
 nix/home/global/default.nix       | 16 ----------------
 3 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 nix/home/features/cli/git.nix

diff --git a/nix/home/features/cli/default.nix b/nix/home/features/cli/default.nix
index db15d2b..ce907b3 100644
--- a/nix/home/features/cli/default.nix
+++ b/nix/home/features/cli/default.nix
@@ -3,6 +3,7 @@
 
   imports = [
     ./direnv.nix
+    ./git.nix
     ./fish.nix
     ./tmux.nix
     ./vim.nix
diff --git a/nix/home/features/cli/git.nix b/nix/home/features/cli/git.nix
new file mode 100644
index 0000000..1e51aa1
--- /dev/null
+++ b/nix/home/features/cli/git.nix
@@ -0,0 +1,16 @@
+{ lib, ... }: {
+  programs.git = {
+    enable = lib.mkDefault true;
+    delta.enable = true;
+    aliases = {
+      graph = "log --decorate --oneline --graph";
+      fast-forward = "merge --ff-only";
+    };
+    userEmail = lib.mkDefault "john@bowdre.net";
+    userName = lib.mkDefault "John Bowdre";
+    extraConfig = {
+      init.defaultBranch = "main";
+      pull.rebase = false;
+    };
+  };
+}
\ No newline at end of file
diff --git a/nix/home/global/default.nix b/nix/home/global/default.nix
index 28a50ab..3afe47a 100644
--- a/nix/home/global/default.nix
+++ b/nix/home/global/default.nix
@@ -32,22 +32,6 @@
   programs = {
     home-manager.enable = true;
 
-    direnv = {
-      enable = lib.mkDefault true;
-      nix-direnv.enable = true;
-    };
-
-    git = {
-      enable = lib.mkDefault true;
-      delta.enable = true;
-      userEmail = lib.mkDefault "john@bowdre.net";
-      userName = lib.mkDefault "John Bowdre";
-      extraConfig = {
-        init.defaultBranch = "main";
-        pull.rebase = false;
-      };
-    };
-
   };
 
   targets.genericLinux.enable = true;