fix(git): cleanup

Signed-off-by: Harald Hoyer <harald@hoyer.xyz>

homes/x86_64-darwin/harald@mpro.fritz.box/default.nix

@@ -21,11 +21,11 @@
       neovim.enable = false;
       tmux.enable = true;
       bat.enable = true;
-      git.enable = true;
       starship.enable = true;
       home-manager.enable = true;
     };
     tools = {
+      git.enable = true;
       direnv.enable = true;
       alacritty.enable = true;
       ssh.enable = true;

homes/x86_64-linux/harald@nix.fedora.fritz.box/default.nix

@@ -21,11 +21,11 @@
       neovim.enable = true;
       tmux.enable = true;
       bat.enable = true;
-      git.enable = true;
       starship.enable = true;
       home-manager.enable = true;
     };
     tools = {
+      git.enable = true;
       direnv.enable = true;
       ssh.enable = true;
       # jetbrains.enable = true;

homes/x86_64-linux/harald@sgx-nixos/default.nix

@@ -21,11 +21,11 @@
       neovim.enable = false;
       tmux.enable = true;
       bat.enable = true;
-      git.enable = true;
       starship.enable = true;
       home-manager.enable = true;
     };
     tools = {
+      git.enable = true;
       direnv.enable = true;
       ssh.enable = true;
       # jetbrains.enable = true;

modules/home/cli-apps/git/default.nix

@@ -1,49 +0,0 @@
-{ lib
-, config
-, pkgs
-, ...
-}:
-with lib;
-with lib.plusultra; let
-  cfg = config.plusultra.cli-apps.git;
-in
-{
-  options.plusultra.cli-apps.git = {
-    enable = mkEnableOption "git";
-  };
-
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      delta
-      gh
-    ];
-    programs.git = {
-      enable = true;
-      userName = "Harald Hoyer";
-      userEmail = "harald@hoyer.xyz";
-      extraConfig = {
-        init.defaultBranch = "main";
-        "credential \"https://github.com\"" = {
-          helper = "!gh auth git-credential";
-        };
-        alias = {
-          co = "checkout";
-          ci = "commit";
-        };
-        pull.ff = "only";
-        core.pager = "delta";
-        delta = {
-          features = "side-by-side line-numbers decorations";
-          syntax-theme = "DarkNeon";
-          light = "false";
-          line-numbers = "false";
-          navigate = "true";
-        };
-        interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
-        merge.conflictStyle = "diff3";
-        diff.colorMoved = "default";
-      };
-    };
-
-  };
-}

modules/home/tools/git/default.nix

@@ -13,13 +13,14 @@ in
     userName = mkOpt types.str user.fullName "The name to configure git with.";
     userEmail = mkOpt types.str user.email "The email to configure git with.";
     signingKey =
-      mkOpt types.str "9762169A1B35EA68" "The key ID to sign commits with.";
+      mkOpt types.str "7F3D64824AC0B6B8009E50504BC0896FB5693595" "The key ID to sign commits with.";
     signByDefault = mkOpt types.bool true "Whether to sign commits by default.";
   };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       git-delete-merged-branches
+      delta
     ];
     programs.git = {
       enable = true;
@@ -35,8 +36,27 @@ in
         push = { autoSetupRemote = true; };
         core = { whitespace = "trailing-space,space-before-tab"; };
         safe = {
-          directory = "${user.home}/work/config";
+          directory = "${user.home}/git";
         };
+        "credential \"https://github.com\"" = {
+          helper = "!gh auth git-credential";
+        };
+        alias = {
+          co = "checkout";
+          ci = "commit";
+        };
+        pull.ff = "only";
+        core.pager = "${pkgs.delta}/bin/delta";
+        delta = {
+          features = "side-by-side line-numbers decorations";
+          syntax-theme = "DarkNeon";
+          light = "false";
+          line-numbers = "false";
+          navigate = "true";
+        };
+        interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
+        merge.conflictStyle = "diff3";
+        diff.colorMoved = "default";
       };
     };
   };

modules/home/user/default.nix

@@ -22,8 +22,8 @@ in
     enable = mkOpt types.bool false "Whether to configure the user account.";
     name = mkOpt (types.nullOr types.str) config.snowfallorg.user.name "The user account.";
 
-    fullName = mkOpt types.str "Jake Hamilton" "The full name of the user.";
-    email = mkOpt types.str "jake.hamilton@hey.com" "The email of the user.";
+    fullName = mkOpt types.str "Harald Hoyer" "The full name of the user.";
+    email = mkOpt types.str "harald@hoyer.xyz" "The email of the user.";
 
     home = mkOpt (types.nullOr types.str) home-directory "The user's home directory.";
   };