From 92971a42a7de942c66a247a4b8afcd46f0389659 Mon Sep 17 00:00:00 2001
From: Mohammad Rafiq <rafiq@rrv.sh>
Date: Sat, 28 Jun 2025 15:54:10 +0800
Subject: [PATCH] refactor(rrv.sh): change rrv.sh to use service module

---
 flake.lock                                    | 28 ++++---------------
 flake.nix                                     |  1 +
 .../nixos/server/web-apps/rrv-sh/default.nix  | 16 +++++++++++
 systems/x86_64-linux/apollo/default.nix       |  8 ++----
 4 files changed, 25 insertions(+), 28 deletions(-)
 create mode 100644 modules/nixos/server/web-apps/rrv-sh/default.nix

diff --git a/flake.lock b/flake.lock
index 99e217c..fb0220c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -923,21 +923,20 @@
         "sops-nix": "sops-nix",
         "stable-diffusion-webui-nix": "stable-diffusion-webui-nix",
         "stylix": "stylix",
-        "systems": "systems_3",
+        "systems": "systems_2",
         "zjstatus": "zjstatus"
       }
     },
     "rrv-sh": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3",
-        "systems": "systems_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1751063358,
-        "narHash": "sha256-j5wlUaZ9I68naN5s8Qp8nk724ifS0Xa5lHK0djhSX/Q=",
+        "lastModified": 1751096589,
+        "narHash": "sha256-/oqIAR0C2OlHeu/+2qCYbHIRR/CwIUh2AuGu3wGbm3Q=",
         "ref": "refs/heads/prime",
-        "rev": "e4f7512702bf4fca25b4b80d53dcb726799bd76d",
-        "revCount": 2,
+        "rev": "c7922e3bf2cffc5a67a55c1667431bab8eb155c9",
+        "revCount": 11,
         "type": "git",
         "url": "ssh://forgejo@git.rrv.sh/rrvsh/rrv.sh"
       },
@@ -1117,21 +1116,6 @@
       }
     },
     "systems_2": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_3": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
diff --git a/flake.nix b/flake.nix
index ae6edbb..007ec14 100644
--- a/flake.nix
+++ b/flake.nix
@@ -83,6 +83,7 @@
         sops-nix.nixosModules.sops
         stylix.nixosModules.stylix
         stable-diffusion-webui-nix.nixosModules.default
+        rrv-sh.nixosModules.default
       ];
       homes.modules = with inputs; [
         impermanence.homeManagerModules.impermanence
diff --git a/modules/nixos/server/web-apps/rrv-sh/default.nix b/modules/nixos/server/web-apps/rrv-sh/default.nix
new file mode 100644
index 0000000..7954ba2
--- /dev/null
+++ b/modules/nixos/server/web-apps/rrv-sh/default.nix
@@ -0,0 +1,16 @@
+{ config, lib, ... }:
+let
+  inherit (lib.pantheon.modules) mkWebApp;
+  cfg = config.server.web-apps.rrv-sh;
+in
+mkWebApp {
+  inherit config;
+  name = "rrv-sh";
+  defaultPort = 2309;
+  extraConfig = {
+    services.rrv-sh = {
+      enable = true;
+      inherit (cfg) port;
+    };
+  };
+}
diff --git a/systems/x86_64-linux/apollo/default.nix b/systems/x86_64-linux/apollo/default.nix
index 44c9bc1..6e9ba08 100644
--- a/systems/x86_64-linux/apollo/default.nix
+++ b/systems/x86_64-linux/apollo/default.nix
@@ -39,17 +39,13 @@
       forgejo.openFirewall = true;
       glance.enable = true;
       glance.domain = "glance.bwfiq.com";
+      rrv-sh.enable = true;
+      rrv-sh.domain = "rrv.sh";
     };
     web-servers = {
       enableSSL = true;
       nginx = {
         enable = true;
-        pages = [
-          {
-            domain = "rrv.sh";
-            root = inputs.rrv-sh.packages.x86_64-linux.default;
-          }
-        ];
         proxies = [
           {
             source = "aenyrathia.wiki";