fix whitelist

configuration.nix

@@ -111,6 +111,8 @@
     ripgrep
 
     intel-gpu-tools
+
+    tmux
   ];
 
   services.zfs = {
@@ -122,7 +124,7 @@
     let
       no-rgb = pkgs.writeScriptBin "no-rgb" ''
         #!/bin/sh
-        NUM_DEVICES=$(${pkgs.openrgb}/bin/openrgb --noautoconnect --list-devices | ${pkgs.coreutils}/bin/grep -E '^[0-9]+: ' | ${pkgs.coreutils}/bin/wc -l)
+        NUM_DEVICES=$(${pkgs.openrgb}/bin/openrgb --noautoconnect --list-devices | ${pkgs.gnugrep}/bin/grep -E '^[0-9]+: ' | ${pkgs.coreutils}/bin/wc -l)
 
         for i in $(${pkgs.coreutils}/bin/seq 0 $(($NUM_DEVICES - 1))); do
           ${pkgs.openrgb}/bin/openrgb --noautoconnect --device $i --mode direct --color 000000

flake.lock

@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727487901,
+        "lastModified": 1727574772,
-        "narHash": "sha256-m+QPmso7l/SVPgrQz72PicSQgaaLs/Iyy+9eAyHY3+c=",
+        "narHash": "sha256-bPoftKOe6oWR2o5jgLQjmaBNH2ke7+ooDGxlXXIjsBc=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "39983d066b08107165ba5757d03f414abb4e52c9",
+        "rev": "5ce4fc09d6fcf0b9d801ff3c98da83c56d85e045",
         "type": "github"
       },
       "original": {

flake.nix

@@ -53,7 +53,8 @@
         };
 
         minecraft = {
-          dir = "/tank/services/minecraft/main";
+          parent_dir = "/tank/services/minecraft";
+          server_name = "main";
         };
 
         gluetun = {

services/gitea.nix

@@ -6,7 +6,7 @@
 {
   services.gitea = {
     enable = true;
-    appName = "TBD name of my gitea server";
+    appName = "Simon Gardling's Gitea instance";
     stateDir = service_configs.gitea.dir;
     database = {
       type = "postgres";

services/minecraft.nix

@@ -4,7 +4,9 @@
   lib,
   ...
 }:
-
+let
+heap_size = "6144M";
+in
 {
   nixpkgs.config.allowUnfreePredicate =
     pkg:
@@ -15,12 +17,13 @@
   services.minecraft-servers = {
     enable = true;
     eula = true;
-    dataDir = "/tank/services/minecraft";
+    dataDir = service_configs.minecraft.parent_dir;
     openFirewall = true;
-    servers.main = {
+    servers.${service_configs.minecraft.server_name} = {
       enable = true;
       package = pkgs.fabricServers.fabric-1_21_1;
-      jvmOpts = "-Xmx6144M -Xms6144M -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+ParallelRefProcEnabled -XX:+PerfDisableSharedMem -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1HeapRegionSize=8M -XX:G1HeapWastePercent=5 -XX:G1MaxNewSizePercent=40 -XX:G1MixedGCCountTarget=4 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1NewSizePercent=30 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:G1ReservePercent=20 -XX:InitiatingHeapOccupancyPercent=15 -XX:MaxGCPauseMillis=200 -XX:MaxTenuringThreshold=1 -XX:SurvivorRatio=32";
+      # Aikar's flags
+      jvmOpts = "-Xmx${heap_size} -Xms${heap_size} -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+ParallelRefProcEnabled -XX:+PerfDisableSharedMem -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1HeapRegionSize=8M -XX:G1HeapWastePercent=5 -XX:G1MaxNewSizePercent=40 -XX:G1MixedGCCountTarget=4 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1NewSizePercent=30 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:G1ReservePercent=20 -XX:InitiatingHeapOccupancyPercent=15 -XX:MaxGCPauseMillis=200 -XX:MaxTenuringThreshold=1 -XX:SurvivorRatio=32";
       serverProperties = {
         server-port = service_configs.ports.minecraft;
         enforce-whitelist = true;

services/quadlet.nix

@@ -12,24 +12,6 @@
         };
       in
       {
-        # minecraft-server.containerConfig = baseContainerConfig // {
-        #   image = "docker.io/itzg/minecraft-server:java21-graalvm";
-        #   name = "minecraft";
-
-        #   environments = {
-        #     TYPE = "QUILT";
-        #     MEMORY = "4G";
-        #     MOD_PLATFORM = "MODRINTH";
-        #     USE_AIKAR_FLAGS = true;
-        #     JVM_OPTS = "-XX:-UseJVMCICompiler";
-        #     MODRINTH_MODPACK = "https://modrinth.com/modpack/sop";
-        #     VERSION = "1.21.1";
-        #   };
-
-        #   publishPorts = [ "${builtins.toString service_configs.ports.minecraft}:25565" ];
-        #   volumes = [ "${service_configs.minecraft.dir}:/data:z" ];
-        # };
-
         gluetun.containerConfig = baseContainerConfig // {
           image = "docker.io/qmcgaw/gluetun";
           name = "gluetun";