From 6a2a477eda37aeeaba82304cd5992b0b0c4ba83d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 25 Nov 2024 01:18:07 -0500 Subject: [PATCH] cleanup + minecraft changes --- configuration.nix | 9 +++++++++ flake.lock | 12 ++++++------ services/caddy.nix | 17 +++++++++++++++-- services/minecraft.nix | 31 +++++++++++++++++++------------ 4 files changed, 49 insertions(+), 20 deletions(-) diff --git a/configuration.nix b/configuration.nix index d1abb25..4816fd0 100644 --- a/configuration.nix +++ b/configuration.nix @@ -281,6 +281,15 @@ password = builtins.readFile ./secrets/murmur_password; }; + # services.botamusique = { + # enable = true; + # settings = { + # server = {port = config.services.murmur.port; + # password = config.services.murmur.password; + # }; + # }; + # }; + services.postgresql = { enable = true; package = pkgs.postgresql_16; diff --git a/flake.lock b/flake.lock index 4d8c75f..0365f42 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1732153840, - "narHash": "sha256-lt8Gdx6TNheby/9lRNE1GMP3vkdpLaXmyHQk+ZvYNAY=", + "lastModified": 1732499634, + "narHash": "sha256-RFtqNl1OOi5uKxP2UwYKz4zknpG7CnaocqOf7jcp1AY=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "8325d463c1c424f2e6edeef2010c0d902a37b3d3", + "rev": "6f29ed33273eef383a33ac7e10e6cfb4949ef3d4", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1732483221, + "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", "type": "github" }, "original": { diff --git a/services/caddy.nix b/services/caddy.nix index 5435caf..f740e3f 100644 --- a/services/caddy.nix +++ b/services/caddy.nix @@ -2,6 +2,7 @@ config, service_configs, username, + pkgs, ... }: { @@ -34,19 +35,27 @@ ''; "bitmagnet.${service_configs.https.domain}".extraConfig = '' - tls internal + # tls internal ${import ../secrets/caddy_auth.nix} reverse_proxy ${service_configs.https.wg_ip}:${builtins.toString service_configs.ports.bitmagnet} ''; "torrent.${service_configs.https.domain}".extraConfig = '' - tls internal + # tls internal ${import ../secrets/caddy_auth.nix} reverse_proxy ${service_configs.https.wg_ip}:${builtins.toString service_configs.ports.torrent} ''; + + "map.${service_configs.https.domain}".extraConfig = '' + # tls internal + root * ${service_configs.minecraft.parent_dir}/${service_configs.minecraft.server_name}/squaremap/web + file_server browse + ''; }; }; + systemd.packages = with pkgs; [ nssTools ]; + networking.firewall.allowedTCPPorts = [ service_configs.ports.https 80 @@ -56,6 +65,10 @@ service_configs.ports.https ]; + users.users.${config.services.caddy.user}.extraGroups = [ + "minecraft" + ]; + users.users.${username}.extraGroups = [ config.services.caddy.group ]; diff --git a/services/minecraft.nix b/services/minecraft.nix index 557d225..4565965 100644 --- a/services/minecraft.nix +++ b/services/minecraft.nix @@ -6,7 +6,7 @@ ... }: let - heap_size = "4000M"; + heap_size = "2000M"; in { nixpkgs.config.allowUnfreePredicate = @@ -34,6 +34,7 @@ in white-list = true; difficulty = "easy"; motd = "A Minecraft Server"; + view-distance = 12; }; whitelist = import ../secrets/minecraft-whitelist.nix; @@ -46,8 +47,8 @@ in with pkgs; builtins.attrValues { FabricApi = fetchurl { - url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/MawoBGbv/fabric-api-0.107.3%2B1.21.3.jar"; - sha512 = "84e6bbdcd9819999e9d8873be7b6470bc9de898cdc0b878caeb8deb26e7cf3a1c532710e239815565d40afdb06db423746506f4c174fc3938c2790b5e6d5266f"; + url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/Xhw2LuSh/fabric-api-0.109.0%2B1.21.3.jar"; + sha512 = "decfcbcc4cc9748b9822a5e0b34dada9e1454bbf7c0eb1d4e014db243e8eebaa240a05a48c1bcde232ddecf150692fe295f9bb147794c861e42d2cad66119657"; }; FerriteCore = fetchurl { @@ -56,8 +57,8 @@ in }; Lithium = fetchurl { - url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/2Ea7RMWZ/lithium-fabric-0.14.1-snapshot%2Bmc1.21.3-build.89.jar"; - sha512 = "d122b23a520cb2573c2eaba9556c07846ae5f2f8ee9aabdf5dce914334e44027a273c8cf2ef2243fe03cf86a8858eab2ddcc247d95661dee40cd783cf444aeff"; + url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/QhCwdt4l/lithium-fabric-0.14.2-snapshot%2Bmc1.21.3-build.91.jar"; + sha512 = "6c025877e0f5de8f87baca0be08e19bbad8fb7f6e2037d064f2497fd9779cdc3b979dfc80d228374934ef84014949c9cb4740c816cac0ac9ad0d566d1d7e4f0e"; }; NoChatReports = fetchurl { @@ -65,14 +66,15 @@ in sha512 = "8f1163ad515ebdfab5ef54a4985af05e643749c2efc0bf7b62e00074bbe61d91789b0c9e558bbe1b5c5d21a89b88084ce6350a11a5a9a3bea59eea9764a27171"; }; - tick-stasis = fetchurl { - url = "https://cdn.modrinth.com/data/t6XBQ2xn/versions/fDbxgNHz/tick-stasis-1.1.1.jar"; - sha512 = "346fae7e0f1a62636525a9331643ac4343b781c240db6ef9bafe1b3a295d24d131d2b4b20cef8edc33835e9069fcaf1c2e2b3ce9ced9a2ec6e4e3d82770f52c6"; - }; + # breaks squaremap + # tick-stasis = fetchurl { + # url = "https://cdn.modrinth.com/data/t6XBQ2xn/versions/fDbxgNHz/tick-stasis-1.1.1.jar"; + # sha512 = "346fae7e0f1a62636525a9331643ac4343b781c240db6ef9bafe1b3a295d24d131d2b4b20cef8edc33835e9069fcaf1c2e2b3ce9ced9a2ec6e4e3d82770f52c6"; + # }; moonrise = fetchurl { - url = "https://cdn.modrinth.com/data/KOHu7RCS/versions/S7ZBVFid/Moonrise-Fabric-0.2.0-beta.3%2Bbad5cae.jar"; - sha512 = "84831de3f402bd2f69fba1329412064f487571527fbb4182c45433eba3d716ef52c057d4f2e9f794821ac5147dbae774ef5c83776f4e376fc10ba3d80015cfde"; + url = "https://cdn.modrinth.com/data/KOHu7RCS/versions/GD9TRt0g/Moonrise-Fabric-0.2.0-beta.4%2Be7510ed.jar"; + sha512 = "32be95ce0c1526e2522cefbe3321024d6c12405742b5367edc2e373dc0ff203c25422c98c68cf81355375d7fcf52f90520749811bff1e2ac302671263caa58a6"; }; mixintrace = fetchurl { @@ -96,10 +98,15 @@ in }; # hasn't updated to 1.21.3 yet (https://modrinth.com/mod/vivecraft/versions) - # vivecraft = pkgs.fetchurl { + # vivecraft = fetchurl { # url = "https://cdn.modrinth.com/data/wGoQDPN5/versions/55ml9ENB/vivecraft-1.21.1-1.1.14-b2-fabric.jar"; # sha512 = "6241183987d6197a5e2b4b17f86db2ee9c594f0b6ec335153f1733c2c9ace9f21d07007150a9082e2834deead68b2c287e9443b23be5cd09a366db3f1593975b"; # }; + + squaremap = fetchurl { + url = "https://jenkins.jpenilla.xyz/job/squaremap/lastSuccessfulBuild/artifact/build/libs/squaremap-fabric-mc1.21.3-1.3.3-SNAPSHOT+6298c9d.jar"; + sha256 = "TkXdjYimTSBsvCLstX8siq9AbupOmgIkEkHunQv8now="; + }; } ); };