From 11b0dd4f1e9bd634b287fd7c4518472b48a44f0f Mon Sep 17 00:00:00 2001 From: Christine Elisabeth Koppel Date: Mon, 9 Feb 2026 18:05:47 +0100 Subject: [PATCH 1/5] Remove dangling old secrets implementation. --- nix-system-configs/modules/system/forgejo.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nix-system-configs/modules/system/forgejo.nix b/nix-system-configs/modules/system/forgejo.nix index 9f95bd0..bb9b68b 100644 --- a/nix-system-configs/modules/system/forgejo.nix +++ b/nix-system-configs/modules/system/forgejo.nix @@ -32,9 +32,6 @@ in { }; imports = [ - # ./secrets/secrets.nix # Add this locally after running add-secrets.zsh - # Optionally import local secrets if present (won't fail if missing) - (lib.optional (builtins.pathExists ./secrets/secrets.nix) ./secrets/secrets.nix) ./modules/desktop-manager/sway_greetd_homemanager.nix ./modules/local/hostname_username.nix ./modules/local/networking_local.nix From 6066626adf6e4eba1ef304bb2ee5d650bd520711 Mon Sep 17 00:00:00 2001 From: Christine Elisabeth Koppel Date: Mon, 9 Feb 2026 18:17:51 +0100 Subject: [PATCH 2/5] Fixed a typo in the ssh_config --- nix-system-configs/modules/toolsets/remote_building.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nix-system-configs/modules/toolsets/remote_building.nix b/nix-system-configs/modules/toolsets/remote_building.nix index 8670a37..820e202 100644 --- a/nix-system-configs/modules/toolsets/remote_building.nix +++ b/nix-system-configs/modules/toolsets/remote_building.nix @@ -39,7 +39,8 @@ HostName 10.1.1.3 IdentitiesOnly yes IdentityFile /root/.ssh/nixremote - User nixremoteStrictHostKeyChecking accept-new + User nixremote + StrictHostKeyChecking accept-new ''; # Manual step required: After rebuilding the client, copy /root/.ssh/nixremote.pub From 37a23c3ad41e182551648b58fe4b0faf323473d2 Mon Sep 17 00:00:00 2001 From: Christine Elisabeth Koppel Date: Mon, 9 Feb 2026 18:27:25 +0100 Subject: [PATCH 3/5] Fixed a huge issue with database not being actually sent to the dedicated server outside. No Kevin Fang in my watch. --- nix-system-configs/modules/system/forgejo.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nix-system-configs/modules/system/forgejo.nix b/nix-system-configs/modules/system/forgejo.nix index bb9b68b..f000f9f 100644 --- a/nix-system-configs/modules/system/forgejo.nix +++ b/nix-system-configs/modules/system/forgejo.nix @@ -67,6 +67,7 @@ in { services.forgejo = { enable = true; database = { + createDatabase = false; # Database already created, DO NOT REMOVE THIS OR IT WILL DEFAULT INTO INTERNAL ONE type = "postgres"; host = "10.1.1.251"; # IP of your database server name = "forgejo"; From c3c1554f8330015bb87ef4aff8d25179113ab74c Mon Sep 17 00:00:00 2001 From: Christine Elisabeth Koppel Date: Mon, 9 Feb 2026 20:44:41 +0100 Subject: [PATCH 4/5] Hopefully fixed odd as heck sops formatting. --- nix-system-configs/secrets/songsheet/secrets.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix-system-configs/secrets/songsheet/secrets.yaml b/nix-system-configs/secrets/songsheet/secrets.yaml index feef841..a3f419f 100644 --- a/nix-system-configs/secrets/songsheet/secrets.yaml +++ b/nix-system-configs/secrets/songsheet/secrets.yaml @@ -1,6 +1,6 @@ songsheet: database: - DATABASE_URL: ENC[AES256_GCM,data:eKJ1u+2n59lpvue1Orysn9QEvfICSLncR1txXW3Smp9LhrADMOaEROCP/Cd+qH2p3635XSFhoPpN7E2L6l5GZSk1eNyPYdi41zycJUBzvy5rVMnBjYoBd8e+QFxrgDjZ2U7NunCwejqm5i0/5AwQ/0joJsGVwUiNcoYO,iv:ch4BF6C0qYvkCruysqBTwjZ+9mVx2AORJ2TzGM4BTqw=,tag:HqEmcIEq/Q60CSlwef6vLA==,type:str] + DATABASE_URL: ENC[AES256_GCM,data:7zzRWaGhXjFzNmJpvTjsnWBOMBdXM1hnunoGEZy33myTWpf82UpWwUnGhDQCPH477JZZbCox7/fp3U/G+DvxYKiL6f35fOUyvGRrXT+F8oZK0tqk0NDF/IIroIZi4MdnURgoQbStNObYrScJoJ+n2RJXjlH1BeR+nSQSoApfmVFoQhWd+1/hQA==,iv:iXDxAmvGNnMoGffujlJ1TZagaXa8+fIxaOLtDGkKLuQ=,tag:uNcz0Nbr9Vz5MDUgk9A51w==,type:str] sops: age: - recipient: age1746rvsvsc3snxfl7cndm222wd5kck4aqj3x7nednlegq0gdjhfcqx0qv7m @@ -21,7 +21,7 @@ sops: V1F4TVEwaGgvUHcySnVQcXBHNzFuTU0KVNh7si39NVWZH9O52L9+gh1evvjotqK9 Zjmb97QR1C2LzEqOrfPuj6Lr86SS4RYSzSq2Oknn9o9SIs/5thR0YQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-02-07T17:44:51Z" - mac: ENC[AES256_GCM,data:lCQNNBpkCkzdTX+08eY4sMNFQbXSiNvBqBPro2U+OSaPvxjJRlG79K++mAnkCtFiIElSTACxOe8dTRz9frckVJQc5fL3o4PlDjeX3mzHj8V2F4DwEnQtJleLe63smtMb9ZJD3I0ivlfdcqV6GAIBtg65lQIEjgZ8tLvHSrsSpzs=,iv:PntgUV77KXsc6RLyLUBG0761GSQd/NjMA8XLyx4OBow=,tag:mI3B4aIsSTOQCOgKC6GCCg==,type:str] + lastmodified: "2026-02-09T19:41:54Z" + mac: ENC[AES256_GCM,data:tLa/SrMFv9PSNlD409Zfg1H4gF0vTTxIwWiZAoJJmOHyjVRx3TiWNgx/BgZNUexDr9xZxpVMlLa6/PrpFqGk2J3YKpZV/7xZrKCah8H8FBXHO/A6PivgRDMgW6iz9OnEieuYVzVALUiU8txcn9ZwXSPOzyl4hgLKnBKNzqIMjgQ=,iv:AiJXDQBq8rEjUDJduYjVAhfuhX0+axtoHbe5F/+8OqA=,tag:M6jHhAg01e9RNcCcP1YfMQ==,type:str] unencrypted_suffix: _unencrypted version: 3.11.0 From ee11c9171baed292a0dbbe0f69ebb262739acb10 Mon Sep 17 00:00:00 2001 From: Christine Elisabeth Koppel Date: Mon, 9 Feb 2026 20:52:18 +0100 Subject: [PATCH 5/5] Another typos of copy pasta fixed - now the URL should work. --- nix-system-configs/secrets/songsheet/secrets.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix-system-configs/secrets/songsheet/secrets.yaml b/nix-system-configs/secrets/songsheet/secrets.yaml index a3f419f..7755b12 100644 --- a/nix-system-configs/secrets/songsheet/secrets.yaml +++ b/nix-system-configs/secrets/songsheet/secrets.yaml @@ -1,6 +1,6 @@ songsheet: database: - DATABASE_URL: ENC[AES256_GCM,data:7zzRWaGhXjFzNmJpvTjsnWBOMBdXM1hnunoGEZy33myTWpf82UpWwUnGhDQCPH477JZZbCox7/fp3U/G+DvxYKiL6f35fOUyvGRrXT+F8oZK0tqk0NDF/IIroIZi4MdnURgoQbStNObYrScJoJ+n2RJXjlH1BeR+nSQSoApfmVFoQhWd+1/hQA==,iv:iXDxAmvGNnMoGffujlJ1TZagaXa8+fIxaOLtDGkKLuQ=,tag:uNcz0Nbr9Vz5MDUgk9A51w==,type:str] + DATABASE_URL: ENC[AES256_GCM,data:BTt1zpru/wBW0Vb4/My2NiX98cD2Gd8CsdivbtKf/3CJdjNaLzA0VS8ecAGvU9YvYlQri42pzDNxfeMuVF+nWRTtjdvPMFyZV9P7VeZ+05Rz3M1mKvWr37yTzTzi1bpjT+d6FttGIKEAym5VdM53CkSZPLV0S9e8/8Awa0TZ7MTX3Adt8amh,iv:jL7PyOC80zCPAZNdPLip2ngcqAIORM9QxzqKgu0roTM=,tag:JsFr+cJl6z2TTSpVAAyf2Q==,type:str] sops: age: - recipient: age1746rvsvsc3snxfl7cndm222wd5kck4aqj3x7nednlegq0gdjhfcqx0qv7m @@ -21,7 +21,7 @@ sops: V1F4TVEwaGgvUHcySnVQcXBHNzFuTU0KVNh7si39NVWZH9O52L9+gh1evvjotqK9 Zjmb97QR1C2LzEqOrfPuj6Lr86SS4RYSzSq2Oknn9o9SIs/5thR0YQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-02-09T19:41:54Z" - mac: ENC[AES256_GCM,data:tLa/SrMFv9PSNlD409Zfg1H4gF0vTTxIwWiZAoJJmOHyjVRx3TiWNgx/BgZNUexDr9xZxpVMlLa6/PrpFqGk2J3YKpZV/7xZrKCah8H8FBXHO/A6PivgRDMgW6iz9OnEieuYVzVALUiU8txcn9ZwXSPOzyl4hgLKnBKNzqIMjgQ=,iv:AiJXDQBq8rEjUDJduYjVAhfuhX0+axtoHbe5F/+8OqA=,tag:M6jHhAg01e9RNcCcP1YfMQ==,type:str] + lastmodified: "2026-02-09T19:51:51Z" + mac: ENC[AES256_GCM,data:2bro0enEMVx/znh8BPZdXrHAebq5Rej+xN+nSK9lthSNXztw0SXVsblhE7Zr+lcmNpJh7yOoa/buAZrcClM5HljcDL5pwLcHmKPhV/00TH2Pv5QiJww15MlxplwqW6LFmtEzInIF+fMENMU1v6v/1PrNaYYT68boMHEBlxFOXlo=,iv:0aa0G3KX3Gjzxz+rncbCJoENxW5nrlbg/opYGrC8sOc=,tag:4u81P/b5Fs4KQGHMGNZQ5A==,type:str] unencrypted_suffix: _unencrypted version: 3.11.0