diff --git a/modules/git/default.nix b/modules/git/default.nix
index d52be3f..9d85fc2 100644
--- a/modules/git/default.nix
+++ b/modules/git/default.nix
@@ -48,4 +48,22 @@ in
         };
       };
     };
+
+    environment.systemPackages = let
+      cfg = config.services.forgejo;
+      forgejo-cli = pkgs.writeScriptBin "forgejo-cli" ''
+        #!${pkgs.runtimeShell}
+        cd ${cfg.stateDir}
+        sudo=exec
+        if [[ "$USER" != forgejo ]]; then
+          sudo='exec /run/wrappers/bin/sudo -u ${cfg.user} -g ${cfg.group} --preserve-env=GITEA_WORK_DIR --preserve-env=GITEA_CUSTOM'
+        fi
+        # Note that these variable names will change
+        export GITEA_WORK_DIR=${cfg.stateDir}
+        export GITEA_CUSTOM=${cfg.customDir}
+        $sudo ${lib.getExe cfg.package} "$@"
+      '';
+    in [
+      forgejo-cli
+    ];
   }