diff --git a/flake.lock b/flake.lock
index 848630f..3313aae 100644
--- a/flake.lock
+++ b/flake.lock
@@ -754,6 +754,22 @@
"type": "github"
}
},
+ "nixpkgs_3": {
+ "locked": {
+ "lastModified": 1750506804,
+ "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "4206c4cb56751df534751b058295ea61357bbbaa",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"nixspect": {
"inputs": {
"nixpkgs": [
@@ -900,16 +916,36 @@
"nur": "nur",
"nvf": "nvf",
"python-flexseal": "python-flexseal",
+ "rrv-sh": "rrv-sh",
"rrvsh-nixpkgs": "rrvsh-nixpkgs",
"rust-overlay": "rust-overlay",
"snowfall-lib": "snowfall-lib",
"sops-nix": "sops-nix",
"stable-diffusion-webui-nix": "stable-diffusion-webui-nix",
"stylix": "stylix",
- "systems": "systems_2",
+ "systems": "systems_3",
"zjstatus": "zjstatus"
}
},
+ "rrv-sh": {
+ "inputs": {
+ "nixpkgs": "nixpkgs_3",
+ "systems": "systems_2"
+ },
+ "locked": {
+ "lastModified": 1750770978,
+ "narHash": "sha256-b+KmHA78k9KzMPrurvbHEfB+ezezPOls0g/idYYsl+o=",
+ "ref": "refs/heads/prime",
+ "rev": "fc489e80f074464802fff4d4bb2319aa786661ea",
+ "revCount": 1,
+ "type": "git",
+ "url": "ssh://forgejo@git.rrv.sh/rrvsh/rrv.sh"
+ },
+ "original": {
+ "type": "git",
+ "url": "ssh://forgejo@git.rrv.sh/rrvsh/rrv.sh"
+ }
+ },
"rrvsh-nixpkgs": {
"locked": {
"lastModified": 1748869769,
@@ -1081,6 +1117,21 @@
}
},
"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 c04994a..ae6edbb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,6 +2,7 @@
inputs = {
crane.url = "github:ipetkov/crane";
+ rrv-sh.url = "git+ssh://forgejo@git.rrv.sh/rrvsh/rrv.sh";
disko.inputs.nixpkgs.follows = "nixpkgs";
disko.url = "github:nix-community/disko";
flake-compat.url = "github:edolstra/flake-compat";
diff --git a/packages/rrv.sh/default.nix b/packages/rrv.sh/default.nix
deleted file mode 100644
index 8b2b852..0000000
--- a/packages/rrv.sh/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, ... }:
-let
- name = "rrv.sh";
- version = "0.0.1";
-in
-stdenv.mkDerivation {
- inherit name version;
- src = ./.;
- installPhase = ''
- cp -r . $out
- '';
-}
diff --git a/packages/rrv.sh/favicon.ico b/packages/rrv.sh/favicon.ico
deleted file mode 100644
index 57499ca..0000000
Binary files a/packages/rrv.sh/favicon.ico and /dev/null differ
diff --git a/packages/rrv.sh/index.html b/packages/rrv.sh/index.html
deleted file mode 100644
index cf567af..0000000
--- a/packages/rrv.sh/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
- rrv.sh
-
-
-
- hi
-
-
diff --git a/systems/x86_64-linux/apollo/default.nix b/systems/x86_64-linux/apollo/default.nix
index 6085744..44c9bc1 100644
--- a/systems/x86_64-linux/apollo/default.nix
+++ b/systems/x86_64-linux/apollo/default.nix
@@ -1,6 +1,7 @@
{
lib,
pkgs,
+ inputs,
...
}:
{
@@ -46,7 +47,7 @@
pages = [
{
domain = "rrv.sh";
- root = pkgs.pantheon."rrv.sh";
+ root = inputs.rrv-sh.packages.x86_64-linux.default;
}
];
proxies = [