Compare commits

..

2 Commits

Author SHA1 Message Date
Øystein Tveit
b821d36f40
bicep/minecraft-heatmap: init 2025-08-25 14:26:37 +02:00
h7x4
0b7fbcac32
modules/grzegorz: use unstable mpv for greg-ng 2025-08-23 14:04:48 +02:00
3 changed files with 16 additions and 8 deletions

8
flake.lock generated
View File

@ -124,11 +124,11 @@
]
},
"locked": {
"lastModified": 1755886476,
"narHash": "sha256-+lHq5z3kXzIM12ltfyXusCXoO8yFMZcRUxmtXCXyZTA=",
"lastModified": 1756124334,
"narHash": "sha256-DXFmSpgI8FrqcdqY7wg5l/lpssWjslHq5ufvyp/5k4o=",
"ref": "refs/heads/main",
"rev": "a1682ba8ed3e6f0a806eef1573f43ecd08cb16fd",
"revCount": 12,
"rev": "83760b1ebcd9722ddf58a4117d29555da65538ad",
"revCount": 13,
"type": "git",
"url": "https://git.pvv.ntnu.no/Projects/minecraft-heatmap.git"
},

View File

@ -1,4 +1,7 @@
{ config, lib, pkgs, ... }:
let
cfg = config.services.minecraft-heatmap;
in
{
sops.secrets."minecraft-heatmap/ssh-key/private" = {
mode = "600";
@ -27,13 +30,16 @@
innovation.pvv.ntnu.no ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNjl3HfsDqmALWCL9uhz9k93RAD2565ndBqUh4N/rvI7MCwEJ6iRCdDev0YzB1Fpg24oriyYoxZRP24ifC2sQf8=
'';
in ''
mkdir -p '${cfg.minecraftLogsDir}'
"${lib.getExe pkgs.rsync}" \
--archive \
--compress \
--verbose \
--progress \
--no-owner \
--no-group \
--rsh="${pkgs.openssh}/bin/ssh -o UserKnownHostsFile=\"${knownHostsFile}\" -i \"$CREDENTIALS_DIRECTORY\"/sshkey" \
minecraft-heatmap-sync@innovation.pvv.ntnu.no:/ \
"$RUNTIME_DIR"/
root@innovation.pvv.ntnu.no:/ \
'${cfg.minecraftLogsDir}'/
'';
};
}

View File

@ -1,4 +1,4 @@
{config, lib, pkgs, ...}:
{ config, lib, pkgs, unstablePkgs, ... }:
let
grg = config.services.greg-ng;
grgw = config.services.grzegorz-webui;
@ -11,6 +11,8 @@ in {
settings.port = 31337;
enableSway = true;
enablePipewire = true;
mpvPackage = unstablePkgs.mpv;
};
systemd.user.services.restart-greg-ng = {