RGBCube/ncc
1
Fork 0
mirror of https://github.com/RGBCube/ncc synced 2025-07-30 11:37:44 +00:00
Code Issues Activity

Remove options/domains.nix

Browse source
This commit is contained in:
RGBCube 2024-04-30 12:56:08 +03:00
parent 0928319c38
commit 6c1bdaaec4
No known key found for this signature in database
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/cube/forgejo/default.nix
View file

@ -66,8 +66,6 @@ in systemConfiguration {
services.openssh.settings.AcceptEnv = mkForce "COLORTERM GIT_PROTOCOL"; services.openssh.settings.AcceptEnv = mkForce "COLORTERM GIT_PROTOCOL";
services.forgejo = enabled { services.forgejo = enabled {
inherit fqdn;
lfs = enabled; lfs = enabled;
mailerPasswordFile = config.secrets.forgejoMailPassword.path; mailerPasswordFile = config.secrets.forgejoMailPassword.path;

8
modules/git.nix
View file

@ -65,7 +65,9 @@
}) })
(let (let
gitDomain = self.cube.services.forgejo.fqdn; gitUrl = self.cube.services.forgejo.settings.server.ROOT_URL;
gitDomain = head (strings.match "https://(.*)/" gitUrl);
mailDomain = head self.disk.mailserver.domains; mailDomain = head self.disk.mailserver.domains;
in homeConfiguration { in homeConfiguration {
programs.nushell.configFile.text = mkAfter '' programs.nushell.configFile.text = mkAfter ''
@ -77,7 +79,7 @@ in homeConfiguration {
"RGBCube/" + $user_and_repo "RGBCube/" + $user_and_repo
} }
git remote add origin ("https://${gitDomain}/" + $user_and_repo) git remote add origin ("${gitUrl}" + $user_and_repo)
} }
''; '';
@ -126,7 +128,7 @@ in homeConfiguration {
core.sshCommand = "ssh -i ~/.ssh/id"; core.sshCommand = "ssh -i ~/.ssh/id";
url."ssh://git@github.com/".insteadOf = "https://github.com/"; url."ssh://git@github.com/".insteadOf = "https://github.com/";
url."ssh://forgejo@${gitDomain}:${head self.cube.openssh.ports}/".insteadOf = "https://${gitDomain}/"; url."ssh://forgejo@${gitDomain}:${toString (head self.cube.services.openssh.ports)}/".insteadOf = gitUrl;
} (mkIf isDesktop { } (mkIf isDesktop {
commit.gpgSign = true; commit.gpgSign = true;
tag.gpgSign = true; tag.gpgSign = true;

3
options/domains.nix
View file

@ -1,3 +0,0 @@
{ lib, ... }: {
options.services.forgejo.fqdn = lib.mkValue null;
}