pederbs/config
pederbs/config
2
1
Fork 0
Code Issues Pull Requests Releases Activity

migrate refleksjon and roroslyd to flake inputs

Browse Source
This commit is contained in:
Peder Bergebakken Sundt 2024-12-26 01:18:33 +01:00
parent f143b3b5eb
commit 6301733ee8
4 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
flake.lock generated
View File

@ -401,6 +401,22 @@
"type": "github"
}
},
"refleksjon-net": {
"flake": false,
"locked": {
"lastModified": 1656371921,
"narHash": "sha256-O+lNqD2LuESKM+S+AljF2SzIxzK05xdZqiLhylTQ2ls=",
"ref": "refs/heads/main",
"rev": "c1b91e369bf411e44534334595d4481cb59bd129",
"revCount": 8,
"type": "git",
"url": "ssh://gitea@git.pvv.ntnu.no:2222/pederbs/refleksjon.net.git"
},
"original": {
"type": "git",
"url": "ssh://gitea@git.pvv.ntnu.no:2222/pederbs/refleksjon.net.git"
}
},
"root": {
"inputs": {
"home-manager-2305": "home-manager-2305",
@ -425,6 +441,8 @@
"nixpkgs-2411": "nixpkgs-2411",
"nixpkgs-edge": "nixpkgs-edge",
"nixpkgs-test": "nixpkgs-test",
"refleksjon-net": "refleksjon-net",
"roroslyd-no": "roroslyd-no",
"sops-nix-2305": "sops-nix-2305",
"sops-nix-2311": "sops-nix-2311",
"sops-nix-2405": "sops-nix-2405",
@ -432,6 +450,22 @@
"sops-nix-edge": "sops-nix-edge"
}
},
"roroslyd-no": {
"flake": false,
"locked": {
"lastModified": 1656261486,
"narHash": "sha256-Rud5bBUuPgIC5UAGtyuYhUtXhN174UCWDoLUWWc/n6U=",
"ref": "refs/heads/main",
"rev": "fb7b0a7e70754cf368de7d7c469dabe71b2f1c78",
"revCount": 4,
"type": "git",
"url": "ssh://gitea@git.pvv.ntnu.no:2222/pederbs/roroslyd.no.git"
},
"original": {
"type": "git",
"url": "ssh://gitea@git.pvv.ntnu.no:2222/pederbs/roroslyd.no.git"
}
},
"sops-nix-2305": {
"inputs": {
"nixpkgs": [

5
flake.nix
View File

@ -82,6 +82,11 @@
/**/
#pbsds-papers.url = "git+ssh://git@github.com/pbsds/papers.git";
roroslyd-no.url = "git+ssh://gitea@git.pvv.ntnu.no:2222/pederbs/roroslyd.no.git";
roroslyd-no.flake = false;
refleksjon-net.url = "git+ssh://gitea@git.pvv.ntnu.no:2222/pederbs/refleksjon.net.git";
refleksjon-net.flake = false;
};
nixConfig.extra-substituters = [

15
profiles/http/sites/refleksjon-no.nix
View File

@ -1,20 +1,11 @@
{ config, pkgs, lib, mkDomain, ... }:
{ config, pkgs, lib, inputs, mkDomain, ... }:
{
# refleksjon.no
services.nginx.virtualHosts.${mkDomain "refleksjon"} = let
refleksjon-net = pkgs.fetchFromGitea rec {
name = repo;
domain = "gitea.noximilien.pbsds.net";
owner = "pbsds";
repo = "refleksjon.net";
rev = "c1b91e369bf411e44534334595d4481cb59bd129";
sha256 = "O+lNqD2LuESKM+S+AljF2SzIxzK05xdZqiLhylTQ2ls=";
};
in {
services.nginx.virtualHosts.${mkDomain "refleksjon"} = {
forceSSL = true; # addSSL = true;
enableACME = true; #useACMEHost = acmeDomain;
root = "${refleksjon-net}/www.refleksjon.net";
root = "${inputs.refleksjon-net}/www.refleksjon.net";
};
}

16
profiles/http/sites/roroslyd-no.nix
View File

@ -1,21 +1,11 @@
{ config, pkgs, lib, mkDomain, ... }:
{ config, pkgs, lib, inputs, mkDomain, ... }:
{
# roroslyd.no
services.nginx.virtualHosts.${mkDomain "roroslyd"} = let
roroslyd-no = pkgs.fetchFromGitea rec {
name = repo;
domain = "gitea.noximilien.pbsds.net";
owner = "pbsds";
repo = "roroslyd.no";
#rev = "v${version}";
rev = "fb7b0a7e70754cf368de7d7c469dabe71b2f1c78";
sha256 = "Rud5bBUuPgIC5UAGtyuYhUtXhN174UCWDoLUWWc/n6U=";
};
in {
services.nginx.virtualHosts.${mkDomain "roroslyd"} = {
forceSSL = true; # addSSL = true;
enableACME = true; #useACMEHost = acmeDomain;
root = "${roroslyd-no}/www.roroslyd.no";
root = "${inputs.roroslyd-no}/www.roroslyd.no";
};
}