aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--git/global-gitconfig21
-rw-r--r--home-dots/dot-gitconfig20
-rwxr-xr-xinstall.scm6
3 files changed, 20 insertions, 27 deletions
diff --git a/git/global-gitconfig b/git/global-gitconfig
deleted file mode 100644
index 460a2b9..0000000
--- a/git/global-gitconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-[user]
- name = Óscar Nájera
- email = hi@oscarnajera.com
-[pull]
- rebase = true
-[push]
- default = simple
-[diff "gpg"]
- textconv = gpg --no-tty --decrypt
-[diff "pdf"]
- textconv = pdfinfo
-[diff "org"]
- xfuncname = "^(\\*+ +.*)$"
-[diff "lisp"]
- xfuncname = "^[ \t]*(((;+ )|\\((cl-|el-patch-)?def(un|var|macro|method|custom|ine)).*)$"
-[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/home-dots/dot-gitconfig b/home-dots/dot-gitconfig
new file mode 100644
index 0000000..2103c49
--- /dev/null
+++ b/home-dots/dot-gitconfig
@@ -0,0 +1,20 @@
+[user]
+ name = Óscar Nájera
+ email = hi@oscarnajera.com
+[pull]
+ rebase = true
+[push]
+ default = simple
+
+[diff "gpg"]
+ textconv = gpg --no-tty --decrypt
+[diff "pdf"]
+ textconv = pdfinfo
+[diff "org"]
+ xfuncname = "^(\\*+ +.*)$"
+[diff "lisp"]
+ xfuncname = "^[ \t]*(((;+ )|\\((cl-|el-patch-)?def(un|var|macro|method|custom|ine)).*)$"
+[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
diff --git a/install.scm b/install.scm
index 1afd7e8..605a8f6 100755
--- a/install.scm
+++ b/install.scm
@@ -158,11 +158,6 @@
(list 0)
file-name))
-(define (git-config)
- (log-msg 'INFO "Configuring git")
- (log-msg 'INFO " Symlink global config")
- (config-links "git/global-gitconfig" "~/.gitconfig" #f))
-
(define (format-config-entry item)
(format #t "[~a]~%" (car item))
(format #t "~:{~a=~@{~a~^;~}~%~}~%" (cdr item)))
@@ -201,7 +196,6 @@
(setup-logging)
(log-msg 'INFO "Symlink PIM")
(config-links "calendars.conf" "~/.calendars.conf" #f)
- (git-config)
(symlink-tree "home-dots" "~/")
(config-links "gnupg/gpg.conf" "~/.gnupg/gpg.conf" #f)
(config-links "gnupg/gpg-agent.conf" "~/.gnupg/gpg-agent.conf" #f)