RGBCube/ncc
1
Fork 0
mirror of https://github.com/RGBCube/ncc synced 2025-07-27 01:57:44 +00:00
Code Issues Activity

feat: don't hardcode urls

Browse source
This commit is contained in:
RGBCube 2025-02-28 00:41:20 +03:00
parent 765cc3ca49
commit 082dabb1af
Signed by: RGBCube
SSH key fingerprint: SHA256:CzqbPcfwt+GxFYNnFVCqoN5Itn4YFrshg1TrnACpA5M
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/common/git.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: let
{ self, config, lib, pkgs, ... }: let
inherit (lib) head mkAfter enabled merge mkIf;
inherit (lib.strings) match;
in {
@ -77,8 +77,7 @@ in {
(homeArgs: let
homeConfig = homeArgs.config;
# TODO: gitUrl = self.cube.services.forgejo.settings.server.ROOT_URL;
gitUrl = "https://git.rgbcu.be/";
gitUrl = self.best.services.forgejo.settings.server.ROOT_URL;
gitDomain = head <| match "https://(.*)/" gitUrl;
in {
programs.nushell.configFile.text = mkAfter /* nu */ ''
@ -137,8 +136,7 @@ in {
} <| mkIf config.isDesktop {
core.sshCommand = "ssh -i ~/.ssh/id";
url."ssh://git@github.com/".insteadOf = "https://github.com/";
# TODO: url."ssh://forgejo@${gitDomain}:${toString (head self.cube.services.openssh.ports)}/".insteadOf = gitUrl;
url."ssh://forgejo@${gitDomain}:2222/".insteadOf = gitUrl;
url."ssh://forgejo@${gitDomain}:${toString self.cube.services.forgejo.settings.server.SSH_PORT}/".insteadOf = gitUrl;
commit.gpgSign = true;
tag.gpgSign = true;

7
modules/common/jujutsu.nix
View file

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }: let
inherit (lib) enabled getExe;
{ self, config, lib, pkgs, ... }: let
inherit (lib) enabled getExe head;
in {
environment.systemPackages = [
pkgs.difftastic
@ -15,8 +15,7 @@ in {
programs.jujutsu = enabled {
settings = let
# TODO: mailDomain = head self.disk.mailserver.domains;
mailDomain = "rgbcu.be";
mailDomain = head self.disk.mailserver.domains;
in {
user.name = "RGBCube";
user.email = "git@${mailDomain}";