diff --git a/devices/cluster/modules/headscale/default.nix b/devices/cluster/modules/headscale/default.nix index ee93f60e..ad298658 100644 --- a/devices/cluster/modules/headscale/default.nix +++ b/devices/cluster/modules/headscale/default.nix @@ -1,35 +1,14 @@ -{ - config, - headscale, - lib, - pkgs, - ... -}: let - inherit (builtins) readFile; - inherit (lib) mkAfter mkForce; - inherit (pkgs.writers) writeYAML; - +{config, ...}: let inherit (config.vars) mainUser hostName; - headscale-flake = headscale.packages.${pkgs.system}.headscale; clusterIP = config.services.pcsd.virtualIps.caddy-vip.ip; in { - environment.systemPackages = [headscale-flake]; users.users.${mainUser}.extraGroups = ["headscale"]; - home-manager.users.${mainUser} - .programs.bash.bashrcExtra = mkAfter (readFile ./completion.bash); - services.headscale = { enable = true; - package = headscale-flake; - }; - # Takes way too long to shutdown - systemd.services."headscale".serviceConfig.TimeoutStopSec = "5"; - - environment.etc."headscale/config.yaml".source = mkForce ( - writeYAML "headscale.yaml" { + settings = { server_url = "https://headscale.nelim.org"; listen_addr = "${clusterIP}:8085"; prefixes = { @@ -82,6 +61,6 @@ in { region_name = "montreal"; }; }; - } - ); + }; + }; } diff --git a/devices/homie/modules/home-assistant/default.nix b/devices/homie/modules/home-assistant/default.nix index 28ad43b9..d2139335 100644 --- a/devices/homie/modules/home-assistant/default.nix +++ b/devices/homie/modules/home-assistant/default.nix @@ -1,4 +1,8 @@ -{pkgs, self, ...}: { +{ + pkgs, + self, + ... +}: { imports = [ ./assist.nix ./bluetooth.nix diff --git a/devices/nos/modules/docker/forgejo/images/act_runner.nix b/devices/nos/modules/docker/forgejo/images/act_runner.nix index 6cacf941..fe2800e7 100644 --- a/devices/nos/modules/docker/forgejo/images/act_runner.nix +++ b/devices/nos/modules/docker/forgejo/images/act_runner.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "vegardit/gitea-act-runner"; - imageDigest = "sha256:5686ce9464839df7333098a61a802d16645d92fa4175b02684a536656d17a28f"; - sha256 = "1wbx08ps26i4cpg3gz4sg919zy8dhabsq2szj18vf66xla57q8xw"; + imageDigest = "sha256:06ab3f910c5015792942d8c338fd865d3dff1163cea2e8c3efd32330c7775802"; + sha256 = "1rvn2wgv54dlrw3g6hzzri543s668f2j6ppkys7g33pdbk435yvh"; finalImageName = imageName; finalImageTag = "dind-latest"; } diff --git a/devices/nos/modules/docker/freshrss/images/rss-bridge.nix b/devices/nos/modules/docker/freshrss/images/rss-bridge.nix index f73a7ccf..e7260131 100644 --- a/devices/nos/modules/docker/freshrss/images/rss-bridge.nix +++ b/devices/nos/modules/docker/freshrss/images/rss-bridge.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "rssbridge/rss-bridge"; - imageDigest = "sha256:fada58f35c97d4e50ae045176339722b69397a6803a46c00799a96160db84092"; - sha256 = "0q4hnmy21v9d5fjya0xn9yl4k5yzxm5irwp13scch6rbx2nn7gnc"; + imageDigest = "sha256:c4fd6ad6e395310cc5d49665bfca638d09ba6cf9d03ad60a5c36361cb7c05251"; + sha256 = "1vicsdlyr103qxp1hnwa30qq25k7vi1m4p4hvb1sran1qd7hcas3"; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/media/bazarr/images/bazarr.nix b/devices/nos/modules/docker/media/bazarr/images/bazarr.nix index 2ab6fa42..397805df 100644 --- a/devices/nos/modules/docker/media/bazarr/images/bazarr.nix +++ b/devices/nos/modules/docker/media/bazarr/images/bazarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/linuxserver/bazarr"; - imageDigest = "sha256:137f55b12859e7f6905c513d403ba80dfe3b2afe7fa892c891c1982996a114ba"; - sha256 = "18nlm339ji57rbmps1vbzni1c84j7k5ph9lxgs62396fal4rilg9"; + imageDigest = "sha256:d7d431c29d1c94e7009b6b8b1eb5078689416278b5e6664cad864b28b9ead345"; + sha256 = "0j5yblqqljv7rcvfk2a9m4xlng3gq3amc740xljhmsac1wlsn0r1"; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/media/prowlarr/images/flaresolverr.nix b/devices/nos/modules/docker/media/prowlarr/images/flaresolverr.nix index 45195134..ab511702 100644 --- a/devices/nos/modules/docker/media/prowlarr/images/flaresolverr.nix +++ b/devices/nos/modules/docker/media/prowlarr/images/flaresolverr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "21hsmw/flaresolverr"; - imageDigest = "sha256:14447de91cff69e78059864e6540d42a5b94a8ec1b1856485cd015afbab91b9c"; - sha256 = "16s1zalnznsj8w2h2rdjpll9zqgiy2iqs79d2znxn8cm6qvd8zb3"; + imageDigest = "sha256:a85e675e7b4e980e142d58e440dd3e1b6fa6bc10aabcc612727f81e34c28db80"; + sha256 = "1wn32jl4za7y4sj5ljz5m87z46maz65c4ckznz84mp15f008c5y4"; finalImageName = imageName; finalImageTag = "nodriver"; } diff --git a/devices/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix b/devices/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix index 14526f15..c0c4ff92 100644 --- a/devices/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix +++ b/devices/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/linuxserver/sabnzbd"; - imageDigest = "sha256:a33738b946bee3bd2a754b2e576643d069ac2913d88290ef13d8e00f0c0e1224"; - sha256 = "0zvfd75brjqkrpnqrg2gk9z3l0dn4d78x4iqzhm3gc9v1a03rp25"; + imageDigest = "sha256:f87f9d4fa0e19f8e7b292638b3fa89cafc4a96d858fbda8106e3cea6343432c1"; + sha256 = "0vxk5w9yf9aray1aq13djs6yqpmd2082zjldb1m5ijfxba85iq9y"; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/jellyfin/images/jfa-go.nix b/devices/nos/modules/jellyfin/images/jfa-go.nix index 2d0af284..7ee4f684 100644 --- a/devices/nos/modules/jellyfin/images/jfa-go.nix +++ b/devices/nos/modules/jellyfin/images/jfa-go.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "hrfee/jfa-go"; - imageDigest = "sha256:958d926bd245b6a6a11155f02f04b3d3e05130cc1da98290a68fa5d911fe2f0f"; - sha256 = "07a8g77lqan6aga7yc8yjhp05blh9l4a44avc2c29z9wg6y19wfa"; + imageDigest = "sha256:f78c5b727b6c94942803f6a3bc47aa60fe197b97417d869448aa6e7fd4bba55c"; + sha256 = "0ha6dfpqy083h48akzk8wmc4v9vhjvjv395fwyv5inxzy70y3i5l"; finalImageName = imageName; finalImageTag = "unstable"; } diff --git a/devices/nos/modules/qbittorrent/vuetorrent.nix b/devices/nos/modules/qbittorrent/vuetorrent.nix index fc1c5074..c848627f 100644 --- a/devices/nos/modules/qbittorrent/vuetorrent.nix +++ b/devices/nos/modules/qbittorrent/vuetorrent.nix @@ -1,6 +1,6 @@ # This file was autogenerated. DO NOT EDIT! { - version = "2.14.0"; - url = "https://github.com/VueTorrent/VueTorrent/releases/download/v2.14.0/vuetorrent.zip"; - hash = "sha256-+RDIVwxPR62/ekCTKC1s3JPWpW5ZMcW4BacsUz+7VRw="; + version = "2.14.1"; + url = "https://github.com/VueTorrent/VueTorrent/releases/download/v2.14.1/vuetorrent.zip"; + hash = "sha256-WCLsswPtAveGEI75jdTDhSfY/QLR4FmV81qjL+QLAis="; } diff --git a/flake.lock b/flake.lock index 09c78291..03ea83b8 100644 Binary files a/flake.lock and b/flake.lock differ diff --git a/flake.nix b/flake.nix index 41354fb6..d056936a 100644 Binary files a/flake.nix and b/flake.nix differ diff --git a/inputs.nix b/inputs.nix index ef4a3241..c3650208 100644 --- a/inputs.nix +++ b/inputs.nix @@ -65,13 +65,6 @@ let repo = "nixos-pcsd"; }; - # FIXME: use nixpkgs once this reaches unstable https://pr-tracker.nelim.org/?pr=340054 - headscale = mkDep { - owner = "juanfont"; - repo = "headscale"; - ref = "v0.23.0"; - }; - caddy-plugins = mkDep { owner = "matt1432"; repo = "nixos-caddy-cloudflare"; diff --git a/legacyPackages/firefox-addons/generated-firefox-addons.nix b/legacyPackages/firefox-addons/generated-firefox-addons.nix index 3644f7dc..9b1d48b8 100644 --- a/legacyPackages/firefox-addons/generated-firefox-addons.nix +++ b/legacyPackages/firefox-addons/generated-firefox-addons.nix @@ -103,10 +103,10 @@ }; "floccus" = buildFirefoxXpiAddon { pname = "floccus"; - version = "5.3.0.2"; + version = "5.3.1"; addonId = "floccus@handmadeideas.org"; - url = "https://addons.mozilla.org/firefox/downloads/file/4360762/floccus-5.3.0.2.xpi"; - sha256 = "25b7cce38a3b96823739b6cf599c07ce1baedad83b30e75340ffd7535a9d4287"; + url = "https://addons.mozilla.org/firefox/downloads/file/4367114/floccus-5.3.1.xpi"; + sha256 = "11e917118d059aced688f5ef467782b7a1326297db27ba92ff2379f72e5a43b6"; meta = with lib; { homepage = "https://floccus.org"; description = "Sync your bookmarks and tabs across browsers via Nextcloud, any WebDAV service, any Git service, via a local file, via Google Drive."; @@ -243,10 +243,10 @@ }; "sponsorblock" = buildFirefoxXpiAddon { pname = "sponsorblock"; - version = "5.9.3"; + version = "5.9.4"; addonId = "sponsorBlocker@ajay.app"; - url = "https://addons.mozilla.org/firefox/downloads/file/4360577/sponsorblock-5.9.3.xpi"; - sha256 = "ea3d137e458f1a87f406cbb39f3099ee673918c40c1bad5b48bc26e9bfc8be62"; + url = "https://addons.mozilla.org/firefox/downloads/file/4364207/sponsorblock-5.9.4.xpi"; + sha256 = "1bff70a70685caaf444b57984a26c910a456bbbcc50d24d2d58a081ba114f7a3"; meta = with lib; { homepage = "https://sponsor.ajay.app"; description = "Easily skip YouTube video sponsors. When you visit a YouTube video, the extension will check the database for reported sponsors and automatically skip known sponsors. You can also report sponsors in videos. Other browsers: https://sponsor.ajay.app";