about summary refs log tree commit diff
path: root/common-workstation.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2014-11-20 02:15:50 +0100
committeraszlig <aszlig@redmoonstudios.org>2014-11-20 02:15:50 +0100
commit82ecebd7314e1234db04430e0cabb559738dada7 (patch)
tree9f07fee89668bb509a1cbb0baf05bd3964d568b9 /common-workstation.nix
parent50e0c139949809880c2bbf571546b39840898da6 (diff)
common-workstation: Switch to vuizvui Git module.
Yay, no .gitconfig anymore :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'common-workstation.nix')
-rw-r--r--common-workstation.nix22
1 files changed, 22 insertions, 0 deletions
diff --git a/common-workstation.nix b/common-workstation.nix
index 91fdd4fd..7d66a713 100644
--- a/common-workstation.nix
+++ b/common-workstation.nix
@@ -50,6 +50,28 @@ in {
   vuizvui.vlock.enable = true;
   vuizvui.zsh.enable = true;
 
+  vuizvui.git.enable = true;
+  vuizvui.git.config = {
+    color.ui = "auto";
+    merge.tool = "vimdiff3";
+    user.email = "aszlig@redmoonstudios.org";
+    user.name = "aszlig";
+    user.signkey = "8C2DC961";
+    gpg.program = "${pkgs.gnupg}/bin/gpg2";
+    push.default = "current";
+    tar."tar.xz".command = "${pkgs.xz}/bin/xz -c";
+    rebase.autosquash = true;
+    rerere.enabled = true;
+    rerere.autoupdate = true;
+    commit.gpgsign = true;
+
+    alias.backport = let
+      release = "14.04";
+      message = "Merge release ${release} into backports.";
+    in "!git fetch upstream release-${release} &&"
+     + " git merge -m \"${message}\" --log FETCH_HEAD";
+  };
+
   services = {
     openssh = {
       enable = true;