diff --git a/configuration.nix b/configuration.nix index fbdf9a6..1540f8d 100644 --- a/configuration.nix +++ b/configuration.nix @@ -59,7 +59,8 @@ }; boot = { - kernelPackages = pkgs.linuxPackages; + # 6.12 LTS until 2027 + kernelPackages = pkgs.linuxPackages_6_12; loader = { # Use the systemd-boot EFI boot loader. diff --git a/flake.lock b/flake.lock index 0522216..4c73e58 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1738148035, - "narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=", + "lastModified": 1739841949, + "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", "owner": "nix-community", "repo": "disko", - "rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", + "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", "type": "github" }, "original": { @@ -54,11 +54,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { @@ -161,11 +161,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1737639419, - "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", + "lastModified": 1739186342, + "narHash": "sha256-2j+sln9RwQn+g7J4GmdFFgvqXnLkvWBNMaUzONlkzUE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", + "rev": "3bdeebbc484a09391c4f0ec8a37bb77809426660", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1738547119, - "narHash": "sha256-cc6AfR7W0AavgqA5nHUXRUus4Rr7oPWQNku5nhR4SYs=", + "lastModified": 1740188624, + "narHash": "sha256-z5G/JoTGICMdhxkN+sztsrcCD7vRFHIJiw/fchHX580=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "5b93268c80c3300dbec0fbbb2b50f674f84a474a", + "rev": "8c0d05c3ce359b0d08226298ff7e4200486cbed3", "type": "github" }, "original": { @@ -198,11 +198,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738471961, - "narHash": "sha256-cgXDFrplNGs7bCVzXhRofjD8oJYqqXGcmUzXjHmip6Y=", + "lastModified": 1740089251, + "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "537286c3c59b40311e5418a180b38034661d2536", + "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30", "type": "github" }, "original": { @@ -214,11 +214,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738435198, - "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=", + "lastModified": 1740162160, + "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3", + "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 25a84ba..e43f6b8 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,7 @@ service_configs = rec { zpool = "tank"; hdd_path = "/mnt/hdd"; - services_dir = "/tank/services"; + services_dir = "/${zpool}/services"; torrent_group = "media"; # TODO: add checks to make sure none of these collide @@ -102,7 +102,7 @@ }; owntracks = { - data_dir = "/tank/services/owntracks"; + data_dir = services_dir + "/owntracks"; }; }; in diff --git a/secrets/minecraft-whitelist.nix b/secrets/minecraft-whitelist.nix index 5c7462f..82ec65c 100644 Binary files a/secrets/minecraft-whitelist.nix and b/secrets/minecraft-whitelist.nix differ diff --git a/services/minecraft.nix b/services/minecraft.nix index 4aaa214..0259318 100644 --- a/services/minecraft.nix +++ b/services/minecraft.nix @@ -51,8 +51,8 @@ in with pkgs; builtins.attrValues { FabricApi = fetchurl { - url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/UnrycCWP/fabric-api-0.115.1%2B1.21.4.jar"; - sha512 = "d5e9f87679b5edc9786e651fc481f8861a9cf53ed381890a1cb5e129222d6c5fa99f06045007f8e1fba02da686cdb6db2d99b334a1d23881cb56dfa199932eea"; + url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/ZNwYCTsk/fabric-api-0.118.0%2B1.21.4.jar"; + sha512 = "1e0d31b6663dc2c7be648f3a5a9cf7b698b9a0fd0f7ae16d1d3f32d943d7c5205ff63a4f81b0c4e94a8997482cce026b7ca486e99d9ce35ac069aeb29b02a30d"; }; FerriteCore = fetchurl { @@ -61,8 +61,8 @@ in }; Lithium = fetchurl { - url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/t1FlWYl9/lithium-fabric-0.14.3%2Bmc1.21.4.jar"; - sha512 = "1a4eafbdcee3886d33c04aa462d13a8c1e345ff492001add262476585b78327a2d016e56385bced869615bc97161a34a0a716f5f579c8c1d7080b278f4f11183"; + url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/kLc5Oxr4/lithium-fabric-0.14.8%2Bmc1.21.4.jar"; + sha512 = "ea0d7a4aea29b32527245d933227c85d0606e17c88cc05ed9918a1b966f22011961bfa85e33ab318e729f1ac3e69217d37709413bf70d1dc5a3acc9fd75ef317"; }; NoChatReports = fetchurl { @@ -81,8 +81,13 @@ in }; modernfix = fetchurl { - url = "https://cdn.modrinth.com/data/nmDcB62a/versions/gx7PIV8n/modernfix-fabric-5.20.1%2Bmc1.21.4.jar"; - sha512 = "e1596a89dc100f454c445d64b5ebf59f1788de22270a4ca52837337abe6a76c517c771e234ededbadf5b51dbb62efe1bc0eccee841c45bc263f9406d8348dfe8"; + url = "https://cdn.modrinth.com/data/nmDcB62a/versions/ZGxQddYr/modernfix-fabric-5.20.3%2Bmc1.21.4.jar"; + sha512 = "ae49114c92a048c9ce79e197fc4df028e186cf13546e710f72247382fa8076f0b70d6aa3224951f4a36c886ca236f099a011f20b021a2b0d1a75c631da4d7d52"; + }; + + alternatecurrent = fetchurl { + url = "https://cdn.modrinth.com/data/r0v8vy1s/versions/DwfiGUVU/alternate-current-mc1.21.2-1.9.1.jar"; + sha512 = "8ed44291a8aed3e1c9750cfce85e0de679daeff7c3b1bc8f6329b41ba4570442750b8039d2d5c79c32655fc9372ea35843c60805438d33888b30e28731c39137"; }; } ); diff --git a/services/qbittorrent.nix b/services/qbittorrent.nix index a594dc8..eeaf219 100644 --- a/services/qbittorrent.nix +++ b/services/qbittorrent.nix @@ -35,8 +35,8 @@ WebUI = { AlternativeUIEnabled = true; RootFolder = "${pkgs.fetchzip { - url = "https://github.com/VueTorrent/VueTorrent/releases/download/v2.21.0/vuetorrent.zip"; - sha256 = "ELerk/4q+eR3rmCx/jFoDirrmx12D+5JBfDZjkPK5wA="; + url = "https://github.com/VueTorrent/VueTorrent/releases/download/v2.22.0/vuetorrent.zip"; + sha256 = "UJflyTyftWSIOi942OgH/tvylyAeo6EjR14U0SHk6bs="; }}"; # disable auth because we use caddy for auth @@ -60,22 +60,30 @@ # uses upload to communicate with seeders IncludeOverheadInLimits = false; - GlobalMaxRatio = 3; + GlobalMaxRatio = 4; QueueingSystemEnabled = false; # seed all torrents all the time AddTrackersEnabled = true; AdditionalTrackers = ( - lib.concatStrings ( - map (url: url + "\\n") [ - "udp://tracker.opentrackr.org:1337/announce" - "udp://open.stealth.si:80/announce" - "udp://open.demonii.com:1337" - "udp://exodus.desync.com:6969/announce" - "udp://tracker.dler.org:6969/announce" - "udp://tracker.bittor.pw:1337/announce" - "udp://tracker.torrent.eu.org:451/announce" - ] - ) + lib.concatStringsSep "\\n" [ + "udp://tracker.opentrackr.org:1337/announce" + "udp://open.stealth.si:80/announce" + "udp://open.demonii.com:1337" + "udp://exodus.desync.com:6969/announce" + "udp://tracker.dler.org:6969/announce" + "udp://tracker.bittor.pw:1337/announce" + "udp://tracker.torrent.eu.org:451/announce" + # "udp://opentracker.i2p.rocks:6969/announce" + # "udp://tracker.openbittorrent.com:6969/announce" + # "udp://aarsen.me:6969/announce" + "udp://explodie.org:6969/announce" + # "udp://uploads.gamecoast.net:6969/announce" + "http://tracker.files.fm:6969/announce" + "udp://tracker.tiny-vps.com:6969/announce" + "udp://p4p.arenabg.com:1337/announce" + "udp://tracker.dler.com:6969/announce" + "udp://inferno.demonoid.is:3391/announce" + ] ); }; };