home

commit 8db628b38e3849d11486adb966b8225e7b3cb665
parent 8724fb409a02612fab2cbee97fbb40e0404ebe01
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Tue, 24 Mar 2020 07:06:31 +0100

git: add git-annex by default

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
modules/profiles/git.nix
 | 
6
++----
M
tmp/nixos-configuration/modules/profiles/git.nix
 | 
13
+++++++------

2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/modules/profiles/git.nix b/modules/profiles/git.nix
@@ -16,9 +16,8 @@ in
       home.packages = with pkgs; [
         gist
         git-lfs
-        gitAndTools.gitflow
+        gitAndTools.git-annex
         gitAndTools.hub
-        gitAndTools.tig
         nur.repos.vdemeester.prm
         nur.repos.vdemeester.ape
       ];
@@ -180,9 +179,8 @@ in
       xdg.configFile."git/config.d/redhat.gitconfig".source = ./assets/git/redhat.gitconfig;
       xdg.configFile."nr/git" = {
         text = builtins.toJSON [
-          {cmd = "mr";}
+          {cmd = "mr";} {cmd = "tig";}
           {cmd = "grv"; pkg = "gitAndTools.grv";}
-          {cmd = "git-annex"; pkg = "gitAndTools.git-annex";}
           {cmd = "git-appraise"; pkg = "gitAndTools.git-appraise"; chan = "unstable";}
         ];
         onChange = "${pkgs.nur.repos.vdemeester.nr}/bin/nr git";
diff --git a/tmp/nixos-configuration/modules/profiles/git.nix b/tmp/nixos-configuration/modules/profiles/git.nix
@@ -16,7 +16,8 @@ in
   };
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
-      git
+      gitAndTools.gitFull
+      gitAndTools.git-annex
       gitAndTools.git-extras
     ];
     environment.etc."gitconfig" = rec { text = ''
@@ -44,8 +45,8 @@ in
   [color "diff"]
   	meta = white reverse
   	frag = magenta reverse
-  	old = red 
-  	new = green 
+  	old = red
+  	new = green
   [color "status"]
   	added = green
   	changed = yellow
@@ -56,14 +57,14 @@ in
   	default = matching
   [merge]
       tool = vimdiff
-  
+
   [user]
       name = Vincent Demeester
       email = vincent@sbr.pm
-  
+
   [http]
           cookiefile = /home/vincent/.gitcookies
-  	
+
   [url "git@github.com:"]
       pushInsteadOf = git://github.com/
     '';