diff --git a/hosts/cube/forgejo/default.nix b/hosts/cube/forgejo/default.nix index aad9cb0..0307aad 100644 --- a/hosts/cube/forgejo/default.nix +++ b/hosts/cube/forgejo/default.nix @@ -131,7 +131,7 @@ in systemConfiguration { HTTP_ADDR = "::1"; HTTP_PORT = port; - SSH_PORT = builtins.elemAt config.services.openssh.ports 0; + SSH_PORT = head config.services.openssh.ports; DISABLE_ROUTER_LOG = true; }; diff --git a/modules/git.nix b/modules/git.nix index c534dde..6fc7329 100644 --- a/modules/git.nix +++ b/modules/git.nix @@ -126,7 +126,7 @@ in homeConfiguration { core.sshCommand = "ssh -i ~/.ssh/id"; url."ssh://git@github.com/".insteadOf = "https://github.com/"; - url."ssh://forgejo@${gitDomain}:2222/".insteadOf = "https://${gitDomain}/"; + url."ssh://forgejo@${gitDomain}:${head self.cube.openssh.ports}/".insteadOf = "https://${gitDomain}/"; } (mkIf isDesktop { commit.gpgSign = true; tag.gpgSign = true;