summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/nomic.nix2
-rw-r--r--tv/1systems/wu.nix2
-rw-r--r--tv/1systems/xu.nix2
-rw-r--r--tv/1systems/zu.nix2
-rw-r--r--tv/2configs/gitconfig.nix19
-rw-r--r--tv/2configs/gitrepos.nix (renamed from tv/2configs/git.nix)0
6 files changed, 23 insertions, 4 deletions
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 5469fffd5..9b9502254 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -9,7 +9,7 @@ with import <stockholm/lib>;
../.
../2configs/hw/x220.nix
../2configs/exim-retiolum.nix
- ../2configs/git.nix
+ ../2configs/gitrepos.nix
../2configs/im.nix
../2configs/mail-client.nix
../2configs/nginx/public_html.nix
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 328e71fdc..60f9fa100 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -9,7 +9,7 @@ with import <stockholm/lib>;
../.
../2configs/hw/w110er.nix
../2configs/exim-retiolum.nix
- ../2configs/git.nix
+ ../2configs/gitrepos.nix
../2configs/im.nix
../2configs/mail-client.nix
../2configs/man.nix
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 288373fc9..0a15ba838 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -9,7 +9,7 @@ with import <stockholm/lib>;
../.
../2configs/hw/x220.nix
../2configs/exim-retiolum.nix
- ../2configs/git.nix
+ ../2configs/gitrepos.nix
../2configs/mail-client.nix
../2configs/man.nix
../2configs/nginx/public_html.nix
diff --git a/tv/1systems/zu.nix b/tv/1systems/zu.nix
index b1b2d58ce..5552ef065 100644
--- a/tv/1systems/zu.nix
+++ b/tv/1systems/zu.nix
@@ -15,7 +15,7 @@ with import <stockholm/lib>;
../.
../2configs/hw/x220.nix
../2configs/exim-retiolum.nix
- ../2configs/git.nix
+ ../2configs/gitrepos.nix
../2configs/mail-client.nix
../2configs/man.nix
../2configs/nginx/public_html.nix
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