titaniumtown/server-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: titaniumtown:273848471584ee081de3935ce032a7469838ff14
Branches Tags
titaniumtown:main
..
compare: titaniumtown:bf102a24d97dc607ba9e6de8736ba567c46e5f72
Branches Tags
titaniumtown:main

No commits in common. "273848471584ee081de3935ce032a7469838ff14" and "bf102a24d97dc607ba9e6de8736ba567c46e5f72" have entirely different histories.
2738484715 ... bf102a24d9

7 changed files with 28 additions and 16 deletions
Show Stats Expand all files Collapse all files

4
configuration.nix
View File

@ -111,8 +111,6 @@
ripgrep ripgrep
intel-gpu-tools intel-gpu-tools
tmux
]; ];
services.zfs = { services.zfs = {
@ -124,7 +122,7 @@
let let
no-rgb = pkgs.writeScriptBin "no-rgb" '' no-rgb = pkgs.writeScriptBin "no-rgb" ''
#!/bin/sh #!/bin/sh
NUM_DEVICES=$(${pkgs.openrgb}/bin/openrgb --noautoconnect --list-devices | ${pkgs.gnugrep}/bin/grep -E '^[0-9]+: ' | ${pkgs.coreutils}/bin/wc -l) NUM_DEVICES=$(${pkgs.openrgb}/bin/openrgb --noautoconnect --list-devices | ${pkgs.coreutils}/bin/grep -E '^[0-9]+: ' | ${pkgs.coreutils}/bin/wc -l)
for i in $(${pkgs.coreutils}/bin/seq 0 $(($NUM_DEVICES - 1))); do for i in $(${pkgs.coreutils}/bin/seq 0 $(($NUM_DEVICES - 1))); do
${pkgs.openrgb}/bin/openrgb --noautoconnect --device $i --mode direct --color 000000 ${pkgs.openrgb}/bin/openrgb --noautoconnect --device $i --mode direct --color 000000

6
flake.lock generated
View File

@ -43,11 +43,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727574772, "lastModified": 1727487901,
"narHash": "sha256-bPoftKOe6oWR2o5jgLQjmaBNH2ke7+ooDGxlXXIjsBc=", "narHash": "sha256-m+QPmso7l/SVPgrQz72PicSQgaaLs/Iyy+9eAyHY3+c=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "5ce4fc09d6fcf0b9d801ff3c98da83c56d85e045", "rev": "39983d066b08107165ba5757d03f414abb4e52c9",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View File

@ -53,8 +53,7 @@
}; };
minecraft = { minecraft = {
parent_dir = "/tank/services/minecraft"; dir = "/tank/services/minecraft/main";
server_name = "main";
}; };
gluetun = { gluetun = {

BIN
secrets/minecraft-whitelist.nix
View File

Binary file not shown.

2
services/gitea.nix
View File

@ -6,7 +6,7 @@
{ {
services.gitea = { services.gitea = {
enable = true; enable = true;
appName = "Simon Gardling's Gitea instance"; appName = "TBD name of my gitea server";
stateDir = service_configs.gitea.dir; stateDir = service_configs.gitea.dir;
database = { database = {
type = "postgres"; type = "postgres";

11
services/minecraft.nix
View File

@ -4,9 +4,7 @@
lib, lib,
... ...
}: }:
let
heap_size = "6144M";
in
{ {
nixpkgs.config.allowUnfreePredicate = nixpkgs.config.allowUnfreePredicate =
pkg: pkg:
@ -17,13 +15,12 @@ in
services.minecraft-servers = { services.minecraft-servers = {
enable = true; enable = true;
eula = true; eula = true;
dataDir = service_configs.minecraft.parent_dir; dataDir = "/tank/services/minecraft";
openFirewall = true; openFirewall = true;
servers.${service_configs.minecraft.server_name} = { servers.main = {
enable = true; enable = true;
package = pkgs.fabricServers.fabric-1_21_1; package = pkgs.fabricServers.fabric-1_21_1;
# Aikar's flags jvmOpts = "-Xmx6144M -Xms6144M -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+ParallelRefProcEnabled -XX:+PerfDisableSharedMem -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1HeapRegionSize=8M -XX:G1HeapWastePercent=5 -XX:G1MaxNewSizePercent=40 -XX:G1MixedGCCountTarget=4 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1NewSizePercent=30 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:G1ReservePercent=20 -XX:InitiatingHeapOccupancyPercent=15 -XX:MaxGCPauseMillis=200 -XX:MaxTenuringThreshold=1 -XX:SurvivorRatio=32";
jvmOpts = "-Xmx${heap_size} -Xms${heap_size} -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+ParallelRefProcEnabled -XX:+PerfDisableSharedMem -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1HeapRegionSize=8M -XX:G1HeapWastePercent=5 -XX:G1MaxNewSizePercent=40 -XX:G1MixedGCCountTarget=4 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1NewSizePercent=30 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:G1ReservePercent=20 -XX:InitiatingHeapOccupancyPercent=15 -XX:MaxGCPauseMillis=200 -XX:MaxTenuringThreshold=1 -XX:SurvivorRatio=32";
serverProperties = { serverProperties = {
server-port = service_configs.ports.minecraft; server-port = service_configs.ports.minecraft;
enforce-whitelist = true; enforce-whitelist = true;

18
services/quadlet.nix
View File

@ -12,6 +12,24 @@
}; };
in in
{ {
# minecraft-server.containerConfig = baseContainerConfig // {
# image = "docker.io/itzg/minecraft-server:java21-graalvm";
# name = "minecraft";
# environments = {
# TYPE = "QUILT";
# MEMORY = "4G";
# MOD_PLATFORM = "MODRINTH";
# USE_AIKAR_FLAGS = true;
# JVM_OPTS = "-XX:-UseJVMCICompiler";
# MODRINTH_MODPACK = "https://modrinth.com/modpack/sop";
# VERSION = "1.21.1";
# };
# publishPorts = [ "${builtins.toString service_configs.ports.minecraft}:25565" ];
# volumes = [ "${service_configs.minecraft.dir}:/data:z" ];
# };
gluetun.containerConfig = baseContainerConfig // { gluetun.containerConfig = baseContainerConfig // {
image = "docker.io/qmcgaw/gluetun"; image = "docker.io/qmcgaw/gluetun";
name = "gluetun"; name = "gluetun";