From 3459a678506155a43e9ee4ba19fe41f2f076eb81 Mon Sep 17 00:00:00 2001
From: "flyingscorpio@clevo" <tfranken@protonmail.com>
Date: Tue, 22 Feb 2022 13:48:35 +0100
Subject: [PATCH] toansible: Add git installation

---
 configs.yml                      | 11 -----------
 roles/git/tasks/main.yml         |  6 ++++++
 roles/git/templates/gitconfig.j2 | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 roles/git/templates/gitconfig.j2

diff --git a/configs.yml b/configs.yml
index d9f95a3..22d43f9 100644
--- a/configs.yml
+++ b/configs.yml
@@ -29,17 +29,6 @@ git:
         - . ./secrets &&
           git config --global user.name "${USER}@$(uname -n)";
           git config --global user.email "$GIT_EMAIL";
-          git config --global pull.rebase false;
-          git config --global alias.br "branch";
-          git config --global alias.ci "commit";
-          git config --global alias.co "checkout";
-          git config --global alias.cp "cherry-pick";
-          git config --global alias.st "status";
-          git config --global alias.logadog "log --all --decorate --oneline --graph";
-          git config --global alias.chlog "log --no-merges --oneline --stat @{1}..";
-          git config --global alias.df "diff --word-diff=color";
-          git config --global diff.tool vimdiff;
-          git config --global init.defaultBranch "main"
 
 etckeeper:
     - install:
diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml
index dda6851..ee29e8b 100644
--- a/roles/git/tasks/main.yml
+++ b/roles/git/tasks/main.yml
@@ -18,3 +18,9 @@
   copy:
     src: ignore
     dest: ~/.config/git/ignore
+
+- name: Copy global gitconfig
+  template:
+    src: gitconfig.j2
+    dest: ~/.gitconfig
+    backup: true
diff --git a/roles/git/templates/gitconfig.j2 b/roles/git/templates/gitconfig.j2
new file mode 100644
index 0000000..40eb31e
--- /dev/null
+++ b/roles/git/templates/gitconfig.j2
@@ -0,0 +1,18 @@
+[user]
+	name = {{ ansible_facts['env']['USER'] }}@{{ ansible_hostname }}
+	email = {{ git_email }}
+[pull]
+	rebase = false
+[alias]
+	br = branch
+	ci = commit
+	co = checkout
+	cp = cherry-pick
+	st = status
+	logadog = log --all --decorate --oneline --graph
+	chlog = log --no-merges --oneline --stat @{1}..
+	df = diff --word-diff=color
+[diff]
+	tool = vimdiff
+[init]
+	defaultBranch = main