carotte: disable gpg because pinentry misses libassuan

[julm/julm-nix.git] / home-manager / profiles / git.nix

diff --git a/home-manager/profiles/git.nix b/home-manager/profiles/git.nix
index 4465f94f8dfa3ad0fd1c000ec552d6e12b05c009..403acc87bdf305ef8de7c7374892171fb3429674 100644 (file)
--- a/home-manager/profiles/git.nix
+++ b/home-manager/profiles/git.nix
@@ -8,13 +8,15 @@ home.packages = [
 programs.git = {
   enable = true;
   ignores = [ "*~" "*.swp" ];
-  package = pkgs.gitFull;
+  package = lib.mkDefault pkgs.gitFull;
   aliases = {
+    a = "add";
     authors = "shortlog -s -n";
     bl = "git log -p -M --follow --stat --";
     b = "branch";
     c = "commit";
     ca = "commit --amend -C@";
+    cf = "commit --fixup";
     co = "checkout";
     d = "diff";
     dc = "diff --cached";
@@ -22,12 +24,12 @@ programs.git = {
     dp = "diff --patience";
     ign = "ls-files -o -i --exclude-standard";
     ll = "log --graph --decorate --pretty=oneline --abbrev-commit";
-    lp = "log -p";
+    lp = "log -p --pretty=fuller";
     s = "status";
     spull = "!git-svn fetch && git-svn rebase";
     spush = "!git-svn dcommit";
     ss = "status -s";
-    su = "status -uno";
+    st = "status -uno";
     sw = "switch";
     fetch-local = "!git fetch local && git tag -d $(git describe --exact-match 2>/dev/null >/dev/null) && git fetch --tags local";
     pull-local = "!git fetch-local && git checkout -B master local/master";