From 8e48117d80046c490322266ed58bb28a3e0a8682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20N=C3=A1jera?= <hi@oscarnajera.com>
Date: Mon, 28 Sep 2020 22:31:09 +0200
Subject: Setup git configs

---
 .gitconfig           | 19 -------------------
 git/.gitconfig       |  2 --
 git/global-gitconfig | 19 +++++++++++++++++++
 git/tribe29          |  2 ++
 install.scm          | 12 ++++++++++--
 5 files changed, 31 insertions(+), 23 deletions(-)
 delete mode 100644 .gitconfig
 delete mode 100644 git/.gitconfig
 create mode 100644 git/global-gitconfig
 create mode 100644 git/tribe29

diff --git a/.gitconfig b/.gitconfig
deleted file mode 100644
index 89270c5..0000000
--- a/.gitconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-[user]
-	name = Óscar Nájera
-        email = hi@oscarnajera.com
-[pull]
-	rebase = true
-[push]
-	default = simple
-[core]
-	attributesfile = ~/.gitattributes
-[diff "gpg"]
-	textconv = gpg --no-tty --decrypt
-[diff "pdf"]
-      textconv = pdfinfo
-[difftool "image_diff"]
-      cmd = compare $REMOTE $LOCAL png:- | montage -font Liberation-Sans -tile 3x -geometry 400x -label "reference" $LOCAL -label "diff" - -label "current--%f" $REMOTE x:
-[diff]
-        algorithm = histogram
-[includeIf "gitdir:~/git/"]
-    path = ~/git/.gitconfig
diff --git a/git/.gitconfig b/git/.gitconfig
deleted file mode 100644
index 4e47e4b..0000000
--- a/git/.gitconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-[user]
-	email = oscar.najera@tribe29.com
\ No newline at end of file
diff --git a/git/global-gitconfig b/git/global-gitconfig
new file mode 100644
index 0000000..89270c5
--- /dev/null
+++ b/git/global-gitconfig
@@ -0,0 +1,19 @@
+[user]
+	name = Óscar Nájera
+        email = hi@oscarnajera.com
+[pull]
+	rebase = true
+[push]
+	default = simple
+[core]
+	attributesfile = ~/.gitattributes
+[diff "gpg"]
+	textconv = gpg --no-tty --decrypt
+[diff "pdf"]
+      textconv = pdfinfo
+[difftool "image_diff"]
+      cmd = compare $REMOTE $LOCAL png:- | montage -font Liberation-Sans -tile 3x -geometry 400x -label "reference" $LOCAL -label "diff" - -label "current--%f" $REMOTE x:
+[diff]
+        algorithm = histogram
+[includeIf "gitdir:~/git/"]
+    path = ~/git/.gitconfig
diff --git a/git/tribe29 b/git/tribe29
new file mode 100644
index 0000000..4e47e4b
--- /dev/null
+++ b/git/tribe29
@@ -0,0 +1,2 @@
+[user]
+	email = oscar.najera@tribe29.com
\ No newline at end of file
diff --git a/install.scm b/install.scm
index 1151500..770dd81 100755
--- a/install.scm
+++ b/install.scm
@@ -57,11 +57,19 @@
     (delete-file full-dest))
   full-dest)
 
+(define (git-config)
+  (log-msg 'INFO "Configuring git")
+  (symlink (expand-file "git/global-gitconfig") (clean-file (expand-file "~/.gitconfig")))
+  (log-msg 'OK " Symlink global config")
+  (symlink (expand-file "git/tribe29") (clean-file (expand-file "~/git/.gitconfig")))
+  (log-msg 'OK " Symlink Tribe29 config"))
+
 (define (main args)
   (setup-logging)
-  (log-msg 'INFO "symlink PIM")
+  (log-msg 'INFO "Symlink PIM")
 
   (symlink (expand-file "calendars.conf") (clean-file (expand-file "~/.calendars.conf")))
-  (log-msg 'OK "symlink agenda")
+  (log-msg 'OK " Symlink agenda")
+  (git-config)
 
   (shutdown-logging))
-- 
cgit v1.2.3