Compare commits

..

1 Commits

Author SHA1 Message Date
Øystein Tveit
37e67c7025
bicep/minecraft-heatmap: init 2025-08-22 20:29:22 +02:00
3 changed files with 8 additions and 16 deletions

8
flake.lock generated
View File

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

View File

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

View File

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