diff --git a/modules_dentritic/features/core/git.nix b/modules_dentritic/features/core/git.nix index a800b26..3089fc3 100644 --- a/modules_dentritic/features/core/git.nix +++ b/modules_dentritic/features/core/git.nix @@ -1,22 +1,33 @@ { self, inputs, ... }: { flake = { - homeModules.git = { + homeModules.git = { pkgs, lib, ... }: { programs.git = { enable = true; - package = self.packages.${pkgs.stdenv.hostPlatform.system}.myGit; - }; - }; - }; - - perSystem = { pkgs, lib, ... }: { - packages.myGit = inputs.wrapper-modules.wrappers.git.wrap { - inherit pkgs; - configFile = { - user = { - email = "mateialex@outlook.fr"; - name = "Alexandre"; + settings = { + user = { + email = "mateialex@outlook.fr"; + name = "Alexandre"; + }; }; }; }; + + nixosModules.git = { pkgs, lib, ... }: { + environment.systemPackages = with pkgs; [ + git + ]; + programs.ssh = { + startAgent = true; + extraConfig = '' + Host github.com + IdentityFile ~/.ssh/git + Host git.alexdelcamp.fr + IdentityFile ~/.ssh/git + Port 2222 + User git + ''; + }; + services.gnome.gcr-ssh-agent.enable = false; + }; }; } diff --git a/modules_dentritic/hosts/common/common.nix b/modules_dentritic/hosts/common/common.nix index 2d9132e..a8ccdb0 100644 --- a/modules_dentritic/hosts/common/common.nix +++ b/modules_dentritic/hosts/common/common.nix @@ -22,6 +22,7 @@ self.nixosModules.kernelConfig self.nixosModules.utils self.nixosModules.sysFetch + self.nixosModules.git ]; }; }