mirror of
https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git
synced 2025-09-03 01:26:22 +02:00
Compare commits
2 Commits
37e67c7025
...
b821d36f40
Author | SHA1 | Date | |
---|---|---|---|
![]() |
b821d36f40 | ||
![]() |
0b7fbcac32 |
8
flake.lock
generated
8
flake.lock
generated
@ -124,11 +124,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755886476,
|
"lastModified": 1756124334,
|
||||||
"narHash": "sha256-+lHq5z3kXzIM12ltfyXusCXoO8yFMZcRUxmtXCXyZTA=",
|
"narHash": "sha256-DXFmSpgI8FrqcdqY7wg5l/lpssWjslHq5ufvyp/5k4o=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "a1682ba8ed3e6f0a806eef1573f43ecd08cb16fd",
|
"rev": "83760b1ebcd9722ddf58a4117d29555da65538ad",
|
||||||
"revCount": 12,
|
"revCount": 13,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.pvv.ntnu.no/Projects/minecraft-heatmap.git"
|
"url": "https://git.pvv.ntnu.no/Projects/minecraft-heatmap.git"
|
||||||
},
|
},
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
{ 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";
|
||||||
@ -27,13 +30,16 @@
|
|||||||
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" \
|
||||||
minecraft-heatmap-sync@innovation.pvv.ntnu.no:/ \
|
root@innovation.pvv.ntnu.no:/ \
|
||||||
"$RUNTIME_DIR"/
|
'${cfg.minecraftLogsDir}'/
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{config, lib, pkgs, ...}:
|
{ config, lib, pkgs, unstablePkgs, ... }:
|
||||||
let
|
let
|
||||||
grg = config.services.greg-ng;
|
grg = config.services.greg-ng;
|
||||||
grgw = config.services.grzegorz-webui;
|
grgw = config.services.grzegorz-webui;
|
||||||
@ -11,6 +11,8 @@ 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 = {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user