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

update mods and options

Browse Source
This commit is contained in:
Simon Gardling 2025-01-21 23:27:39 -05:00
parent aecc71d1a3
commit cb42a4b357
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
4 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configuration.nix
View File

@ -55,7 +55,10 @@
boot = { boot = {
kernelPackages = pkgs.linuxPackages; kernelPackages = pkgs.linuxPackages;
kernelParams = [ "zfs.zfs_arc_max=2000000000" ]; kernelParams = [
# 2048MB
"zfs.zfs_arc_max=2048000000"
];
supportedFilesystems = [ "zfs" ]; supportedFilesystems = [ "zfs" ];
zfs.extraPools = [ "tank" ]; zfs.extraPools = [ "tank" ];

18
flake.lock generated
View File

@ -64,11 +64,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736473741, "lastModified": 1737510347,
"narHash": "sha256-mt/uzoQ9J7o4lEP1mBJSArE6jsXKhpbnBWFfeOu0CUc=", "narHash": "sha256-wEEkmpmd5FF0HEBeA3upQg2W1yI7jGJ7xg2dmKuZE7o=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "39e804edbf69b926d25db2bb43b80995911d5776", "rev": "ed6d2231a22a507f9a32d5661ef17c76eab8404d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -79,11 +79,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1736441705, "lastModified": 1737359802,
"narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", "narHash": "sha256-utplyRM6pqnN940gfaLFBb9oUCSzkan86IvmkhsVlN8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", "rev": "61c79181e77ef774ab0468b28a24bc2647d498d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -95,11 +95,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736200483, "lastModified": 1737299813,
"narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "rev": "107d5ef05c0b1119749e381451389eded30fb0d5",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
services/minecraft.nix
View File

@ -43,7 +43,10 @@ in
"mods" = pkgs.linkFarmFromDrvs "mods" ( "mods" = pkgs.linkFarmFromDrvs "mods" (
with pkgs; with pkgs;
builtins.attrValues { builtins.attrValues {
FabricApi = fetchurl { url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/IrJDerMf/fabric-api-0.114.1%2B1.21.4.jar"; sha512 = "ce8e14be350154c5b3b8346b122d9a1a4721f129b1263584b1b94e2038bb9d787bfc127b858aa07487d961d460adf16687a6d914ce5d6036efea12703726347c"; }; FabricApi = fetchurl {
url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/8FAH9fuR/fabric-api-0.114.2%2B1.21.4.jar";
sha512 = "24ed904096a17f65ef2ee4b04e076df2df076bd7748c838573cf97f5b38d2353bf62fe202779fb0c8372a82fb1133e16ce1fba585e2ec5aa5a5164203e785072";
};
FerriteCore = fetchurl { FerriteCore = fetchurl {
url = "https://cdn.modrinth.com/data/uXXizFIs/versions/IPM0JlHd/ferritecore-7.1.1-fabric.jar"; url = "https://cdn.modrinth.com/data/uXXizFIs/versions/IPM0JlHd/ferritecore-7.1.1-fabric.jar";
@ -66,8 +69,13 @@ in
}; };
squaremap = fetchurl { squaremap = fetchurl {
url = "https://jenkins.jpenilla.xyz/job/squaremap/lastSuccessfulBuild/artifact/build/libs/squaremap-fabric-mc1.21.4-1.3.5-SNAPSHOT+24f14ef.jar"; url = "https://cdn.modrinth.com/data/PFb7ZqK6/versions/9i2KwI5R/squaremap-fabric-mc1.21.4-1.3.4.jar";
sha256 = "0a3f0yn3m01nb485mls4f8knx04gnw1syi65m5y2znz3j05mxh12"; sha512 = "6eb44061f057d1bbd0bb6f9186d03d496479dcd953af8f09f70099c2e67e567e5dca626972d45af0315c2e2714c3dd74beef97575396e3bb90b7c670f5c80fef";
};
modernfix = fetchurl {
url = "https://cdn.modrinth.com/data/nmDcB62a/versions/gx7PIV8n/modernfix-fabric-5.20.1%2Bmc1.21.4.jar";
sha512 = "e1596a89dc100f454c445d64b5ebf59f1788de22270a4ca52837337abe6a76c517c771e234ededbadf5b51dbb62efe1bc0eccee841c45bc263f9406d8348dfe8";
}; };
} }
); );

16
services/qbittorrent.nix
View File

@ -2,6 +2,7 @@
pkgs, pkgs,
config, config,
service_configs, service_configs,
username,
... ...
}: }:
{ {
@ -33,8 +34,8 @@
WebUI = { WebUI = {
AlternativeUIEnabled = true; AlternativeUIEnabled = true;
RootFolder = "${pkgs.fetchzip { RootFolder = "${pkgs.fetchzip {
url = "https://github.com/VueTorrent/VueTorrent/releases/download/v2.19.0/vuetorrent.zip"; url = "https://github.com/VueTorrent/VueTorrent/releases/download/v2.21.0/vuetorrent.zip";
sha256 = "cIY5fhcLyEPwt5D2T0S4KhAbb8Qmd9m3xcsQTa4FX+8="; sha256 = "ELerk/4q+eR3rmCx/jFoDirrmx12D+5JBfDZjkPK5wA=";
}}"; }}";
# disable auth because we use caddy for auth # disable auth because we use caddy for auth
@ -48,7 +49,8 @@
}; };
}; };
serverConfig.BitTorrent.Session = { serverConfig.BitTorrent = {
Session = {
GlobalUPSpeedLimit = 500; # in KiB/s GlobalUPSpeedLimit = 500; # in KiB/s
GlobalDLSpeedLimit = 0; GlobalDLSpeedLimit = 0;
@ -56,10 +58,11 @@
# uses upload to communicate with seeders # uses upload to communicate with seeders
IncludeOverheadInLimits = false; IncludeOverheadInLimits = false;
GlobalMaxRatio = 6; GlobalMaxRatio = 2;
QueueingSystemEnabled = false; # seed all torrents all the time QueueingSystemEnabled = false; # seed all torrents all the time
}; };
}; };
};
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d ${config.services.qbittorrent.serverConfig.Preferences.Downloads.SavePath} 0755 ${config.services.qbittorrent.user} ${config.services.qbittorrent.group}" "d ${config.services.qbittorrent.serverConfig.Preferences.Downloads.SavePath} 0755 ${config.services.qbittorrent.user} ${config.services.qbittorrent.group}"
@ -71,4 +74,9 @@
enable = true; enable = true;
vpnNamespace = "wg"; vpnNamespace = "wg";
}; };
users.users.${username}.extraGroups = [
config.services.qbittorrent.group
];
} }