From 7739f03bffdd6a0afadf905ae8c05d376a1868c2 Mon Sep 17 00:00:00 2001 From: Mohammad Rafiq Date: Tue, 24 Jun 2025 21:19:25 +0800 Subject: [PATCH] refactor(rrv.sh): use rrv.sh flake instead of internal package --- flake.lock | 53 +++++++++++++++++++++++- flake.nix | 1 + packages/rrv.sh/default.nix | 12 ------ packages/rrv.sh/favicon.ico | Bin 5886 -> 0 bytes packages/rrv.sh/index.html | 10 ----- systems/x86_64-linux/apollo/default.nix | 3 +- 6 files changed, 55 insertions(+), 24 deletions(-) delete mode 100644 packages/rrv.sh/default.nix delete mode 100644 packages/rrv.sh/favicon.ico delete mode 100644 packages/rrv.sh/index.html 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 57499ca78a4ac8717d6e8e03a31d4421e31da7ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5886 zcmZQzU}RuqNJtQ1U}Runcp=8XAjZJJpuxbvkifveaDV|M&%yu(LSPb12rw`(fG~*j z|Nno6Iq$wPJbQMJ!SdNVhNz?W7#x?pW4KzqhM_v@8-r%^6b47jXADb%ni-M|uQCWE zRWn!$OkofZfSCX?WfYHwz-S1JhQOc+0sasFiEzt*{tr-9S7SqAOsEJJia+#fJXF;u zUDf+oRGz7jl@)dA#(50xmb|krAKiOKr|uz=G+;OI=*w~&YUBp79`Jq=FAxo{pQR$kUkI- zFaC4p9a#QP$9XVKi1^WQ{saI2|L;$9^b=AFmVeRFbN*}OnKx%T2nIe_Jzq!9)X>n# zGiS~ar=H=($O9Su@a3Y~NAMaO%vIvm<~LqA-N2P?R$ zq@<)e=ggZE9UmC@Kk$NL8!V1W@GE_|qzZQOB_$;#r8#FF@SNyp_@vJZ5kytYz`*cT zDgLAqSUo7IX@Vk+r{k|uETmjM7bzG$x)0QSb8M|3M|q7hv@-IyyRfG;!scGbcJaI*z!U z7knr=M-G(OK*o1;oST4YHdN%ynPVwFXBq_s58AzFVBiNC-vRLmQ~@T%_vWCWprEj^ z;RpUNAp1HXxdBrlOoZ>{-Mg2KjqTt6aRI3(q@01_ZfIz1sIlOmGcGl2oIu7sNsR_#G zg!~(%U0z;ZzPsZLNc{x{f;I$cl$TeOm+#)bd#7e3sC03`A404*+ABK1R-8nr2Zb{( z49X(y<>loyCzWP`%qQdlkou1H@*O=Vm6Sm08CX`~k6}oj>gYH#NeNtyajjbAh08G@ zahUpZmy|%^!@#g=)v5&`2^^RQTuO9weBiwcRl$Wi_QVTQ38_&+eh+3XMC><0D+a5W$JKgh$>e2{;@ z4`cs87PtRk4-@|&!GK^hFx11ue;~2{Fu>IOdH#=qf&UL!(GTbU3=Hfuz&d_7{%2rp z<^Z!lF#c~~e!u}X^#enF1M>$4u!}x0$Tu+mfU(&Ru>XOW`h$V_0Q(OJ`ws&n1N#RE z8`Q(#e*ksS2L=ZI2AGE*Ft9PeJp6-!fdS^pKMV{In8EozU|NlQQFxbP` z4;YyL!_+r0F#m%EGy?-WEYSZkFtGoCs`l?sf@*l*uhr0P6 z0|SFS14R6P0|SG7BNF=oIIRBvKfu6X{{S3TV0Jw$_8u@u{Qn1aG$=s+LDl?VsQ>>5 n%KpRnAD&YFG5r7k4;DZT_5c4LgjxnN{0o%*2WlXcJ5neBxf5vU 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 = [