From 12fb4f08c2101610e9f12179de21d357f210a6ce Mon Sep 17 00:00:00 2001
From: Pierre Martin <pierre@front-commerce.com>
Date: Sat, 3 Sep 2022 07:34:57 +0200
Subject: [PATCH] refactor(home): extract git config to its own file

---
 home.nix         | 45 +--------------------------------------------
 programs/git.nix | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 44 deletions(-)
 create mode 100644 programs/git.nix

diff --git a/home.nix b/home.nix
index fa61295..132a6a0 100644
--- a/home.nix
+++ b/home.nix
@@ -9,6 +9,7 @@
     [
       ./packages.nix
 
+      ./programs/git.nix
       ./programs/i3.nix
       ./programs/zsh.nix
     ];
@@ -28,50 +29,6 @@
     terminal = "sakura";
   };
 
-  programs.git = {
-    enable = true;
-    package = pkgs.gitAndTools.gitFull;
-
-    userEmail = "pierre@front-commerce.com";
-    userName = "Pierre Martin";
-
-    aliases = {
-      co = "checkout";
-      mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -";
-    };
-
-    ignores = [
-      ".DS_Store"
-      ".svn"
-      "*~"
-      "*.swp"
-      "*.rbc"
-      ".watsonrc"
-      ".idea"
-      ".vscode"
-    ];
-
-    extraConfig = {
-      # see https://github.com/dandavison/delta#get-started
-      core.pager = "delta";
-      interactive.diffFilter = "delta --color-only";
-      delta.navigate = true;
-      merge.conflictstyle = "diff3";
-      diff.colorMoved = "default";
-
-      merge.tool = "meld";
-      diff.algorithm = "patience";
-      pull.ff = "only";
-      credential.helper = "store";
-      init.defaultBranch = "main";
-
-      # see https://betterprogramming.pub/8-advanced-git-commands-university-wont-teach-you-fe63b483d34b
-      help.autocorrect = 1;
-      fetch.prune = true;
-      push.autoSetupRemote = true;
-    };
-  };
-
   programs.htop = {
     enable = true;
   };
diff --git a/programs/git.nix b/programs/git.nix
new file mode 100644
index 0000000..9a00072
--- /dev/null
+++ b/programs/git.nix
@@ -0,0 +1,47 @@
+{ pkgs, ... }:
+
+{
+  programs.git = {
+    enable = true;
+    package = pkgs.gitAndTools.gitFull;
+
+    userEmail = "pierre@front-commerce.com";
+    userName = "Pierre Martin";
+
+    aliases = {
+      co = "checkout";
+      mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -";
+    };
+
+    ignores = [
+      ".DS_Store"
+      ".svn"
+      "*~"
+      "*.swp"
+      "*.rbc"
+      ".watsonrc"
+      ".idea"
+      ".vscode"
+    ];
+
+    extraConfig = {
+      # see https://github.com/dandavison/delta#get-started
+      core.pager = "delta";
+      interactive.diffFilter = "delta --color-only";
+      delta.navigate = true;
+      merge.conflictstyle = "diff3";
+      diff.colorMoved = "default";
+
+      merge.tool = "meld";
+      diff.algorithm = "patience";
+      pull.ff = "only";
+      credential.helper = "store";
+      init.defaultBranch = "main";
+
+      # see https://betterprogramming.pub/8-advanced-git-commands-university-wont-teach-you-fe63b483d34b
+      help.autocorrect = 1;
+      fetch.prune = true;
+      push.autoSetupRemote = true;
+    };
+  };
+}