From 3766f3960a2ddeba15796f23100b467bbff3d5a5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 22 Feb 2025 20:38:19 -0500 Subject: [PATCH] update --- configuration.nix | 3 +- flake.lock | 48 ++++++++++++++++---------------- flake.nix | 4 +-- secrets/minecraft-whitelist.nix | Bin 408 -> 638 bytes services/minecraft.nix | 17 +++++++---- services/qbittorrent.nix | 36 ++++++++++++++---------- 6 files changed, 61 insertions(+), 47 deletions(-) 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 5c7462f66d9489a9513db9e49d5dad2fc36f1f76..82ec65cdb3ad26596e64a6774f3d316f86fc6687 100644 GIT binary patch literal 638 zcmZQ@_Y83kiVO&0IPgn+yXXp)jgk!gHy6(?ZIQbFa+&brOuw>Y&%>OLW=^@4nRa;7 z@AHDjq1%o9jp}c&&RwD(s`JHN$Etk&pJ{W?UtV>2$#ur2-7EY!&R@Fni}`3s_Z9O` zO&%6$UF&Bpv;2JT^8CATp;Dp8RE!{|tm6j`>9%Q>b?91nZnHa;Yh(E@P472@dm?v}%1JTt zz6W1zx!GA}@D}TR_PTES>2~%Kk=GZUI-}2pu>bDtaou@Mzw&3qv^OHZwgf*^U9|tr zBY~FlK1`=$O{9Dd2372G42$_B^7{Sj&)1G$KEEy1@{)w*r035)m^ivz?7Zctp3ODA zyg+)ltkXM7uZJPI>gq0<60*#D0DSY+%!s%rKNdWc& BFz)~W literal 408 zcmZQ@_Y83kiVO&0SS&m_*o&!+yW)=76K9K;+Zu`(^LMpfdNP51`i76Ud!r_WluqO< zyxM(X!N&TnD>ksJRMh{CURNdYi)XKM>8CA~CjAQUgf*ufUAt|~sXASm51W>8e7ZJg zjlvxtceOT|Ysa}<)@(7C`txqVwuz6{sPI2fe6(Q6i(Z+|>qqsXkGtgmk~;nCn=I?* z*$HpVbX5*Gy6D;bw|lfb;J21eag480Tu1mnmDw}v6|UvpK9#D|WGEK3ZsYnQZH}%3 z>KfhWnR}zm8KQ01zGmw1s5&&gWJ=+xicF3QxiF8hA&