commit 204dd91380fa215e233ad6166a1eb3185baf9ccc · kitten.sh/system

+16 -16
home/base/git.nix
···

       75
       75
        
       

     

       76
       76
        
           programs.git = {

     

       77
       77
        
             enable = true;

     

       78
       78
       -
             userName = cfg.user.name;

     

       79
       79
       -
             userEmail = cfg.user.email;

     

       80
       78
        
       

     

       81
       79
        
             signing = mkIf (cfg.signingKey != null) {

     

       82
       80
        
               signByDefault = true;

     
···

       95
       93
        
               enable = true;

     

       96
       94
        
             };

     

       97
       95
        
       

     

       98
       98
       -
             aliases = {

     

       99
       99
       -
               s = "status -s";

     

       100
       100
       -
               last = "log -1";

     

       101
       101
       -
               lol = "log --pretty=longline --decorate --date=relative";

     

       102
       102
       -
               lrel = "log --pretty=longline --pretty=longline --graph --decorate --date=relative --boundary remotes/origin/HEAD...HEAD";

     

       103
       103
       -
               lloc = "log --pretty=longline --graph --decorate --date=relative --boundary ^remotes/origin/HEAD HEAD";

     

       104
       104
       -
               recommit = "commit -a --amend --no-edit";

     

       105
       105
       -
               pushf = "push --force-with-lease";

     

       106
       106
       -
               glog = "log --pretty=longline --decorate --all --graph --date=relative";

     

       107
       107
       -
               base = "!f() { git cherry remotes/origin/HEAD HEAD | awk '/^\\+/ {print $2;exit}'; }; f";

     

       108
       108
       -
               journal = "!f() { git commit -a -m \"$(date +'%Y-%m-%d %H:%M:%S')\"; }; f";

     

       109
       109
       -
               get = "!f() { git clone \"git@github.com:$1.git\" \"$HOME/git/$1\" --no-single-branch --shallow-since=\"1 year ago\"; }; f";

     

       110
       110
       -
             };

     

       96
       96
       +
             settings = {

     

       97
       97
       +
               user = cfg.user;

     

       111
       98
        
       

     

       112
       112
       -
             extraConfig = {

     

       99
       99
       +
               alias = {

     

       100
       100
       +
                 s = "status -s";

     

       101
       101
       +
                 last = "log -1";

     

       102
       102
       +
                 lol = "log --pretty=longline --decorate --date=relative";

     

       103
       103
       +
                 lrel = "log --pretty=longline --pretty=longline --graph --decorate --date=relative --boundary remotes/origin/HEAD...HEAD";

     

       104
       104
       +
                 lloc = "log --pretty=longline --graph --decorate --date=relative --boundary ^remotes/origin/HEAD HEAD";

     

       105
       105
       +
                 recommit = "commit -a --amend --no-edit";

     

       106
       106
       +
                 pushf = "push --force-with-lease";

     

       107
       107
       +
                 glog = "log --pretty=longline --decorate --all --graph --date=relative";

     

       108
       108
       +
                 base = "!f() { git cherry remotes/origin/HEAD HEAD | awk '/^\\+/ {print $2;exit}'; }; f";

     

       109
       109
       +
                 journal = "!f() { git commit -a -m \"$(date +'%Y-%m-%d %H:%M:%S')\"; }; f";

     

       110
       110
       +
                 get = "!f() { git clone \"git@github.com:$1.git\" \"$HOME/git/$1\" --no-single-branch --shallow-since=\"1 year ago\"; }; f";

     

       111
       111
       +
               };

     

       112
       112
       +
       

     

       113
       113
        
               commit.gpgSign = true;

     

       114
       114
        
               tag.gpgSign = true;

     

       115
       115
        
               push.gpgSign = "if-asked";