diff --git a/flake.nix b/flake.nix index 51c1c0f..3616205 100644 --- a/flake.nix +++ b/flake.nix @@ -16,8 +16,6 @@ hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - nix-minecraft.url = "github:Infinidoge/nix-minecraft"; - myneovim.url = "git+https://git.thewizard.link/wizardlink/neovim"; }; diff --git a/nixos.nix b/nixos.nix index 07074bc..975db1d 100644 --- a/nixos.nix +++ b/nixos.nix @@ -26,7 +26,6 @@ in ./services/caddy.nix ./services/forgejo.nix ./services/jellyfin.nix - ./services/minecraft ]; # Enable experimental features @@ -131,7 +130,6 @@ in ]; allowedUDPPorts = [ - 24454 # Minecraft Simple Voice Chat 2626 # Dolphin emulator 27015 # Source games 28910 # Heretic II @@ -175,7 +173,6 @@ in "docker" "gamemode" "libvirtd" - "minecraft" "networkmanager" "openrazer" "postgresql" diff --git a/services/minecraft/default.nix b/services/minecraft/default.nix deleted file mode 100644 index b404e2c..0000000 --- a/services/minecraft/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ pkgs, nix-minecraft, ... }: - -let - modpack = pkgs.fetchPackwizModpack { - url = "https://git.thewizard.link/wizardlink/silly-pack/raw/tag/1.0.8/pack.toml"; - packHash = "sha256-sCk9OO1q+/c1A6ns4zhvneulNtmEMr1yz4+Ku+A+mdk="; - }; -in -{ - imports = [ nix-minecraft.nixosModules.minecraft-servers ]; - nixpkgs.overlays = [ nix-minecraft.overlay ]; - - # Needed to package modpacks. - environment.systemPackages = [ pkgs.packwiz ]; - - services.minecraft-servers = { - enable = true; - eula = true; - openFirewall = true; - - servers = { - silly-pack = { - enable = true; - package = pkgs.fabricServers.fabric-1_20_1.override { loaderVersion = "0.15.11"; }; - autoStart = true; - - jvmOpts = "-Xms512M -Xmx4096M -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -XX:MaxGCPauseMillis=50 -XX:G1HeapRegionSize=4M -XX:TargetSurvivorRatio=90 -XX:G1NewSizePercent=50 -XX:G1MaxNewSizePercent=80 -XX:InitiatingHeapOccupancyPercent=10 -XX:G1MixedGCLiveThresholdPercent=50"; - - serverProperties = { - allow-flight = true; - difficulty = "normal"; - enforce-secure-profile = true; - level-name = "horror"; - motd = "\\u00A70Ready to run?\\u00A7r"; - pvp = true; - resource-pack = "https://cdn.modrinth.com/data/p1WH6sHr/versions/3lQn31SZ/From-The-Fog-1.20.5-1.20.6-v1.9.3-Data-Resource-Pack.zip"; - server-ip = "192.168.0.100"; - server-port = 25565; - view-distance = 16; - }; - - symlinks = { - mods = "${modpack}/mods"; - "ops.json" = ./ops.json; - }; - }; - }; - }; -} diff --git a/services/minecraft/ops.json b/services/minecraft/ops.json deleted file mode 100644 index 0492ee5..0000000 --- a/services/minecraft/ops.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - { - "uuid": "55a58451-8fe9-4dfe-8011-1509e948e7a6", - "name": "WizardlinK", - "level": 4 - } -]