diff --git a/flake.lock b/flake.lock index 507ff62..b56aa85 100644 --- a/flake.lock +++ b/flake.lock @@ -471,6 +471,7 @@ "nixpkgs": "nixpkgs", "nur": "nur", "nvf": "nvf", + "rrv-sh": "rrv-sh", "rrvsh-nixpkgs": "rrvsh-nixpkgs", "sops-nix": "sops-nix", "stable-diffusion-webui-nix": "stable-diffusion-webui-nix", @@ -479,6 +480,26 @@ "text": "text" } }, + "rrv-sh": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751721838, + "narHash": "sha256-702c0fbgpUuEuQsduGJ9I5bSrCLYEG88SPuZXcSQqTs=", + "owner": "rrvsh", + "repo": "rrv.sh", + "rev": "e00c1c2607b55f43ef74b5f555f62838f4fe5963", + "type": "github" + }, + "original": { + "owner": "rrvsh", + "repo": "rrv.sh", + "type": "github" + } + }, "rrvsh-nixpkgs": { "locked": { "lastModified": 1750146550, diff --git a/flake.nix b/flake.nix index 1f706c3..86b2997 100644 --- a/flake.nix +++ b/flake.nix @@ -102,6 +102,11 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "dedupe_flake-utils"; }; + # my website :) + rrv-sh = { + url = "github:rrvsh/rrv.sh"; + inputs.nixpkgs.follows = "nixpkgs"; + }; ### DEDUPE ### diff --git a/nix/manifest.nix b/nix/manifest.nix index 3b7f542..aa91702 100644 --- a/nix/manifest.nix +++ b/nix/manifest.nix @@ -73,6 +73,8 @@ domain = "git.rrv.sh"; openFirewall = true; }; + rrv-sh.enable = true; + rrv-sh.domain = "rrv.sh"; }; }; }; diff --git a/nix/modules/server/web-apps/rrv-sh.nix b/nix/modules/server/web-apps/rrv-sh.nix new file mode 100644 index 0000000..d4c801d --- /dev/null +++ b/nix/modules/server/web-apps/rrv-sh.nix @@ -0,0 +1,23 @@ +{ config, inputs, ... }: +let + inherit (config.flake.lib.services) mkWebApp; +in +{ + flake.modules.nixos.default = + { config, ... }: + let + 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; + }; + } + // { + imports = [ inputs.rrv-sh.nixosModules.default ]; + }; +}