From 89763565963836453feb0d3ac74ee80af8a29704 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 24 Dec 2024 19:57:47 +0100 Subject: [PATCH] update things --- flake.lock | 20 ++++++++++---------- flake.nix | 2 +- services/minecraft.nix | 9 ++++----- services/qbittorrent.nix | 3 ++- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index c4f5b6f..8abad20 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1734314370, - "narHash": "sha256-9PhjDAAuXP4tuJg+kM1AozKwBFyHHJ8ZqhQD+peqGtg=", + "lastModified": 1735004788, + "narHash": "sha256-4fR1BPM2IJWbCaoAQqkVr+DhDzpgGhbfLcl7V2fd0ME=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "616634de04e87b621bc3d495af114c4e9c6ccd36", + "rev": "cc5f59e353d94a907cd9e06919aaecb093b59d46", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734352517, - "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", + "lastModified": 1734954597, + "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", + "rev": "def1d472c832d77885f174089b0d34854b007198", "type": "github" }, "original": { @@ -74,16 +74,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734827055, - "narHash": "sha256-stFrYYMZd9ydDbp7/EmzDZg0AwvKM6kxvVEvDqy5eKk=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d3dc18887e5dd8c1c16a60b9e63e54fe62a21f", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { "owner": "NixOS", - "ref": "master", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 0ba2e8b..1264196 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Flake for server muffin"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/master"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; diff --git a/services/minecraft.nix b/services/minecraft.nix index 5a94bd2..27f27e0 100644 --- a/services/minecraft.nix +++ b/services/minecraft.nix @@ -68,11 +68,10 @@ in sha512 = "1574d3a0f81220ff1daacbda79ce889ac4120ebeb8ad51fdce11a27413603f9e5d37fdcfbb90f206b50559fa65aec68d515559cf91d223116e4f314aa69cf468"; }; - # Not updated to 1.21.4 - # squaremap = fetchurl { - # url = "https://jenkins.jpenilla.xyz/job/squaremap/lastSuccessfulBuild/artifact/build/libs/squaremap-fabric-mc1.21.3-1.3.4-SNAPSHOT+4c8b7c6.jar"; - # sha256 = "6dja1qdEBNn/cOvPrvmiZCcIT2gpeZgqjHN/MpKHweU="; - # }; + squaremap = fetchurl { + url = "https://jenkins.jpenilla.xyz/job/squaremap/lastSuccessfulBuild/artifact/build/libs/squaremap-fabric-mc1.21.4-1.3.4-SNAPSHOT+53d7948.jar"; + sha256 = "v1iCRTXvTLuxEy1hzbd9fVXmY62nqBAhFTEfdIu7sAk="; + }; } ); }; diff --git a/services/qbittorrent.nix b/services/qbittorrent.nix index 740bfc4..56f77ef 100644 --- a/services/qbittorrent.nix +++ b/services/qbittorrent.nix @@ -49,8 +49,9 @@ }; serverConfig.BitTorrent.Session = { - GlobalUPSpeedLimit = 100; # in KiB/s + GlobalUPSpeedLimit = 50; # in KiB/s GlobalDLSpeedLimit = 1000; # in KiB/s + GlobalMaxRatio = 6; QueueingSystemEnabled = false; # seed all torrents all the time }; };