From a9ac5ae9640898bb10ce9a8122e86e56da295b1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= Date: Sat, 28 Mar 2026 13:57:22 -0600 Subject: [PATCH 1/2] =?UTF-8?q?feat(gitea):=20=EB=8F=84=EA=B8=B0=20?= =?UTF-8?q?=EB=B3=B4=EB=82=98=EC=99=80=20=ED=95=9C=EA=B5=AD=EC=96=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/nixos/deertopia/gitea.nix | 35 ++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/modules/nixos/deertopia/gitea.nix b/modules/nixos/deertopia/gitea.nix index a33a8c4..adecafc 100644 --- a/modules/nixos/deertopia/gitea.nix +++ b/modules/nixos/deertopia/gitea.nix @@ -1,6 +1,8 @@ { config, lib, pkgs, ... }: -let cfg = config.sydnix.deertopia.gitea; +let + cfg = config.sydnix.deertopia.gitea; + commas = lib.concatStringsSep ","; in { options.sydnix.deertopia.gitea = { enable = lib.mkEnableOption "Gitea"; @@ -62,6 +64,37 @@ in { DISABLE_REGISTRATION = true; ENABLE_NOTIFY_MAIL = true; }; + "repository.pull-request" = { + CLOSE_KEYWORDS = commas [ + # en + "close" "closes" "closed" "fix" "fixes" "fixed" "resolve" + "resolves" "resolved" + # tok + "pini e" + # ko + "해결" "해결합니다" "해결했다" + "종료" "종료합니다" "중료한다" "중료해" "중료하다" + "수정" "수정했습니다" "중료한다" "중료해" "중료하다" + ]; + REOPEN_KEYWORDS = commas [ + # en + "reopen" "reopens" "reopened" + # tok + "open sin e" "pakala sin e" + "li pakala sin" "li pakalan sin" + # ko + "재개" "재개합니다" "다시 열기" "다시 엽니다" "다시 여다" + "다시 연다" + ]; + WORK_IN_PROGRESS_PREFIXES = commas [ + # en + "WIP:" "[WIP]" + # tok + "pini ala:" "awen pali:" + # ko + "공사 중:" "공사중:" "중:" "[중]" "中:" "[中]" + ]; + }; mailer = { ENABLED = true; FROM = "Gitea "; -- 2.53.0 From 8c41e3b8df91c9a71bc951443bcdf8d402f403c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= Date: Sat, 28 Mar 2026 13:57:22 -0600 Subject: [PATCH 2/2] feat(gitea): set default merge style --- modules/nixos/deertopia/gitea.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/deertopia/gitea.nix b/modules/nixos/deertopia/gitea.nix index adecafc..0b5073a 100644 --- a/modules/nixos/deertopia/gitea.nix +++ b/modules/nixos/deertopia/gitea.nix @@ -94,6 +94,7 @@ in { # ko "공사 중:" "공사중:" "중:" "[중]" "中:" "[中]" ]; + DEFAULT_MERGE_STYLE = "rebase"; }; mailer = { ENABLED = true; -- 2.53.0