feat: remove minecraft and add grafana secret
This commit is contained in:
parent
ce89f2fcda
commit
cc2036d95e
10 changed files with 21 additions and 106 deletions
|
|
@ -1,33 +0,0 @@
|
|||
{ config, pkgs, inputs, ... }:
|
||||
|
||||
{
|
||||
imports = [ inputs.nix-minecraft.nixosModules.minecraft-servers ];
|
||||
|
||||
nixpkgs.overlays = [ inputs.nix-minecraft.overlay ];
|
||||
|
||||
services.minecraft-servers = {
|
||||
enable = true;
|
||||
eula = true;
|
||||
|
||||
servers = {
|
||||
fabric = {
|
||||
enable = true;
|
||||
# Use fetchPackwizModpack to get the server with mods
|
||||
package = pkgs.fetchPackwizModpack {
|
||||
url = "https://raw.githubusercontent.com/Fabulously-Optimized/fabulously-optimized/main/Packwiz/1.20.1/pack.toml";
|
||||
packHash = "sha256-eoaJQtlb6BfCFVG8iUYxVQD5woLq+kecJj6GvBA1IqQ="; # User must update this hash!
|
||||
};
|
||||
serverProperties = {
|
||||
motd = "Extremist Software Minecraft Server";
|
||||
difficulty = "hard";
|
||||
view-distance = 10;
|
||||
simulation-distance = 10;
|
||||
max-players = 5;
|
||||
enable-rcon = true;
|
||||
"rcon.password" = config.mySecrets.minecraftRcon;
|
||||
};
|
||||
jvmOpts = "-Xms2G -Xmx2500M -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -30,6 +30,9 @@
|
|||
http_addr = "127.0.0.1";
|
||||
domain = "status.extremist.software";
|
||||
};
|
||||
security = {
|
||||
secret_key = config.mySecrets.grafanaSecret;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
{ lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
options.mySecrets = {
|
||||
forgejoDb = mkOption {
|
||||
type = types.str;
|
||||
description = "Forgejo Database Password";
|
||||
};
|
||||
stalwartAdmin = mkOption {
|
||||
type = types.str;
|
||||
description = "Stalwart Mail Admin Password";
|
||||
};
|
||||
searxKey = mkOption {
|
||||
type = types.str;
|
||||
description = "Searx Secret Key";
|
||||
};
|
||||
minecraftRcon = mkOption {
|
||||
type = types.str;
|
||||
description = "Minecraft RCON Password";
|
||||
};
|
||||
tailscaleKey = mkOption {
|
||||
type = types.str;
|
||||
description = "Tailscale Auth Key";
|
||||
};
|
||||
sshPublicKey = mkOption {
|
||||
type = types.str;
|
||||
description = "SSH Public Key for Root User";
|
||||
};
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue