updates

flake.lock

@@ -478,6 +478,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
+        "packwiz": "packwiz",
         "placeholderapi-luckperms": "placeholderapi-luckperms",
         "systems": [
           "systems"
@@ -485,15 +486,16 @@
         "vanillatweaks": "vanillatweaks"
       },
       "locked": {
-        "lastModified": 1734939229,
+        "lastModified": 1735393933,
-        "narHash": "sha256-yEiMg4aPioaqBmgdgjw8/HGGB9BU8u6XvIgCr3dygH4=",
+        "narHash": "sha256-RsPZaV73pdgEvMNuKDGL+qAzSCvs1upIp5fr7583n9g=",
-        "ref": "refs/heads/master",
+        "ref": "master",
-        "rev": "d77398c8dbd77ea3669f233aeb64ede12b25e75b",
+        "rev": "c3d339a685ac9b86d8c4b8908a0fc81605d5e6b7",
-        "revCount": 306,
+        "revCount": 332,
         "type": "git",
         "url": "file:///home/odie/Code/nix/minecraft-server-flake"
       },
       "original": {
+        "ref": "master",
         "type": "git",
         "url": "file:///home/odie/Code/nix/minecraft-server-flake"
       }
@@ -767,16 +769,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1644486793,
+        "lastModified": 1734649271,
-        "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=",
+        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",
+        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -825,6 +827,22 @@
       }
     },
     "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1644486793,
+        "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1734141057,
         "narHash": "sha256-z8KMwCFX9W0KyUfIpdN9Qx9/JAsd6KyF4A96EuDW3S8=",
@@ -877,7 +895,7 @@
       "inputs": {
         "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1672582520,
@@ -898,7 +916,7 @@
       "inputs": {
         "flake-compat": "flake-compat_3",
         "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1713028366,
@@ -1062,6 +1080,25 @@
         "url": "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.utf-8.sug"
       }
     },
+    "packwiz": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1734972138,
+        "narHash": "sha256-jB2XYyauqXobAt5WnyHZQ82niHZd/U+mrfMAQ1KjfBA=",
+        "ref": "fix",
+        "rev": "453e26d3f5210ee453abc4f103b5d2d6610632df",
+        "revCount": 370,
+        "type": "git",
+        "url": "file:///home/odie/Code/nix/packwiz"
+      },
+      "original": {
+        "ref": "fix",
+        "type": "git",
+        "url": "file:///home/odie/Code/nix/packwiz"
+      }
+    },
     "placeholderapi-luckperms": {
       "flake": false,
       "locked": {
@@ -1095,7 +1132,7 @@
         "nixgl": "nixgl",
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nixvim": "nixvim",
         "norg": "norg_2",
         "norg-meta": "norg-meta_2",

flake.nix

@@ -144,7 +144,7 @@
     nixos-hardware.url = "github:nixos/nixos-hardware";
     home-manager = {
       url = "github:nix-community/home-manager";
-      #inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-utils = {
       url = "github:numtide/flake-utils";
@@ -169,18 +169,18 @@
     nixvim = {
       url = "github:nix-community/nixvim";
       inputs = {
-        #nixpkgs.follows = "nixpkgs";
+        nixpkgs.follows = "nixpkgs";
-        #home-manager.follows = "home-manager";
+        home-manager.follows = "home-manager";
-        #flake-parts.follows = "flake-parts";
+        flake-parts.follows = "flake-parts";
-        #flake-compat.follows = "flake-compat";
+        flake-compat.follows = "flake-compat";
       };
     };
     neovim-nightly-overlay = {
       url = "github:nix-community/neovim-nightly-overlay";
       inputs = {
-        #nixpkgs.follows = "nixpkgs";
+        nixpkgs.follows = "nixpkgs";
-        #flake-parts.follows = "flake-parts";
+        flake-parts.follows = "flake-parts";
-        #flake-compat.follows = "flake-compat";
+        flake-compat.follows = "flake-compat";
       };
     };
     nvim-spell-de-utf8-dictionary = {
@@ -260,8 +260,9 @@
       };
     };
     minecraft-server-flake = {
-      #url = "git+ssh://git@git.gaja-group.com/gaja-group/minecraft-server-flake.git";
+      url = "git+ssh://git@git.gaja-group.com/gaja-group/minecraft-server-flake.git";
-      url = "git+file:///home/odie/Code/nix/minecraft-server-flake";
+      #url = "git+file:///home/odie/Code/nix/minecraft-server-flake?ref=update/1.21.4";
+      #url = "git+file:///home/odie/Code/nix/minecraft-server-flake?ref=master";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";

modules/nixos/games/minecraft/default.nix

@@ -1,16 +1,20 @@
-{ inputs, ... }:
+{ inputs, lib, ... }:
+with lib;
 let
-  whitelist = {
-    masterodie = "c0e67091-d6d0-4cf2-89d5-d0c6f2bd4f30";
-    Rooomi = "5c5b4a28-e292-46fa-bf92-3b21f577c30e";
-  };
   operators = {
     masterodie = {
-      uuid = whitelist.masterodie;
+      uuid = "c0e67091-d6d0-4cf2-89d5-d0c6f2bd4f30";
+      level = 4;
+      bypassesPlayerLimit = true;
+    };
+    Rooomi = {
+      uuid = "5c5b4a28-e292-46fa-bf92-3b21f577c30e";
       level = 4;
       bypassesPlayerLimit = true;
     };
   };
+  whitelist = { } // attrsets.mapAttrs (n: v: v.uuid) operators;
+  jvmArgs = "-XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+AlwaysActAsServerClassMachine -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+UseNUMA -XX:NmethodSweepActivity=1 -XX:ReservedCodeCacheSize=400M -XX:NonNMethodCodeHeapSize=12M -XX:ProfiledCodeHeapSize=194M -XX:NonProfiledCodeHeapSize=194M -XX:-DontCompileHugeMethods -XX:MaxNodeLimit=240000 -XX:NodeLimitFudgeFactor=8000 -XX:+UseVectorCmov -XX:+PerfDisableSharedMem -XX:+UseFastUnorderedTimeStamps -XX:+UseCriticalJavaThreadPriority -XX:ThreadPriorityPolicy=1 -XX:AllocatePrefetchStyle=3 -XX:+UseG1GC -XX:MaxGCPauseMillis=130 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=28 -XX:G1HeapRegionSize=16M -XX:G1ReservePercent=20 -XX:G1MixedGCCountTarget=3 -XX:InitiatingHeapOccupancyPercent=10 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=0 -XX:SurvivorRatio=32 -XX:MaxTenuringThreshold=1 -XX:G1SATBBufferEnqueueingThresholdPercent=30 -XX:G1ConcMarkStepDurationMillis=5 -XX:G1ConcRSHotCardLimit=16 -XX:G1ConcRefinementServiceIntervalMillis=150";
 in
 {
   imports = [
@@ -20,24 +24,52 @@ in
     velocitySecret = "01KqxtMy3kEH";
     openFirewall = true;
     domain = "odie.home.arpa";
+    inherit jvmArgs;
     servers = {
       vanilla-plus = {
         inherit whitelist operators;
+        stopCommand = null;
         enable = true;
         autoStart = false;
         openFirewall = true;
         serverProperties = {
           online-mode = false;
           enforce-secure-profile = true;
+          server-name = "GajaCraft Survival";
+          server-port = 25566;
+          server-ip = "127.0.0.1";
+          difficulty = "easy";
+          gamemode = "survival";
+          max-players = 10;
+          white-list = true;
+          enforce-whitelist = true;
+          pause-when-empty-seconds = 1;
+          force-gamemode = true;
+          view-distance = 12;
         };
       };
       flat = {
         inherit whitelist operators;
         enable = true;
+        stopCommand = null;
         autoStart = false;
         serverProperties = {
           online-mode = false;
           enforce-secure-profile = true;
+          server-name = "GajaCraft Creative Flat";
+          server-port = 25567;
+          server-ip = "127.0.0.1";
+          difficulty = "hard";
+          gamemode = "creative";
+          max-players = 10;
+          white-list = true;
+          enforce-whitelist = true;
+          pause-when-empty-seconds = 1;
+          force-gamemode = true;
+          view-distance = 12;
+          generate-structures = false;
+          level-type = "minecraft:flat";
+          generator-settings = ''{"biome": "minecraft:desert", "layers": [ { "block": "minecraft:bedrock", "height": 1 }, { "block": "minecraft:sandstone", "height": 62 } ] }'';
         };
       };
       velocity.enable = true;
@@ -52,7 +84,7 @@ in
         whitelist = [ "worldedit" ];
       };
       vanilla-plus = {
-        memory = "2G";
+        memory = "4G";
         port = 25566;
         mapPort = 8100;
         voicePort = 24454;

pkgs/spyglass/.gitignore

@@ -0,0 +1 @@
+node_modules

pkgs/spyglass/default.nix

@@ -0,0 +1,14 @@
+{ buildNpmPackage, importNpmLock, lib, ... }: buildNpmPackage {
+  name = "spyglassmc-language-server";
+  version = "0.4.12";
+  src = ./.;
+  dontNpmBuild = true;
+  dontNpmPrune = true;
+  npmDeps = importNpmLock { npmRoot = ./.; };
+  inherit (importNpmLock) npmConfigHook;
+  meta = with lib; {
+    description = "An mcfunction language server";
+    homepage = "https://spyglassmc.com";
+    license = licenses.mit;
+  };
+}

pkgs/spyglass/package.json

@@ -0,0 +1,12 @@
+{
+    "name": "spyglassmc-language-server",
+    "version": "0.4.12",
+    "description": "An mcfunction language server",
+    "type": "module",
+    "bin": {
+        "spyglassmc-language-server": "./src/main.js"
+    },
+    "dependencies": {
+        "@spyglassmc/language-server": "0.4.12"
+    }
+}

pkgs/spyglass/src/main.js

@@ -0,0 +1 @@
+import "@spyglassmc/language-server";