diff --git a/configuration/default.nix b/configuration/default.nix index 683b144..a12aceb 100644 --- a/configuration/default.nix +++ b/configuration/default.nix @@ -20,8 +20,6 @@ trustedUsers = [ "@wheel" ]; }; - boot.kernelParams = [ "highres=off" "nohz=off" ]; - networking = { hostName = "tlaternet"; diff --git a/configuration/services/configs/minecraft/voor-kia/server.properties b/configuration/services/configs/minecraft/voor-kia/server.properties index 84a8cd5..1c5787e 100644 --- a/configuration/services/configs/minecraft/voor-kia/server.properties +++ b/configuration/services/configs/minecraft/voor-kia/server.properties @@ -5,7 +5,7 @@ allow-nether=true broadcast-console-to-ops=true broadcast-rcon-to-ops=true difficulty=normal -enable-command-block=true +enable-command-block=false enable-jmx-monitoring=false enable-query=false enable-rcon=false diff --git a/configuration/services/minecraft.nix b/configuration/services/minecraft.nix index bf8f58f..9b77c09 100644 --- a/configuration/services/minecraft.nix +++ b/configuration/services/minecraft.nix @@ -90,7 +90,6 @@ in { }; }; - extraOptions = [ "--cpus=1.0" ]; autoStart = false; ports = [ "25565:25565" ]; volumes = [ @@ -102,31 +101,4 @@ in { "${whitelist}:/var/lib/minecraft/whitelist.json:ro" ]; }; - - systemd.timers.podman-minecraft-voor-kia-off = { - description = "Turns off the minecraft server every day at 4 am"; - wantedBy = [ "podman-minecraft-voor-kia.service" ]; - timerConfig = { - Unit = "podman-minecraft-voor-kia-starter@stop.service"; - OnCalendar = "04:00:00"; - }; - }; - - systemd.timers.podman-minecraft-voor-kia-on = { - description = "Turns on the minecraft server every day at 2 pm"; - wantedBy = [ "podman-minecraft-voor-kia.service" ]; - timerConfig = { - Unit = "podman-minecraft-voor-kia-starter@start.service"; - OnCalendar = "14:00:00"; - }; - }; - - systemd.services."podman-minecraft-voor-kia-starter@" = { - description = "Unit to stop/start the minecraft server"; - serviceConfig = { - ExecStart = - "${pkgs.systemd}/bin/systemctl %i podman-minecraft-voor-kia.service"; - Type = "oneshot"; - }; - }; } diff --git a/flake.lock b/flake.lock index ee275c8..b2d4187 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1629481132, - "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "lastModified": 1622445595, + "narHash": "sha256-m+JRe6Wc5OZ/mKw2bB3+Tl0ZbtyxxxfnAWln8Q5qs+Y=", "owner": "numtide", "repo": "flake-utils", - "rev": "997f7efcb746a9c140ce1f13c72263189225f482", + "rev": "7d706970d94bc5559077eb1a6600afddcd25a7c8", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1629744693, - "narHash": "sha256-guZxgF5v8Avqpdu5M/F3ygZ4f67Y6ruS7y2kA5yUhZE=", + "lastModified": 1623143341, + "narHash": "sha256-a8NjpJVvJkb3ehu/KP1OaWwlRexom2D7lQEH5uCO9yA=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "de40acde6c056a7c5f3c9ad4dca0c172fa35d207", + "rev": "fccbee72df707c3fb074854668deee6e1ff02351", "type": "github" }, "original": { @@ -53,11 +53,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1629379628, - "narHash": "sha256-dI8wpEo7wIVWoTUk2oyWFUnlVHNKLs+ren1TqITN1mI=", + "lastModified": 1622922048, + "narHash": "sha256-nTyKxe0n7l/4HSmYaIN+63WQrvHrTJY6drSwP7bMqhU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a1007637cea374bd1bafd754cfd5388894c49129", + "rev": "5de44c15758465f8ddf84d541ba300b48e56eda4", "type": "github" }, "original": { diff --git a/pkgs/minecraft/forge-server.nix b/pkgs/minecraft/forge-server.nix index 2dea39a..22df91f 100644 --- a/pkgs/minecraft/forge-server.nix +++ b/pkgs/minecraft/forge-server.nix @@ -7,7 +7,6 @@ let mirror = "https://files.minecraftforge.net/maven/net/minecraftforge/forge"; src = fetchurl { url = "${mirror}/${version}/forge-${version}-installer.jar"; - curlOpts = "--globoff"; # Forge doesn't seem to like newer shas sha1 = "e97821e5431bdcaa46e12048769922e2cdb5e2e1"; };