From 96205e28a66675dad4ac2f91f016bcca761d49e5 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Tue, 12 Nov 2024 12:41:54 -0500
Subject: [PATCH] minecraft: 1.21.1 -> 1.21.3

---
 services/caddy.nix     | 13 +++++++++----
 services/gitea.nix     |  5 ++---
 services/jellyfin.nix  |  4 ++--
 services/minecraft.nix | 36 ++++++++++++++++--------------------
 services/soulseek.nix  |  4 ++--
 5 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/services/caddy.nix b/services/caddy.nix
index 755291f..cba1ce7 100644
--- a/services/caddy.nix
+++ b/services/caddy.nix
@@ -1,4 +1,9 @@
-{ config, service_configs, username, ... }:
+{
+  config,
+  service_configs,
+  username,
+  ...
+}:
 {
   services.caddy = {
     enable = true;
@@ -39,7 +44,7 @@
     service_configs.ports.https
   ];
 
-    users.users.${username}.extraGroups = [
-      config.services.caddy.group
-    ];
+  users.users.${username}.extraGroups = [
+    config.services.caddy.group
+  ];
 }
diff --git a/services/gitea.nix b/services/gitea.nix
index 59b586f..5bf07f7 100644
--- a/services/gitea.nix
+++ b/services/gitea.nix
@@ -41,8 +41,7 @@
     ];
   };
 
-  
   users.users.${username}.extraGroups = [
-      config.services.gitea.group
-    ];
+    config.services.gitea.group
+  ];
 }
diff --git a/services/jellyfin.nix b/services/jellyfin.nix
index c1804bc..0139add 100644
--- a/services/jellyfin.nix
+++ b/services/jellyfin.nix
@@ -28,6 +28,6 @@
   ];
 
   users.users.${username}.extraGroups = [
-      config.services.jellyfin.group
-    ];
+    config.services.jellyfin.group
+  ];
 }
diff --git a/services/minecraft.nix b/services/minecraft.nix
index 7b55357..e0075f8 100644
--- a/services/minecraft.nix
+++ b/services/minecraft.nix
@@ -22,7 +22,7 @@ in
 
     servers.${service_configs.minecraft.server_name} = {
       enable = true;
-      package = pkgs.fabricServers.fabric-1_21_1;
+      package = pkgs.fabricServers.fabric-1_21_3;
 
       jvmOpts = "-Xmx${heap_size} -Xms${heap_size} -XX:+UseZGC -XX:+ZGenerational";
 
@@ -41,8 +41,8 @@ in
         "mods" = pkgs.linkFarmFromDrvs "mods" (
           builtins.attrValues {
             FabricApi = pkgs.fetchurl {
-              url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/thGkUOxt/fabric-api-0.107.0%2B1.21.1.jar";
-              sha512 = "04cf3f205c83882c7c741da392d10cbf9ab471fb44836d753f9673b7b37ddb9b2842cc8e72d6d7f36c48d121715f9f9dae8d20e597f2c0de3bb8abd37037baaa";
+              url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/MawoBGbv/fabric-api-0.107.3%2B1.21.3.jar";
+              sha512 = "84e6bbdcd9819999e9d8873be7b6470bc9de898cdc0b878caeb8deb26e7cf3a1c532710e239815565d40afdb06db423746506f4c174fc3938c2790b5e6d5266f";
             };
 
             # https://github.com/malte0811/FerriteCore/issues/164
@@ -52,13 +52,13 @@ in
             # };
 
             Lithium = pkgs.fetchurl {
-              url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/9x0igjLz/lithium-fabric-mc1.21.1-0.13.1.jar";
-              sha512 = "4250a630d43492da35c4c197ae43082186938fdcb42bafcb6ccad925b79f583abdfdc17ce792c6c6686883f7f109219baecb4906a65d524026d4e288bfbaf146";
+              url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/2Ea7RMWZ/lithium-fabric-0.14.1-snapshot%2Bmc1.21.3-build.89.jar";
+              sha512 = "d122b23a520cb2573c2eaba9556c07846ae5f2f8ee9aabdf5dce914334e44027a273c8cf2ef2243fe03cf86a8858eab2ddcc247d95661dee40cd783cf444aeff";
             };
 
             NoChatReports = pkgs.fetchurl {
-              url = "https://cdn.modrinth.com/data/qQyHxfxd/versions/sOHvPS0X/NoChatReports-FABRIC-1.21.1-v2.9.0.jar";
-              sha512 = "3326d278e57cc2d7bdb4348570c3876ed096af872e166241209ef5ac7c823829596a81570db029ac751e5a11b7686046f72119f259365350ca2eba10037f6d24";
+              url = "https://cdn.modrinth.com/data/qQyHxfxd/versions/Cg7X9iDa/NoChatReports-FABRIC-1.21.3-v2.10.1.jar";
+              sha512 = "8f1163ad515ebdfab5ef54a4985af05e643749c2efc0bf7b62e00074bbe61d91789b0c9e558bbe1b5c5d21a89b88084ce6350a11a5a9a3bea59eea9764a27171";
             };
 
             tick-stasis = pkgs.fetchurl {
@@ -66,14 +66,9 @@ in
               sha512 = "346fae7e0f1a62636525a9331643ac4343b781c240db6ef9bafe1b3a295d24d131d2b4b20cef8edc33835e9069fcaf1c2e2b3ce9ced9a2ec6e4e3d82770f52c6";
             };
 
-            noisium = pkgs.fetchurl {
-              url = "https://cdn.modrinth.com/data/KuNKN7d2/versions/4sGQgiu2/noisium-fabric-2.3.0%2Bmc1.21-1.21.1.jar";
-              sha512 = "606ba78cf7f30d99e417c96aa042f600c1b626ed9c783919496d139de650013f1434fcf93545782e3889660322837ce6e85530d9e1a5cc20f9ad161357ede43e";
-            };
-
             moonrise = pkgs.fetchurl {
-              url = "https://cdn.modrinth.com/data/KOHu7RCS/versions/1ZrRaRbq/Moonrise-Fabric-0.1.0-beta.8%2B68ea18b.jar";
-              sha512 = "7510ce6a908d384031b8134c719a6e4f959f35cc9f7889a12f5fc2188937c61f84c916eff8639786fa2c3411141316802437b1cbc105e00dee0f6a8cc6d96b92";
+              url = "https://cdn.modrinth.com/data/KOHu7RCS/versions/S7ZBVFid/Moonrise-Fabric-0.2.0-beta.3%2Bbad5cae.jar";
+              sha512 = "84831de3f402bd2f69fba1329412064f487571527fbb4182c45433eba3d716ef52c057d4f2e9f794821ac5147dbae774ef5c83776f4e376fc10ba3d80015cfde";
             };
 
             mixintrace = pkgs.fetchurl {
@@ -82,14 +77,15 @@ in
             };
 
             better-fabric-console = pkgs.fetchurl {
-              url = "https://cdn.modrinth.com/data/Y8o1j1Sf/versions/6FB2l9zd/better-fabric-console-mc1.21.1-1.2.0.jar";
-              sha512 = "3120f168a201a0d7eee55dc34788f0b1134754895d86ceca082f72b16902a00fc70ca05c73712b1d45bae8b74176af30a1821e636ba528f2abd60d94b1f35297";
+              url = "https://cdn.modrinth.com/data/Y8o1j1Sf/versions/QGfoAASu/better-fabric-console-mc1.21.3-1.2.1.jar";
+              sha512 = "3a88c281a65f26e44b17b3a7a5cc9f84046b013931bd3af7f2553f462987a96357b21c104a41593ca0516038e6c4398a890ee118046fe95a7e0c7f2d743d944a";
             };
 
-            vivecraft = pkgs.fetchurl {
-              url = "https://cdn.modrinth.com/data/wGoQDPN5/versions/55ml9ENB/vivecraft-1.21.1-1.1.14-b2-fabric.jar";
-              sha512 = "6241183987d6197a5e2b4b17f86db2ee9c594f0b6ec335153f1733c2c9ace9f21d07007150a9082e2834deead68b2c287e9443b23be5cd09a366db3f1593975b";
-            };
+            # hasn't updated to 1.21.3 yet (https://modrinth.com/mod/vivecraft/versions)
+            # vivecraft = pkgs.fetchurl {
+            #   url = "https://cdn.modrinth.com/data/wGoQDPN5/versions/55ml9ENB/vivecraft-1.21.1-1.1.14-b2-fabric.jar";
+            #   sha512 = "6241183987d6197a5e2b4b17f86db2ee9c594f0b6ec335153f1733c2c9ace9f21d07007150a9082e2834deead68b2c287e9443b23be5cd09a366db3f1593975b";
+            # };
           }
         );
       };
diff --git a/services/soulseek.nix b/services/soulseek.nix
index 6a068c3..e3a4934 100644
--- a/services/soulseek.nix
+++ b/services/soulseek.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}:
+{ pkgs, ... }:
 {
   services.slskd = {
     enable = true;
@@ -7,7 +7,7 @@
 
     settings = {
       shares = {
-        directories = ["/tank/music"];
+        directories = [ "/tank/music" ];
       };
     };
   };