From 6e6154210cd836a32c94abebe084fa8f921a4b07 Mon Sep 17 00:00:00 2001
From: Sam Willcocks <sam@wlcx.cc>
Date: Mon, 10 Jan 2022 19:30:22 +0000
Subject: [PATCH] Split git config, add mac-specific file

---
 home/default.nix  | 39 ---------------------------------------
 home/git.nix      | 40 ++++++++++++++++++++++++++++++++++++++++
 home/macs.nix     |  7 +++++++
 home/profiles.nix |  2 +-
 4 files changed, 48 insertions(+), 40 deletions(-)
 create mode 100644 home/git.nix
 create mode 100644 home/macs.nix

diff --git a/home/default.nix b/home/default.nix
index a5075b8..9af68b1 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -56,44 +56,5 @@ in {
 
     fzf.enable = true;
 
-    # Tools
-    git = {
-      enable = true;
-      userName = "Sam Willcocks";
-      userEmail = "sam@wlcx.cc";
-
-      delta = { # Better diffs
-        enable = true;
-        options = { line-numbers = true; };
-      };
-
-      aliases = {
-        a = "add";
-        ap = "add -p";
-        c = "commit";
-        can = "commit --amend --no-edit";
-        cm = "commit -m";
-        co = "checkout";
-        d = "diff";
-        dc = "diff --cached";
-        l = "log";
-        lp = "log --patch";
-        r = "rebase";
-        rc = "rebase --continue";
-        ra = "rebase --autostash";
-        rai = "rebase --autostash --interactive";
-        st = "status";
-
-        gone = ''
-          ! "git fetch -p && git for-each-ref --format '%(refname:short) %(upstream:track)' | a
-                 │ wk '$2 == \"[gone]\" {print $1}' | xargs -r git branch -D"'';
-      };
-      extraConfig = {
-        branch.sort = "-committerdate";
-        log.showSignature = true;
-        push.default = "current";
-        include.path = "~/.gitconfig.local";
-      };
-    };
   };
 }
diff --git a/home/git.nix b/home/git.nix
new file mode 100644
index 0000000..52a83ed
--- /dev/null
+++ b/home/git.nix
@@ -0,0 +1,40 @@
+{ ... }: {
+  programs.git = {
+    enable = true;
+    userName = "Sam Willcocks";
+    userEmail = "sam@wlcx.cc";
+
+    delta = { # Better diffs
+      enable = true;
+      options = { line-numbers = true; };
+    };
+
+    aliases = {
+      a = "add";
+      ap = "add -p";
+      c = "commit";
+      can = "commit --amend --no-edit";
+      cm = "commit -m";
+      co = "checkout";
+      d = "diff";
+      dc = "diff --cached";
+      l = "log";
+      lp = "log --patch";
+      r = "rebase";
+      rc = "rebase --continue";
+      ra = "rebase --autostash";
+      rai = "rebase --autostash --interactive";
+      st = "status";
+
+      gone = ''
+        ! "git fetch -p && git for-each-ref --format '%(refname:short) %(upstream:track)' | a
+               │ wk '$2 == \"[gone]\" {print $1}' | xargs -r git branch -D"'';
+    };
+    extraConfig = {
+      branch.sort = "-committerdate";
+      log.showSignature = true;
+      push.default = "current";
+      include.path = "~/.gitconfig.local";
+    };
+  };
+}
diff --git a/home/macs.nix b/home/macs.nix
new file mode 100644
index 0000000..e6bd4e2
--- /dev/null
+++ b/home/macs.nix
@@ -0,0 +1,7 @@
+{ ... }: {
+  home.sessionVariables = {
+    # Use secretive for SSH agent
+    "SSH_AUTH_SOCK" =
+      "/Users/$USERNAME/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
+  };
+}
diff --git a/home/profiles.nix b/home/profiles.nix
index ec004d5..97ff5db 100644
--- a/home/profiles.nix
+++ b/home/profiles.nix
@@ -1 +1 @@
-{ dev = { ... }: { imports = [ ./default.nix ]; }; }
+{ dev = { ... }: { imports = [ ./default.nix ./git.nix ./macs.nix ]; }; }