From 805c3949459382ef2672d58b8b658137bac995af Mon Sep 17 00:00:00 2001 From: matt1432 Date: Thu, 10 Oct 2024 14:59:38 -0400 Subject: [PATCH] chore: update flake.lock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake Inputs: • Updated input 'agsV2': 'github:Aylur/ags/1341310' (2024-09-30) → 'github:Aylur/ags/35e40fd' (2024-10-09) • Updated input 'astal': 'github:Aylur/astal/2a3bb3a' (2024-10-07) → 'github:Aylur/astal/921272a' (2024-10-10) • Updated input 'gpu-screen-recorder-src': 'git+https://repo.dec05eba.com/gpu-screen-recorder?ref=refs/heads/master&rev=0a8d176' (2024-10-07) → 'git+https://repo.dec05eba.com/gpu-screen-recorder?ref=refs/heads/master&rev=935a7b8' (2024-10-09) • Updated input 'home-manager': 'github:nix-community/home-manager/0386303' (2024-10-07) → 'github:nix-community/home-manager/d47d332' (2024-10-10) • Updated input 'hyprgrass': 'github:horriblename/hyprgrass/427690a' (2024-08-25) → 'github:horriblename/hyprgrass/1535962' (2024-10-09) • Updated input 'hyprland': 'github:hyprwm/Hyprland/613eac4' (2024-10-08) → 'github:hyprwm/Hyprland/b65773b' (2024-10-10) • Updated input 'material-rounded-theme-src': 'github:Nerwyn/material-rounded-theme/d78298f' (2024-09-17) → 'github:Nerwyn/material-rounded-theme/40f93bd' (2024-10-10) • Updated input 'nix-gaming': 'github:fufexan/nix-gaming/d5e4fb8' (2024-10-08) → 'github:fufexan/nix-gaming/86a897d' (2024-10-10) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/c31898a' (2024-10-06) → 'github:NixOS/nixpkgs/5633bcf' (2024-10-09) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/0a5e8f7' (2024-10-08) → 'github:nix-community/nixpkgs-wayland/2a1ef3c' (2024-10-10) • Updated input 'piper-src': 'github:libratbag/piper/0f72869' (2024-09-24) → 'github:libratbag/piper/c6e54f6' (2024-10-09) • Updated input 'spotifywebapi-src': 'github:thlucas1/SpotifyWebApiPython/c1e2f4b' (2024-10-05) → 'github:thlucas1/SpotifyWebApiPython/e885769' (2024-10-10) • Updated input 'tuya-local-src': 'github:make-all/tuya-local/df26ea0' (2024-10-08) → 'github:make-all/tuya-local/20c1224' (2024-10-10) Docker Images: • hrfee/jfa-go unstable: sha256:958d926bd245b6a6a11155f02f04b3d3e05130cc1da98290a68fa5d911fe2f0f → sha256:f78c5b727b6c94942803f6a3bc47aa60fe197b97417d869448aa6e7fd4bba55c • vegardit/gitea-act-runner dind-latest: sha256:5686ce9464839df7333098a61a802d16645d92fa4175b02684a536656d17a28f → sha256:06ab3f910c5015792942d8c338fd865d3dff1163cea2e8c3efd32330c7775802 • rssbridge/rss-bridge latest: sha256:fada58f35c97d4e50ae045176339722b69397a6803a46c00799a96160db84092 → sha256:c4fd6ad6e395310cc5d49665bfca638d09ba6cf9d03ad60a5c36361cb7c05251 • ghcr.io/linuxserver/bazarr latest: sha256:137f55b12859e7f6905c513d403ba80dfe3b2afe7fa892c891c1982996a114ba → sha256:d7d431c29d1c94e7009b6b8b1eb5078689416278b5e6664cad864b28b9ead345 • 21hsmw/flaresolverr nodriver: sha256:14447de91cff69e78059864e6540d42a5b94a8ec1b1856485cd015afbab91b9c → sha256:a85e675e7b4e980e142d58e440dd3e1b6fa6bc10aabcc612727f81e34c28db80 • ghcr.io/linuxserver/sabnzbd latest: sha256:a33738b946bee3bd2a754b2e576643d069ac2913d88290ef13d8e00f0c0e1224 → sha256:f87f9d4fa0e19f8e7b292638b3fa89cafc4a96d858fbda8106e3cea6343432c1 Firefox Addons: floccus: 5.3.0.2 -> 5.3.1 sponsorblock: 5.9.3 -> 5.9.4 Misc Sources: Vuetorrent: 2.14.0 -> 2.14.1 --- devices/cluster/modules/headscale/default.nix | 29 +++--------------- .../homie/modules/home-assistant/default.nix | 6 +++- .../docker/forgejo/images/act_runner.nix | 4 +-- .../docker/freshrss/images/rss-bridge.nix | 4 +-- .../docker/media/bazarr/images/bazarr.nix | 4 +-- .../media/prowlarr/images/flaresolverr.nix | 4 +-- .../docker/media/sabnzbd/images/sabnzbd.nix | 4 +-- .../nos/modules/jellyfin/images/jfa-go.nix | 4 +-- .../nos/modules/qbittorrent/vuetorrent.nix | 6 ++-- flake.lock | Bin 57232 -> 56618 bytes flake.nix | Bin 11208 -> 10977 bytes inputs.nix | 7 ----- .../generated-firefox-addons.nix | 12 ++++---- 13 files changed, 30 insertions(+), 54 deletions(-) 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 09c782914faae355f96ea403a277f75d381050cc..03ea83b85817ba738867e241d22db783eda00956 100644 GIT binary patch delta 1718 zcmXw)OKf9T8OKFuG8u*eI)cuOB8}Th(>jd>KIfh{P$WNMJATIYB(@{9%y~L~#ZDY2 z@koQj1`w|@I-9O&=>kM0T97vgR3R3XSX3yKJ%Sxe5Gxi%9J@uj(%szu`Of$M{=e`3 z`1e=d{_T}tegEn;P5@@uLlsLjYo*%JaC8hS>1sNYOD5-{eY!mv?&`|X(NTsrrWIEx zH}bZk{jKzE|Ie$*O++jP&L|^5gf)nmQrsyRal^3GfJI6XB2DD$*Gob01z&?}i?`Q4 zxUxo=z``Ftj%{`K1x16x@hI2F-3O#w=$?6C6z@MI`T>Jjm7IX4qjZt0ut>1^|M%_ z%68lQY%-y#UOUPi%Bay3x;i>k>1}FiM_EJ6I9(OlY(ISeo9DfRcQyqgk|{1CD}a?o zK+A--hH1qBgqjL11w$72H{soKmw`ucNMu5rvs1iXAJmH?(x8CE+pdsaW2 z8k*>hYJ;9enl_r#X@$3%7w|A;C&lFXUYK8X3MjFa_XqQtS0jjhH z*7#rlyzJv?;{Q9mzer~O^QkpLFlK)8Qfy0>6PaGdB2?GIy;8?jbKULfPzYYO*;Y}5 z+Bq)PMx>o){?AX{@n3Fk_-gKp{&sp_kNojV_qJ@Re>&BvQW`W4@~L8KetdX-k~!?QCIWU!j~;CI+XGda zwWDMIw{PF|6ZuvD>MQH<5N&~!L4-l!q%y#ACM5tAI2kS@mDDu6mToV`a_8wl6XAiT z5U#E4ptE<{=_I1w!J|=AW>99@9k$!0{z3nI8ufaef|2RWzUd}c?Or~9!CyRi=E+Cb z<3b=!l#GzWHju$pu$TgfEtL{6%?Y-|p^uUJL>ByhVF9KetgVp<#`e%b4NKTVwr1%tAAKzb!7r=k_GwT6mOrll160OlV zKWKMqb$eoDE;VhVGVSe;&-3j`V^_g>es8B!pSXObzN9H^&R6gGue@IM zT3KSk!r}@@%oIb^Ei;dyg{xeDthwcXxpjYW=goh7*5Cft=N8F#{{2kYDkx-bNwuhN z@AeY_*V_Bj!mODeRdEd*rP3FMWoocuDtfkk)E&72ORerPe(#=dzaM+@(R$o+P8b#3 zB8@mDQVYhlj<97&xL^$Cf=h!|fCt&4{eJUi*x@iZu>5z-_p*s$$JWb<@id1@6muC4~r&An`SCv2iq1cRo4swjCW?>4E!Xeu>(jeHXlmj#jz!?aE OPqiwG_dfi~&Hn*A8!V6j delta 1924 zcmYLKOK)4p8AWPQR#n5bq1X-#n^jUbW<(^M_sorhwtR@Njhe!Ry zY3UR;%{%QI=8L7sU5E+95CEYiQBWyOFc-cD7i#YNR5$6VE)^zHVV| zn#ZeG9({Q+gd}!dEH%^0a|rS<^AYe}O#xCuInebvfv!tUX(c}7_z8t`qQDCk< z2!@X%Ww(O1!Jc$586A&m$x+(@6E@6sH@8P8T`g!UHk>4m3u*I1C_+FAA95yL<{}6v z_I<7?$Bba&azP<=kw7l-%x~cf-@uMJU%5W}1pZ=WMM?kIlO1KwF0Y&a?8Z&;SG&uM z5#b2)Xek(`!%nxJ?{~wkjGUgN_N#rjP{0S}bhofuNS=bea{80~Mza&!oO7_UKaySD z>kiG?bI*UX^$h*df7e0~NNzvxQ-Uln!ULX_S0l+h&l5xtheO9j_KB8~uVJEa?cx}` zhVW}(4!QCS(wzSYn%&nQSk5?P=IX1#aNRFg_cO`qfRvmXZ$@gpI4aTotQc2%Y*VmK z%0mU&Z4Ad>$@O{jMf1gH0n@*CGX$_;7+{8#wFTu?FONX3eWa<+JxDmm1YkuLdVO8E zWn6 zIlE#0`Gb2Qf~?yM$_YhW=+6z4vjxO_|NM^mM{>pd4z17D zqMtq&AP^yLUc4U+YkHhJh~jC#oa#>yQ6o;lL50T$rF6AGa$eNySL?gUx(v_z1GAcV ze(qTYv9jG5z?w)%h1Ez1Nw^fs%I3L(D203<+b5{mYGV1O^$CQ;8ur!T#d&6mB~Aubhju#bdC9fT;xo)S!BB7EOv95@oWN^4gy zl)iued**+=Yjd(^|LT7fShAUd%=xds6VC1=)8nk-2&3dEpUHB~;&L3R!Sr$dFz1i* z*-n$?>-9ahx5$QD6LHt4ifC6b-}5n6l*oA~5JUk0*v8cy8z7r_@2us_tqC-L+_*El zb%HMi5P=LWq@9iqeWGJtq}3MEDeXm_bXANyrBSYldV|(MrjaUUPg0R#c`ogB(|>^P zdKlVimcFJ|N!t;5in>ZV_S4*j9upjDjC}JXn6vl4O2WamQpmz zNy@E`E9LO?s5l%BCYtS?c5<9$O6^80T#S^SavigYM3vCowM;`LxT73NwPKL?$PO$* z40@Ch-+9XO9rO94rP;q9{`_0ZHV15Mndo1F8~aq~9NW)CPnF!8(g;i*PWNgpKXw={ zMmy<)2}0#gMCY_#ZTO^2NJAb0nApq4ojh+%5uZW0zWRj9jQBg`UQm zo3r2KjIEo!{nqWv*Pi9oORulL^ek!A>`(7qz8(O=!O)yFgW*B@w6&!xh3%bkvzx_A z#ioNw+96`M814>}C&k)WmP?I#Vjvb8tbY&-c~BuuTq&drt%t4P0z&&fjTLaX$BFfi zFW4gd%=!oSW>-F>mzJ?Zg_v)^;6?#Y*e2eQk%qNeDprd$X!)SCwVjWjB-53x5svNE zl01H->_)S?|NdhqR{xEdIYo5)Qc)!U404^K`q5uE@ delta 103 zcmaDDdLn$oYaWi&#FXOX#GKU03uNUcJIJt2{v)J1Ia@|`@?L2n%dFDGytMqh5+!Rc m1u!T|O;fN{P%1OfGcwjQKoTy<2Z?9EO*52G-TaE@yDR`FT_Gp{ 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";