summaryrefslogtreecommitdiffstats
path: root/tv/2configs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-06-06 14:35:58 +0200
committermakefu <github@syntax-fehler.de>2017-06-06 14:35:58 +0200
commit427e09fdf39ab1b3e5b8ddf483d0798d5c1941e7 (patch)
tree5f653a53e6d7bf254274a65c3f397081ac7e140a /tv/2configs
parent777adbb420c8b046b0c222d7f0b8480c32f9a8c0 (diff)
parent6d96297a9d6bcddc8b545585d9e4180e493b899f (diff)
Merge branch 'master' of prism:stockholm
Diffstat (limited to 'tv/2configs')
-rw-r--r--tv/2configs/gitconfig.nix19
-rw-r--r--tv/2configs/gitrepos.nix (renamed from tv/2configs/git.nix)0
2 files changed, 19 insertions, 0 deletions
diff --git a/tv/2configs/gitconfig.nix b/tv/2configs/gitconfig.nix
new file mode 100644
index 000000000..771a4b2a4
--- /dev/null
+++ b/tv/2configs/gitconfig.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, ... }:
+
+with import <stockholm/lib>;
+
+{
+ environment.etc.gitconfig.text = ''
+ [alias]
+ patch = !${pkgs.git}/bin/git --no-pager diff --no-color
+ [diff-so-fancy]
+ markEmptyLines = false
+ stripLeadingSymbols = false
+ [pager]
+ diff = ${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy \
+ | ${pkgs.less}/bin/less -FRX
+ [user]
+ email = tv@krebsco.de
+ name = tv
+ '';
+}
diff --git a/tv/2configs/git.nix b/tv/2configs/gitrepos.nix
index 13b12986c..13b12986c 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/gitrepos.nix