rrvsh/pantheon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(rrv.sh): use rrv.sh flake instead of internal package

Browse source
This commit is contained in:
Mohammad Rafiq 2025-06-24 21:19:25 +08:00
parent 87f503352f
commit 7739f03bff
No known key found for this signature in database
6 changed files with 55 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

53
flake.lock generated
View file

@ -754,6 +754,22 @@
"type": "github" "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": { "nixspect": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -900,16 +916,36 @@
"nur": "nur", "nur": "nur",
"nvf": "nvf", "nvf": "nvf",
"python-flexseal": "python-flexseal", "python-flexseal": "python-flexseal",
"rrv-sh": "rrv-sh",
"rrvsh-nixpkgs": "rrvsh-nixpkgs", "rrvsh-nixpkgs": "rrvsh-nixpkgs",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay",
"snowfall-lib": "snowfall-lib", "snowfall-lib": "snowfall-lib",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stable-diffusion-webui-nix": "stable-diffusion-webui-nix", "stable-diffusion-webui-nix": "stable-diffusion-webui-nix",
"stylix": "stylix", "stylix": "stylix",
"systems": "systems_2", "systems": "systems_3",
"zjstatus": "zjstatus" "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": { "rrvsh-nixpkgs": {
"locked": { "locked": {
"lastModified": 1748869769, "lastModified": 1748869769,
@ -1081,6 +1117,21 @@
} }
}, },
"systems_2": { "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": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

1
flake.nix
View file

@ -2,6 +2,7 @@
inputs = { inputs = {
crane.url = "github:ipetkov/crane"; crane.url = "github:ipetkov/crane";
rrv-sh.url = "git+ssh://forgejo@git.rrv.sh/rrvsh/rrv.sh";
disko.inputs.nixpkgs.follows = "nixpkgs"; disko.inputs.nixpkgs.follows = "nixpkgs";
disko.url = "github:nix-community/disko"; disko.url = "github:nix-community/disko";
flake-compat.url = "github:edolstra/flake-compat"; flake-compat.url = "github:edolstra/flake-compat";

12
packages/rrv.sh/default.nix
View file

@ -1,12 +0,0 @@
{ stdenv, ... }:
let
name = "rrv.sh";
version = "0.0.1";
in
stdenv.mkDerivation {
inherit name version;
src = ./.;
installPhase = ''
cp -r . $out
'';
}

BIN
packages/rrv.sh/favicon.ico
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.7 KiB

10
packages/rrv.sh/index.html
View file

@ -1,10 +0,0 @@
<html>
<head>
<meta charset="utf-8">
<title>rrv.sh</title>
<link rel="icon" type="image/x-icon" href="favicon.ico">
</head>
<body>
<h1>hi</h1>
</body>
</html>

3
systems/x86_64-linux/apollo/default.nix
View file

@ -1,6 +1,7 @@
{ {
lib, lib,
pkgs, pkgs,
inputs,
... ...
}: }:
{ {
@ -46,7 +47,7 @@
pages = [ pages = [
{ {
domain = "rrv.sh"; domain = "rrv.sh";
root = pkgs.pantheon."rrv.sh"; root = inputs.rrv-sh.packages.x86_64-linux.default;
} }
]; ];
proxies = [ proxies = [