move most git config into home

homeConfigurations/muede/default.nix

@@ -24,7 +24,6 @@
     programs = {
       home-manager.enable = true;
       fzf.enable = true;
-      git-credential-oauth.enable = true;
 
       direnv = {
         enable = true;

homeConfigurations/muede/git.nix

@@ -1,27 +1,35 @@
 {
-  config.programs.git = {
+  programs = {
-    enable = true;
+    git = {
-    settings = {
+      enable = true;
-      user = {
+      settings = {
-        name = "müde";
+        user = {
-        email = "git@darkest.space";
+          name = "müde";
+          email = "git@darkest.space";
+        };
+
+        aliases = {
+          prettylog = "log --pretty=oneline --graph";
+          spring-clean = "!git branch --merged | xargs -n 1 -r git branch -d";
+        };
+
+        pull.ff = "only";
+        merge.tool = "kdiff3";
+        push.autoSetupRemote = "true";
+        credential.credentialStore = "cache";
       };
 
-      aliases = {
+      ignores = [
-        prettylog = "log --pretty=oneline --graph";
+        ".direnv"
-        spring-clean = "!git branch --merged | xargs -n 1 -r git branch -d";
+        ".idea"
-      };
+        ".envrc"
-
+      ];
-      pull.ff = "only";
-      merge.tool = "kdiff3";
-      push.autoSetupRemote = "true";
-      credential.credentialStore = "cache";
     };
 
-    ignores = [
+    git-credential-oauth.enable = true;
-      ".direnv"
+    gh = {
-      ".idea"
+      enable = true;
-      ".envrc"
+      gitCredentialHelper.enable = true;
-    ];
+    };
   };
 }

homeModules/git.nix

@@ -1,13 +1,6 @@
 {
-  programs = {
+  programs.git = {
-    git = {
+    enable = true;
-      enable = true;
+    settings.init.defaultBranch = "main";
-      settings.init.defaultBranch = "main";
-    };
-
-    gh = {
-      enable = true;
-      gitCredentialHelper.enable = true;
-    };
   };
 }