♻️ clean up of git configuration

components/terminal/default.nix

@@ -15,7 +15,6 @@ with lib;
 
   imports = [
     ./direnv.nix
-    ./git.nix
     ./heygpt.nix
     ./remote-install.nix
     ./wtf.nix

components/terminal/git.nix

@@ -1,35 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-with lib;
-{
-  options.components.terminal.git.enable = mkOption {
-    type = lib.types.bool;
-    default = config.components.terminal.enable;
-  };
-
-  config = mkIf (config.components.terminal.git.enable) {
-
-    environment.systemPackages = with pkgs; [
-      git
-      gita
-      tig
-      lazygit
-      git-crypt
-      gitAndTools.gitflow
-      gitAndTools.gitSVN
-      gitAndTools.git2cl
-
-      # activate using :
-      # git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX"
-      gitAndTools.diff-so-fancy
-
-      commitizen
-      gitmoji-cli
-
-    ];
-  };
-}

homes/common/default.nix

@@ -4,6 +4,7 @@
   imports = [
     ./backup.nix
     ./editor.nix
+    ./git.nix
     ./network.nix
     ./packages.nix
     ./starship-rs

homes/common/editor.nix

@@ -4,6 +4,4 @@
     enable = true;
     defaultEditor = lib.mkDefault true;
   };
-  #  enable = true;
-  #};
 }

homes/common/git.nix

@@ -0,0 +1,39 @@
+{ lib, pkgs, ... }:
+{
+  programs.git = {
+    enable = lib.mkDefault true;
+    ignores = [
+      "*.swp"
+      "*~"
+      ".idea"
+      "*.iml"
+      ".*penis.*"
+      "result"
+      ".envrc"
+      ".direnv"
+    ];
+    extraConfig = {
+      init.defaultBranch = "main";
+      pull.ff = "only";
+      push.autoSetupRemote = true;
+    };
+    difftastic.enable = true;
+  };
+
+  home.packages = [
+    pkgs.commitizen
+    pkgs.difftastic
+    pkgs.git
+    pkgs.git-crypt
+    pkgs.git-repo-updater
+    pkgs.gitAndTools.git2cl
+    pkgs.gitAndTools.gitSVN
+    pkgs.gitAndTools.gitflow
+    pkgs.gita
+    pkgs.gitmoji-cli
+    pkgs.lazygit
+    pkgs.pre-commit
+    pkgs.tig
+  ];
+
+}

homes/common/packages.nix

@@ -10,8 +10,6 @@ with lib;
   config = mkMerge [
     {
       home.packages = [
-        hexyl
-
         units
         difftastic
 

homes/ingolf-wagner/default.nix

@@ -2,6 +2,7 @@
 {
   imports = [
     ../palo
+    ./git.nix
     ./keymapper.nix
     ./ssh.nix
     ./taskwarrior.nix
@@ -33,9 +34,4 @@
   # we need nixGL to run kitty, because it depends on GL it's not nice, but not to bad either
   xsession.windowManager.i3.config.terminal = lib.mkForce "nixGLIntel kitty";
 
-  programs.git = {
-    signing.signByDefault = lib.mkForce false;
-    userEmail = lib.mkForce "ingolf-wagner@jobrad.org";
-  };
-
 }

homes/ingolf-wagner/git.nix

@@ -0,0 +1,14 @@
+{ lib, ... }:
+{
+
+  programs.git = {
+    enable = true;
+    userName = "Ingolf Wagner";
+    userEmail = lib.mkForce "ingolf-wagner@jobrad.org";
+    signing = {
+      key = lib.mkForce null;
+      signByDefault = lib.mkForce false;
+    };
+  };
+
+}

homes/palo/git.nix

@@ -1,5 +1,4 @@
 { pkgs, ... }:
-with pkgs;
 {
 
   programs.git = {
@@ -10,35 +9,6 @@ with pkgs;
       key = "42AC51C9482D0834CF488AF1389EC2D64AC71EAC";
       signByDefault = true;
     };
-    ignores = [
-      "*.swp"
-      "*~"
-      ".idea"
-      "*.iml"
-      ".*penis.*"
-      "result"
-      ".envrc"
-      ".direnv"
-    ];
-    extraConfig = {
-      init.defaultBranch = "main";
-      pull.ff = "only";
-      push.autoSetupRemote = true;
-    };
-    #diff-so-fancy.enable = true;
-    difftastic.enable = true;
   };
 
-  home.packages = [
-    pre-commit
-    gita
-    git-repo-updater
-    tig
-    lazygit
-    git-crypt
-    gitAndTools.gitflow
-    gitAndTools.gitSVN
-    gitAndTools.git2cl
-  ];
-
 }