From 180d9fb93a1229a4d7f0330f947637aaf4262b50 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Tue, 19 Mar 2024 15:49:22 -0400 Subject: [PATCH] chore: update flake.lock --- flake.lock | 60 +++++++++---------- .../addons/generated-firefox-addons.nix | 7 ++- modules/ags/default.nix | 5 +- 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index b4e4e8b..7c2c90c 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1710712868, - "narHash": "sha256-Lg7uLjleMAHeB8jkpu6Xka0qEU6kPiTcJnEc2rUruT0=", + "lastModified": 1710876875, + "narHash": "sha256-2R29D9RHgH7vWh0f1sucpg3omrocw6Hyrpuz2GyRU20=", "owner": "Aylur", "repo": "ags", - "rev": "cd1ac1f3bf03f7ecef9d4fd0656ffde937dbbc02", + "rev": "304c42d700dff410c30f775ed210b70403e1c7d3", "type": "github" }, "original": { @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1709930061, - "narHash": "sha256-+kmfBsW0yc2EhrUkcUyppCnk+2O5aVAaT/gIF/1FeJQ=", + "lastModified": 1710876438, + "narHash": "sha256-Uf6m0XD+ol7pb26QykZQmZoRdRkKDlLoCrYGiANMvuQ=", "owner": "Aylur", "repo": "Astal", - "rev": "74cbdf4aaf97e89d71aa16b27dde061cbcb6cdd0", + "rev": "4e4b4eb6b38ffdfbfc4ca87878817d075c8bd988", "type": "github" }, "original": { @@ -435,11 +435,11 @@ ] }, "locked": { - "lastModified": 1710714957, - "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", + "lastModified": 1710820906, + "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", + "rev": "022464438a85450abb23d93b91aa82e0addd71fb", "type": "github" }, "original": { @@ -549,11 +549,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1710786597, - "narHash": "sha256-9xA10joxDE4KQ3baPS8DUBjZ1kRsSF/tvCG6XrpcvPk=", + "lastModified": 1710874517, + "narHash": "sha256-sir3c1nQUDYuUgsHs6SzYFkTrz0pGE8xsAczelRjLJI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4ffcdc41ff8233a92f02c633475ac3472b0998df", + "rev": "c32b2331d10605488d3f901189c975513c2823ad", "type": "github" }, "original": { @@ -686,11 +686,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1710774279, - "narHash": "sha256-aGnhvtuGvjRus7CGT9s7wkXl47BAaAdTwo0wpFKYCRs=", + "lastModified": 1710863423, + "narHash": "sha256-JdSC7TCqPOp85B9jpAAlkVrIVejJFY+f9rSlDc9vKsk=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "1356f113cce5e87e7e8409a9c45d3bf8fa36f39d", + "rev": "54da0cae0f197f07c17c672ebdc22de244859494", "type": "github" }, "original": { @@ -838,11 +838,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1710637843, - "narHash": "sha256-NVszlVTM0sEe8yZuOShitwOhNdl2juD7032SQg2dV+U=", + "lastModified": 1710810847, + "narHash": "sha256-l1DacjuZny7i7YRbxIsa6DhXWoKJZEnM3Em8gt6Fsfk=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "da2c09734818d85ef4d112997b5188b62cfdd0fd", + "rev": "03d036f41beaa8c31b2b2261918d248f5c4d45c8", "type": "github" }, "original": { @@ -1059,11 +1059,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1710778775, - "narHash": "sha256-L+Hw7kSUfBi9xYdTqCUfIyzzF0mL/wwHTlXVa0oVhCA=", + "lastModified": 1710857677, + "narHash": "sha256-imrQlTr3vZsnad16djnYDI9ICVaJfKEH6rB7F9xka74=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "920dceccf1e512d1bae758eced0215bf8b23b002", + "rev": "7d053c33b7a130ddada43ba09b089244390b3a23", "type": "github" }, "original": { @@ -1074,11 +1074,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710534455, - "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=", + "lastModified": 1710701596, + "narHash": "sha256-v4lsAi3vE/sEWg0G8AydMjs3NTHlsNw8K01xw06cKLg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212", + "rev": "34ad8c9f29a18b4dd97a9ad40ceb16954f24afe7", "type": "github" }, "original": { @@ -1106,11 +1106,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "type": "github" }, "original": { @@ -1260,11 +1260,11 @@ }, "nur": { "locked": { - "lastModified": 1710786319, - "narHash": "sha256-TsBWvr57/0pfDnudKRH4158SeTuyzfICpA96DkTUKCg=", + "lastModified": 1710872681, + "narHash": "sha256-huvjoZI189K8tZuFRDKUpvCwrFmH1avONKcS2ikGRU8=", "owner": "nix-community", "repo": "NUR", - "rev": "5e7a93eb7b69273b08413b35f7e62e3de0844f1e", + "rev": "366dbc5ccc6c1e1b62abe71a92dae8af74d00e35", "type": "github" }, "original": { diff --git a/home/firefox/addons/generated-firefox-addons.nix b/home/firefox/addons/generated-firefox-addons.nix index e40588c..15ebd1c 100644 --- a/home/firefox/addons/generated-firefox-addons.nix +++ b/home/firefox/addons/generated-firefox-addons.nix @@ -108,10 +108,10 @@ }; "ttv-lol-pro" = buildFirefoxXpiAddon { pname = "ttv-lol-pro"; - version = "2.3.4"; + version = "2.3.5"; addonId = "{76ef94a4-e3d0-4c6f-961a-d38a429a332b}"; - url = "https://addons.mozilla.org/firefox/downloads/file/4231258/ttv_lol_pro-2.3.4.xpi"; - sha256 = "9b3255af18975e2c1f1b3c65b9c23d21403a4d086c74daef1ddc76a051f60516"; + url = "https://addons.mozilla.org/firefox/downloads/file/4250478/ttv_lol_pro-2.3.5.xpi"; + sha256 = "d8e91e81285271d41e3631072bd056e5a65b95158ce43c8cd9100ae2c414adcd"; meta = with lib; { homepage = "https://github.com/younesaassila/ttv-lol-pro"; description = "TTV LOL PRO removes most livestream ads from Twitch."; @@ -121,6 +121,7 @@ "storage" "webRequest" "webRequestBlocking" + "https://*.live-video.net/*" "https://*.ttvnw.net/*" "https://*.twitch.tv/*" "https://perfprod.com/ttvlolpro/telemetry" diff --git a/modules/ags/default.nix b/modules/ags/default.nix index 2604012..6183fa7 100644 --- a/modules/ags/default.nix +++ b/modules/ags/default.nix @@ -27,6 +27,8 @@ in { symlink = config.lib.file.mkOutOfStoreSymlink; inherit (lib) optionals; + astalTypes = config.home.file.".local/share/io.Aylur.Astal/types"; + # https://github.com/Aylur/ags/blob/e1f2d311ceb496a69ef6daa6aebb46ce511b2f22/nix/hm-module.nix#L69 agsTypes = config.home.file.".local//share/com.github.Aylur.ags/types"; agsConfigDir = ".nix/modules/ags/config"; @@ -44,8 +46,9 @@ in { home = { file = { - ".config/ags".source = symlink /home/${mainUser}/.nix/modules/ags/config; + ".config/astal/types".source = astalTypes.source; + ".config/ags".source = symlink /home/${mainUser}/.nix/modules/ags/config; "${agsConfigDir}/types".source = agsTypes.source; "${agsConfigDir}/config.js".text = /*