From db4696fc5fe3087f7b74fb1a375fcb59712f0e4f Mon Sep 17 00:00:00 2001 From: RGBCube Date: Tue, 30 Apr 2024 12:56:08 +0300 Subject: [PATCH] Fix git creds, oops --- modules/git.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/git.nix b/modules/git.nix index ea51c7e..eaa1fa7 100644 --- a/modules/git.nix +++ b/modules/git.nix @@ -65,6 +65,8 @@ }) (let + inherit (self.disk.networking) domain; + gitHost = self.cube.networking.hostName; in homeConfiguration { programs.nushell.configFile.text = mkAfter '' @@ -76,7 +78,7 @@ in homeConfiguration { "RGBCube/" + $user_and_repo } - git remote add origin ("https://git.${gitHost}/" + $user_and_repo) + git remote add origin ("https://${gitHost}/" + $user_and_repo) } ''; @@ -84,7 +86,7 @@ in homeConfiguration { package = pkgs.gitFull; userName = "RGBCube"; - userEmail = "git@${gitHost}"; + userEmail = "git@${domain}"; lfs = enabled; @@ -125,7 +127,7 @@ in homeConfiguration { core.sshCommand = "ssh -i ~/.ssh/id"; url."ssh://git@github.com/".insteadOf = "https://github.com/"; - url."ssh://forgejo@${gitHost}:2222/".insteadOf = "https://git.${gitHost}/"; + url."ssh://forgejo@${domain}:2222/".insteadOf = "https://git.${gitHost}/"; } (mkIf isDesktop { commit.gpgSign = true; tag.gpgSign = true;