Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2fa86ba6b2 | |||
| 8187e32d5d | |||
| 1a059b929b | |||
| 91b40f5344 |
4 changed files with 15 additions and 13 deletions
|
|
@ -54,7 +54,7 @@ in {
|
||||||
[ "Dockge" "docker" "https://containers.proxy.${domain}" "http://localhost:5001/" ]
|
[ "Dockge" "docker" "https://containers.proxy.${domain}" "http://localhost:5001/" ]
|
||||||
];
|
];
|
||||||
routes = {
|
routes = {
|
||||||
# "mc.${domain}" = "tcp://localhost:25565";
|
"mc.${domain}" = "tcp://localhost:25565";
|
||||||
|
|
||||||
"docs-sandbox.${domain}" = "http://localhost:7090";
|
"docs-sandbox.${domain}" = "http://localhost:7090";
|
||||||
"docs.${domain}" = "http://localhost:7090";
|
"docs.${domain}" = "http://localhost:7090";
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
zed-editor
|
zed-editor
|
||||||
|
opencode
|
||||||
|
|
||||||
slack
|
slack
|
||||||
discord
|
discord
|
||||||
|
|
|
||||||
|
|
@ -3,12 +3,12 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.zed-editor;
|
package = pkgs.zed-editor;
|
||||||
extensions = [
|
extensions = [
|
||||||
"html" "html-snippets"
|
|
||||||
"svelte" "svelte-snippets"
|
|
||||||
"wakatime" "discord-presence"
|
"wakatime" "discord-presence"
|
||||||
"catppuccin" "catppuccin-icons"
|
"catppuccin" "catppuccin-icons"
|
||||||
"git-firefly"
|
"codebook"
|
||||||
"nix"
|
"git-firefly" "nix"
|
||||||
|
"html" "html-snippets"
|
||||||
|
"svelte" "svelte-snippets"
|
||||||
];
|
];
|
||||||
userSettings = {
|
userSettings = {
|
||||||
diff_view_style = "unified";
|
diff_view_style = "unified";
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,10 @@
|
||||||
ram-allocation-mb = 12288;
|
ram-allocation-mb = 12288;
|
||||||
rcon-pass = "howdy";
|
rcon-pass = "howdy";
|
||||||
modpack = let
|
modpack = let
|
||||||
commit = "e47a428b61fc087f4c733258e5a282c21b32d9c3";
|
commit = "583df6751eb0b88830fa7e4a424587aedc241653";
|
||||||
path = if production then "commit/${commit}" else "branch/main";
|
path = if production then "commit/${commit}" else "branch/main";
|
||||||
in pkgs.fetchPackwizModpack {
|
in pkgs.fetchPackwizModpack {
|
||||||
packHash = "sha256-/gQw/FeNv/jbschhFzujloO9jaqTmfvBbzouWUJGr6w=";
|
packHash = "";
|
||||||
url = "https://git.satr14.my.id/satr14/server-modpack/raw/${path}/pack.toml";
|
url = "https://git.satr14.my.id/satr14/server-modpack/raw/${path}/pack.toml";
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
|
|
@ -20,9 +20,10 @@ in {
|
||||||
"vm.swappiness" = 10;
|
"vm.swappiness" = 10;
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services."minecraft-server-${name}".environment = {
|
systemd.services."minecraft-server-${name}" = {
|
||||||
LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib";
|
environment.LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib"; # physics toys mod fix
|
||||||
}; # ^^^ physics mod fix
|
serviceConfig.Nice = -5; # higher scheduling priority
|
||||||
|
};
|
||||||
|
|
||||||
services.minecraft-servers = {
|
services.minecraft-servers = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -141,10 +142,10 @@ in {
|
||||||
"-XX:+AlwaysPreTouch" # Pre-allocates memory on startup, OS claims it immediately for JVM instead of negotiating it
|
"-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:+DisableExplicitGC" # Disables mods from manually invoking the GC
|
||||||
"-XX:+PerfDisableSharedMem" # Disables constant /tmp writes for JVM metrics
|
"-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:SoftMaxHeapSize=${toString (ram-allocation-mb - 2048)}M" # Leave 2GB headroom
|
||||||
"-XX:ZCollectionInterval=1" # Force a GC cycle at minimum every second
|
# "-XX:ZAllocationSpikeTolerance=5" # Helps when server is active with many players
|
||||||
"-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;
|
]; in lib.concatStringsSep " " flags;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue