diff --git a/nixos/modules/services/misc/forgejo.nix b/nixos/modules/services/misc/forgejo.nix
index ebf795fe2..9df553779 100644
--- a/nixos/modules/services/misc/forgejo.nix
+++ b/nixos/modules/services/misc/forgejo.nix
@@ -562,24 +562,24 @@ in
       };
     };
 
-    services.forgejo.secrets = {
-      security = {
-        SECRET_KEY = "${cfg.customDir}/conf/secret_key";
-        INTERNAL_TOKEN = "${cfg.customDir}/conf/internal_token";
-      };
+    # services.forgejo.secrets = {
+    #   security = {
+    #     SECRET_KEY = "${cfg.customDir}/conf/secret_key";
+    #     INTERNAL_TOKEN = "${cfg.customDir}/conf/internal_token";
+    #   };
 
-      oauth2 = {
-        JWT_SECRET = "${cfg.customDir}/conf/oauth2_jwt_secret";
-      };
+    #   oauth2 = {
+    #     JWT_SECRET = "${cfg.customDir}/conf/oauth2_jwt_secret";
+    #   };
 
-      database = mkIf (cfg.database.passwordFile != null) {
-        PASSWD = cfg.database.passwordFile;
-      };
+    #   database = mkIf (cfg.database.passwordFile != null) {
+    #     PASSWD = cfg.database.passwordFile;
+    #   };
 
-      server = mkIf cfg.lfs.enable {
-        LFS_JWT_SECRET = "${cfg.customDir}/conf/lfs_jwt_secret";
-      };
-    };
+    #   server = mkIf cfg.lfs.enable {
+    #     LFS_JWT_SECRET = "${cfg.customDir}/conf/lfs_jwt_secret";
+    #   };
+    # };
 
     services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) {
       enable = mkDefault true;
@@ -637,36 +637,36 @@ in
       "z '${cfg.lfs.contentDir}' 0750 ${cfg.user} ${cfg.group} - -"
     ];
 
-    systemd.services.forgejo-secrets = mkIf (!cfg.useWizard) {
-      description = "Forgejo secret bootstrap helper";
-      script = ''
-        if [ ! -s '${cfg.secrets.security.SECRET_KEY}' ]; then
-            ${exe} generate secret SECRET_KEY > '${cfg.secrets.security.SECRET_KEY}'
-        fi
-
-        if [ ! -s '${cfg.secrets.oauth2.JWT_SECRET}' ]; then
-            ${exe} generate secret JWT_SECRET > '${cfg.secrets.oauth2.JWT_SECRET}'
-        fi
-
-        ${optionalString cfg.lfs.enable ''
-          if [ ! -s '${cfg.secrets.server.LFS_JWT_SECRET}' ]; then
-              ${exe} generate secret LFS_JWT_SECRET > '${cfg.secrets.server.LFS_JWT_SECRET}'
-          fi
-        ''}
-
-        if [ ! -s '${cfg.secrets.security.INTERNAL_TOKEN}' ]; then
-            ${exe} generate secret INTERNAL_TOKEN > '${cfg.secrets.security.INTERNAL_TOKEN}'
-        fi
-      '';
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-        User = cfg.user;
-        Group = cfg.group;
-        ReadWritePaths = [ cfg.customDir ];
-        UMask = "0077";
-      };
-    };
+    # systemd.services.forgejo-secrets = mkIf (!cfg.useWizard) {
+    #   description = "Forgejo secret bootstrap helper";
+    #   script = ''
+    #     if [ ! -s '${cfg.secrets.security.SECRET_KEY}' ]; then
+    #         ${exe} generate secret SECRET_KEY > '${cfg.secrets.security.SECRET_KEY}'
+    #     fi
+
+    #     if [ ! -s '${cfg.secrets.oauth2.JWT_SECRET}' ]; then
+    #         ${exe} generate secret JWT_SECRET > '${cfg.secrets.oauth2.JWT_SECRET}'
+    #     fi
+
+    #     ${optionalString cfg.lfs.enable ''
+    #       if [ ! -s '${cfg.secrets.server.LFS_JWT_SECRET}' ]; then
+    #           ${exe} generate secret LFS_JWT_SECRET > '${cfg.secrets.server.LFS_JWT_SECRET}'
+    #       fi
+    #     ''}
+
+    #     if [ ! -s '${cfg.secrets.security.INTERNAL_TOKEN}' ]; then
+    #         ${exe} generate secret INTERNAL_TOKEN > '${cfg.secrets.security.INTERNAL_TOKEN}'
+    #     fi
+    #   '';
+    #   serviceConfig = {
+    #     Type = "oneshot";
+    #     RemainAfterExit = true;
+    #     User = cfg.user;
+    #     Group = cfg.group;
+    #     ReadWritePaths = [ cfg.customDir ];
+    #     UMask = "0077";
+    #   };
+    # };
 
     systemd.services.forgejo = {
       description = "Forgejo (Beyond coding. We forge.)";
@@ -678,20 +678,20 @@ in
       ]
       ++ optionals useMysql [
         "mysql.service"
-      ]
-      ++ optionals (!cfg.useWizard) [
-        "forgejo-secrets.service"
       ];
+      # ++ optionals (!cfg.useWizard) [
+      #   "forgejo-secrets.service"
+      # ];
       requires =
         optionals (cfg.database.createDatabase && usePostgresql) [
           "postgresql.target"
         ]
         ++ optionals (cfg.database.createDatabase && useMysql) [
           "mysql.service"
-        ]
-        ++ optionals (!cfg.useWizard) [
-          "forgejo-secrets.service"
         ];
+      # ++ optionals (!cfg.useWizard) [
+      #   "forgejo-secrets.service"
+      # ];
       wantedBy = [ "multi-user.target" ];
       path = [
         cfg.package