refactor(rrv.sh): use rrv.sh flake instead of internal package
This commit is contained in:
parent
87f503352f
commit
7739f03bff
6 changed files with 55 additions and 24 deletions
53
flake.lock
generated
53
flake.lock
generated
|
@ -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=",
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
{ stdenv, ... }:
|
||||
let
|
||||
name = "rrv.sh";
|
||||
version = "0.0.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name version;
|
||||
src = ./.;
|
||||
installPhase = ''
|
||||
cp -r . $out
|
||||
'';
|
||||
}
|
Binary file not shown.
Before Width: | Height: | Size: 5.7 KiB |
|
@ -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>
|
|
@ -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 = [
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue