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