satr14/nix-flake
Watch
1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: satr14:2fa86ba6b2114973ab101afb1563f09ecdd34af2
Branches Tags
satr14:main
satr14:renovate/lock-file-maintenance
satr14:mc-backup
satr14:sops-implementation
..
compare: satr14:f191ba452187581bfa8c157d8a32090a3bbb81a2
Branches Tags
satr14:main
satr14:renovate/lock-file-maintenance
satr14:mc-backup
satr14:sops-implementation
4 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/options.nix
View file

@ -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";

1
modules/home/core/apps.nix
View file

@ -27,7 +27,6 @@
home.packages = with pkgs; [
zed-editor
opencode
slack
discord

8
modules/home/core/code.nix
View file

@ -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";

17
modules/system/homelab/mc.nix
View file

@ -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;
};
};