all repos — nixfiles @ b1eb6e4da088a1fd94881e6a54b983e16e546aee

System and user configuration, managed by nix and home-manager

update git config schema

Alan Pearce
commit

b1eb6e4da088a1fd94881e6a54b983e16e546aee

parent

f882cacd9b46335169efab7928e3f4a2da0f142c

1 file changed, 4 insertions(+), 6 deletions(-)

changed files
M user/settings/workstation.nix → user/settings/workstation.nix
@@ -24,10 +24,9 @@ };
 
   programs.mergiraf.enable = true;
 
-  programs.git = {
-    difftastic = {
-      enable = true;
-    };
+  programs.difftastic = {
+    enable = true;
+    git.enable = true;
   };
   programs.gh = {
     enable = true;

@@ -42,8 +41,7 @@ programs.jujutsu = {
     enable = true;
     settings = {
       user = {
-        name = config.programs.git.userName;
-        email = config.programs.git.userEmail;
+        inherit (config.programs.git.settings.user) name email;
       };
       ui = {
         "diff.tool" = [