diff --git a/modules/other/git.nix b/modules/other/git.nix index f0c26fd..7650bcc 100644 --- a/modules/other/git.nix +++ b/modules/other/git.nix @@ -18,7 +18,8 @@ in{ pull.ff = "only"; gpg.format = "ssh"; commit.gpgsign = "true"; - diff.external = "${pkgs.difftastic}/bin/difft"; + # breaks forgejo + # diff.external = "${pkgs.difftastic}/bin/difft"; signing = { key = "${key}"; diff --git a/modules/services/forgejo/module.nix b/modules/services/forgejo/module.nix index 65d923d..03acb49 100644 --- a/modules/services/forgejo/module.nix +++ b/modules/services/forgejo/module.nix @@ -24,6 +24,7 @@ in { networking.firewall.allowedTCPPorts = [ 443 80 + 3000 ]; services.nginx = { @@ -108,6 +109,9 @@ in { ENABLED = false; DEFAULT_ACTIONS_URL = "github"; }; + ui = { + SHOW_USER_EMAIL = false; + }; "repository.signing" = { SIGNING_KEY = "none";