nyanloutre/nixos-config
1
1
Fork 1
Code Issues Pull requests Releases Wiki Activity

maj 20.03

Browse source
This commit is contained in:
nyanloutre 2020-03-02 22:38:36 +01:00
parent 72d0802b67
commit ec60e54c9a
4 changed files with 41 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
systems/LoutreOS/configuration.nix
View file

@ -33,7 +33,7 @@ in
];
nixpkgs.config.allowUnfree = false;
nixpkgs.config.allowUnfreePredicate = (pkg: builtins.elem (builtins.parseDrvName pkg.pname).name [ "factorio-headless" "perl5.30.0-slimserver" "minecraft-server" ]);
nixpkgs.config.allowUnfreePredicate = (pkg: builtins.elem (builtins.parseDrvName pkg.pname).name [ "factorio-headless" "perl5.30.1-slimserver" "minecraft-server" ]);
services.zfs = {
autoSnapshot.enable = true;

58
systems/LoutreOS/services.nix
View file

@ -262,36 +262,36 @@ in
};
};
systemd.services.minecraft-overviewer =
let
clientJar = pkgs.fetchurl {
url = "https://overviewer.org/textures/1.14";
sha256 = "0fij9wac7vj6h0kd3mfhqpn0w9gl8pbs9vs9s085zajm0szpr44k";
name = "client.jar";
};
configFile = pkgs.runCommand "overviewer-config" { CLIENT_JAR = clientJar; } ''
substitute ${./config-overviewer.py} $out \
--subst-var CLIENT_JAR
'';
in
{
script = ''
${pkgs.minecraft-overviewer}/bin/overviewer.py --config ${configFile}
${pkgs.minecraft-overviewer}/bin/overviewer.py --config ${configFile} --genpoi
rm /var/www/minecraft-overviewer/progress.json
'';
serviceConfig = {
User = "nginx";
Group = "nginx";
};
};
# systemd.services.minecraft-overviewer =
# let
# clientJar = pkgs.fetchurl {
# url = "https://overviewer.org/textures/1.14";
# sha256 = "0fij9wac7vj6h0kd3mfhqpn0w9gl8pbs9vs9s085zajm0szpr44k";
# name = "client.jar";
# };
# configFile = pkgs.runCommand "overviewer-config" { CLIENT_JAR = clientJar; } ''
# substitute ${./config-overviewer.py} $out \
# --subst-var CLIENT_JAR
# '';
# in
# {
# script = ''
# ${pkgs.minecraft-overviewer}/bin/overviewer.py --config ${configFile}
# ${pkgs.minecraft-overviewer}/bin/overviewer.py --config ${configFile} --genpoi
# rm /var/www/minecraft-overviewer/progress.json
# '';
# serviceConfig = {
# User = "nginx";
# Group = "nginx";
# };
# };
systemd.timers.minecraft-overviewer = {
wantedBy = [ "multi-user.target" ];
timerConfig = {
OnCalendar = "*-*-* 04:00:00";
};
};
# systemd.timers.minecraft-overviewer = {
# wantedBy = [ "multi-user.target" ];
# timerConfig = {
# OnCalendar = "*-*-* 04:00:00";
# };
# };
systemd.packages = with pkgs; [
tgt