diff --git a/home-manager/modules/git/default.nix b/home-manager/modules/git/default.nix index 9267fca..e9d7130 100644 --- a/home-manager/modules/git/default.nix +++ b/home-manager/modules/git/default.nix @@ -85,23 +85,20 @@ in }; extraConfig = { - # credential.helper = "${config.programs.git.package.override {withLibsecret = true;}}/bin/git-credential-libsecret"; credential = { - helper = "${pkgs.git-credential-manager}/bin/git-credential-manager"; - credentialStore = "secretservice"; + helper = [ + "cache --timeout 7200" + "${pkgs.git-credential-oauth}/bin/git-credential-oauth" + ]; "https://dev.azure.com" = { useHttpPath = true; }; "https://git.datarift.nl" = { - provider = "generic"; - oauthClientId = "3ae2eee7-1c52-4950-846e-17de716cfe77"; - oauthClientSecret = "gto_tgalquoafnphcly4meztaxnfb3p2sq2aajksp7a2d4iu66c3ro2a"; - oauthRedirectUri = "http://127.0.0.1:42069/"; - oauthAuthorizeEndpoint = "/login/oauth/authorize"; - oauthTokenEndpoint = "/login/oauth/access_token"; - oauthScopes = "read:user repo"; + oauthClientId = "a4792ccc-144e-407e-86c9-5e7d8d9c3269"; + oauthAuthURL = "/login/oauth/authorize"; + oauthTokenURL = "/login/oauth/access_token"; }; }; init = { @@ -184,9 +181,6 @@ in }; }; - home.packages = [ - pkgs.git-credential-manager - pkgs.gitu - ]; + home.packages = [ pkgs.gitu ]; }; }