diff --git a/lib/options.nix b/lib/options.nix index c2bfd16..15876ec 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -54,7 +54,7 @@ in { [ "Dockge" "docker" "https://containers.proxy.${domain}" "http://localhost:5001/" ] ]; routes = { - "mc.${domain}" = "tcp://localhost:25565"; + # "mc.${domain}" = "tcp://localhost:25565"; "docs-sandbox.${domain}" = "http://localhost:7090"; "docs.${domain}" = "http://localhost:7090"; diff --git a/modules/home/core/apps.nix b/modules/home/core/apps.nix index 214a70c..bcb3363 100644 --- a/modules/home/core/apps.nix +++ b/modules/home/core/apps.nix @@ -27,7 +27,6 @@ home.packages = with pkgs; [ zed-editor - opencode slack discord diff --git a/modules/home/core/code.nix b/modules/home/core/code.nix index fa074e5..21268ff 100644 --- a/modules/home/core/code.nix +++ b/modules/home/core/code.nix @@ -3,12 +3,12 @@ enable = true; package = pkgs.zed-editor; extensions = [ - "wakatime" "discord-presence" - "catppuccin" "catppuccin-icons" - "codebook" - "git-firefly" "nix" "html" "html-snippets" "svelte" "svelte-snippets" + "wakatime" "discord-presence" + "catppuccin" "catppuccin-icons" + "git-firefly" + "nix" ]; userSettings = { diff_view_style = "unified"; diff --git a/modules/system/homelab/mc.nix b/modules/system/homelab/mc.nix index 10f2e34..941e939 100644 --- a/modules/system/homelab/mc.nix +++ b/modules/system/homelab/mc.nix @@ -4,10 +4,10 @@ ram-allocation-mb = 12288; rcon-pass = "howdy"; modpack = let - commit = "583df6751eb0b88830fa7e4a424587aedc241653"; + commit = "e47a428b61fc087f4c733258e5a282c21b32d9c3"; path = if production then "commit/${commit}" else "branch/main"; in pkgs.fetchPackwizModpack { - packHash = ""; + packHash = "sha256-/gQw/FeNv/jbschhFzujloO9jaqTmfvBbzouWUJGr6w="; url = "https://git.satr14.my.id/satr14/server-modpack/raw/${path}/pack.toml"; }; in { @@ -20,10 +20,9 @@ in { "vm.swappiness" = 10; }; - systemd.services."minecraft-server-${name}" = { - environment.LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib"; # physics toys mod fix - serviceConfig.Nice = -5; # higher scheduling priority - }; + systemd.services."minecraft-server-${name}".environment = { + LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib"; + }; # ^^^ physics mod fix services.minecraft-servers = { enable = true; @@ -142,10 +141,10 @@ in { "-XX:+AlwaysPreTouch" # Pre-allocates memory on startup, OS claims it immediately for JVM instead of negotiating it "-XX:+DisableExplicitGC" # Disables mods from manually invoking the GC "-XX:+PerfDisableSharedMem" # Disables constant /tmp writes for JVM metrics + "-XX:ZAllocationSpikeTolerance=5" # Helps when server is active with many players "-XX:SoftMaxHeapSize=${toString (ram-allocation-mb - 2048)}M" # Leave 2GB headroom - # "-XX:ZAllocationSpikeTolerance=5" # Helps when server is active with many players - # "-XX:ZCollectionInterval=1" # Force a GC cycle at minimum every second - # "-XX:ConcGCThreads=8" # Threads ZGC uses for concurrent work + "-XX:ZCollectionInterval=1" # Force a GC cycle at minimum every second + "-XX:ConcGCThreads=8" # Threads ZGC uses for concurrent work ]; in lib.concatStringsSep " " flags; }; };