diff options
| -rw-r--r-- | common-workstation.nix | 22 | ||||
| -rw-r--r-- | packages.nix | 1 |
2 files changed, 22 insertions, 1 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; diff --git a/packages.nix b/packages.nix index d1a2963f..45ce4d4c 100644 --- a/packages.nix +++ b/packages.nix @@ -23,7 +23,6 @@ ghostscript gimp gitAndTools.hub - gitFull glxinfo gnumake gnupg1compat |