diff options
19 files changed, 153 insertions, 122 deletions
diff --git a/modules/web/chromium/extensions/aria2-explorer.nix b/modules/web/chromium/extensions/aria2-explorer/default.nix index 32fb9b9..bb58170 100644 --- a/modules/web/chromium/extensions/aria2-explorer.nix +++ b/modules/web/chromium/extensions/aria2-explorer/default.nix @@ -3,17 +3,14 @@ ... }: let - pname = "aria2-explorer"; - owner = "alexhua"; - repo = "Aria2-Explorer"; - version = "2.8.2"; + meta = import ./metadata.nix; in { - inherit pname version; + inherit (meta) pname version; id = "hhndckjijagcbbljjhjcbnpjhamkkcjl"; drv = extLib.fetchUnpackedExtension { - inherit pname version; - url = "https://github.com/${owner}/${repo}/archive/refs/tags/v${version}.zip"; + inherit (meta) pname version; + url = "https://github.com/${meta.owner}/${meta.repo}/archive/refs/tags/v${meta.version}.zip"; hash = "sha256-4+SkvgWrELcohpv724YEtvSQSDCmjphkk8bvYggxVag="; extensionKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArOOLc1LawtEonls6j4P/KQyUAGO3KJcE9uAU9WV/tBIX6ulXivZypUAXC6Lokv56Bjnc08t/wUH8Xph0Gya4UzjSbZkdtR94yksY9mq5g/8df4p4v29SO+E6efQyXGyImEzFSHsNP4gu8akB5xT8O//51XRAXsMBVgUUTuUAlpnwd25Yy1tpQwqjbSV3gvAMo+a6+y0dBfXJ9fjwAYBwvx4cONSNjirIuyOG5r5FI5TaGMK+aV1xwNsDE59dyDkYL2f2mm1kN/2xMcayJrskVxtOcy18ijjXzyRJvNyhkLM2c5tEZHUkIlEgTjbJruF8EKrj2sCnodt1jknD0BSr1wIDAQAB"; }; diff --git a/modules/web/chromium/extensions/aria2-explorer/metadata.nix b/modules/web/chromium/extensions/aria2-explorer/metadata.nix new file mode 100644 index 0000000..792849b --- /dev/null +++ b/modules/web/chromium/extensions/aria2-explorer/metadata.nix @@ -0,0 +1,8 @@ +{ + pname = "aria2-explorer"; + owner = "alexhua"; + repo = "Aria2-Explorer"; + version = "2.8.2"; + updateType = "release"; + tagPrefix = "v"; +} diff --git a/modules/web/chromium/extensions/browserpass.nix b/modules/web/chromium/extensions/browserpass/default.nix index c8b59a1..288cf24 100644 --- a/modules/web/chromium/extensions/browserpass.nix +++ b/modules/web/chromium/extensions/browserpass/default.nix @@ -3,17 +3,14 @@ ... }: let - pname = "browserpass"; - owner = "browserpass"; - repo = "browserpass-extension"; - version = "3.12.0"; + meta = import ./metadata.nix; in { - inherit pname version; + inherit (meta) pname version; id = "jbaodoonnfhdccelcpnekimkijgdfjhl"; drv = extLib.fetchUnpackedExtension { - inherit pname version; - url = "https://github.com/${owner}/${repo}/releases/download/${version}/browserpass-chromium-${version}.zip"; + inherit (meta) pname version; + url = "https://github.com/${meta.owner}/${meta.repo}/releases/download/${meta.version}/browserpass-chromium-${meta.version}.zip"; hash = "sha256-WBpPTtec7zJPWM1xNKVxWWW/sB1aIuPecp5fUTWRE8c="; extensionKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv8xL6YhF7YTUE57jhme0vyJi4FZGXDBLV93QYWv6yrYbmczkM4aEOp4FWm63NnkJ8aGZ/0uL0rHmB4qo36awso/1L9XGJaBbQAQuOv/uIPAE18STJ4EtXA1hYDMGbkkr4fZHYJTH3GmoeajZYfp/cu8qc0cK4P5FVq67qwYSD4uFQJRJKuX8jM4lzO8dLH/tJsN3KwlfeSA8xvS2jiIJHtCKc6XqMrOCCfSmI8uILfg06fv46VOoVDH91dlZguOYANAJDW69uCY9YcvyVEmmf6DUnvmkrziDtV2O4/Af6nt7R5JHOcVcqVScoXJG9sfd4KATMcgoZj3fy19+R/4GvwIDAQAB"; }; diff --git a/modules/web/chromium/extensions/browserpass/metadata.nix b/modules/web/chromium/extensions/browserpass/metadata.nix new file mode 100644 index 0000000..edbfd81 --- /dev/null +++ b/modules/web/chromium/extensions/browserpass/metadata.nix @@ -0,0 +1,8 @@ +{ + pname = "browserpass"; + owner = "browserpass"; + repo = "browserpass-extension"; + version = "3.12.0"; + updateType = "release"; + tagPrefix = ""; +} diff --git a/modules/web/chromium/extensions/darkreader.nix b/modules/web/chromium/extensions/darkreader/default.nix index 94de411..9cc81d2 100644 --- a/modules/web/chromium/extensions/darkreader.nix +++ b/modules/web/chromium/extensions/darkreader/default.nix @@ -3,17 +3,14 @@ ... }: let - pname = "darkreader"; - owner = "darkreader"; - repo = "darkreader"; - version = "4.9.129"; + meta = import ./metadata.nix; in { - inherit pname version; + inherit (meta) pname version; id = "nfkppknaehpcafkbgmhfhkpapflndfip"; drv = extLib.fetchUnpackedExtension { - inherit pname version; - url = "https://github.com/${owner}/${repo}/releases/download/v${version}/darkreader-chrome.zip"; + inherit (meta) pname version; + url = "https://github.com/${meta.owner}/${meta.repo}/releases/download/v${meta.version}/darkreader-chrome.zip"; hash = "sha256-Yuhgoxp5MRgVMEEbOaQvRsVjYn/iaBhcHujipBX5rUE="; extensionKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8xN0p4CHkthdkB6imIb+8T2xsNSH9eeFAy7NhP3xAO1ML6FJyOFroabQIG6HcV7miXmJamY7zmE96QgEEvGqQ18+g+RsfvriJp0LRXi95TJBdCXoMiW348bWmue0Jk+/rhzWijMn/z/5fDnrZl0xjKU7MAXzW9dWfiTeIBc4wlk21zjGJxiG0uM1YAywe3jW8g0QCBga9iTaN67D+sBbBs4HmPa3xIbtPTAgqt1LDEk2T7IseoUia8MwxATWKWFegW6legMkPLVWH9jQ+x2ZbjtDP9GXk+1YqqWQUll1Xmal7C9ljeagkM5nhxgttAQoWBMPMJFwr7VN3AXtNXXPWQIDAQAB"; }; diff --git a/modules/web/chromium/extensions/darkreader/metadata.nix b/modules/web/chromium/extensions/darkreader/metadata.nix new file mode 100644 index 0000000..b5ee80f --- /dev/null +++ b/modules/web/chromium/extensions/darkreader/metadata.nix @@ -0,0 +1,8 @@ +{ + pname = "darkreader"; + owner = "darkreader"; + repo = "darkreader"; + version = "4.9.129"; + updateType = "release"; + tagPrefix = "v"; +} diff --git a/modules/web/chromium/extensions/default.nix b/modules/web/chromium/extensions/default.nix index 78c0630..91187b5 100644 --- a/modules/web/chromium/extensions/default.nix +++ b/modules/web/chromium/extensions/default.nix @@ -52,12 +52,12 @@ in # Readonly options get their actual value assigned here in this module config.web.chromium.extensions = { - aria2Explorer = mkExtension ./aria2-explorer.nix; - browserpass = mkExtension ./browserpass.nix; - darkreader = mkExtension ./darkreader.nix; - searxngHome = mkExtension ./searxng-home.nix; - theme = mkExtension ./theme.nix; - ublockOrigin = mkExtension ./ublock-origin.nix; - vimium = mkExtension ./vimium.nix; + aria2Explorer = mkExtension ./aria2-explorer; + browserpass = mkExtension ./browserpass; + darkreader = mkExtension ./darkreader; + searxngHome = mkExtension ./searxng-home; + theme = mkExtension ./theme; + ublockOrigin = mkExtension ./ublock-origin; + vimium = mkExtension ./vimium; }; } diff --git a/modules/web/chromium/extensions/metadata.nix b/modules/web/chromium/extensions/metadata.nix new file mode 100644 index 0000000..76b8916 --- /dev/null +++ b/modules/web/chromium/extensions/metadata.nix @@ -0,0 +1,8 @@ +[ + (import ./aria2-explorer/metadata.nix) + (import ./browserpass/metadata.nix) + (import ./darkreader/metadata.nix) + (import ./searxng-home/metadata.nix) + (import ./ublock-origin/metadata.nix) + (import ./vimium/metadata.nix) +] diff --git a/modules/web/chromium/extensions/searxng-home.nix b/modules/web/chromium/extensions/searxng-home/default.nix index 714ba90..e7ec05d 100644 --- a/modules/web/chromium/extensions/searxng-home.nix +++ b/modules/web/chromium/extensions/searxng-home/default.nix @@ -3,17 +3,14 @@ ... }: let - pname = "searxng-home"; - owner = "arpitchakladar"; - repo = "searxng-home"; - version = "0.2.0"; + meta = import ./metadata.nix; in { - inherit pname version; + inherit (meta) pname version; id = "gmkjafoflhifgcnmpomcoakhahmepfkc"; drv = extLib.fetchUnpackedExtension { - inherit pname version; - url = "https://github.com/${owner}/${repo}/releases/download/v${version}/chrome-v${version}.zip"; + inherit (meta) pname version; + url = "https://github.com/${meta.owner}/${meta.repo}/releases/download/v${meta.version}/chrome-v${meta.version}.zip"; hash = "sha256-fbXxtjTa8GKxylc5JS3GVj/oC+xCI5VJkE3bBpA2CbY="; isCrx = false; extensionKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2cDXvyOi1QgsWlC8LnwyXIV7EZ6yWLKvKCNBn8DPD4DwJgw221wqo6R9p/qnsnqAuveZrV/ApRq6MdzAclkWTGKyCJCRdJGBG/XM3BVfMBkuLXaLrvpFf8p/mDcAP37yOh0Z45XMTr55Y9ifnNH6Wu+3zAaASJlkBuGZ5ygbcUYcomcKjs7qfqxqY8Qe9ovIuLOQely+X9i+Qa6bZ0GJUTgXiKHckgY/43l+H+gs9V91he8qaSubzWPqwbYk8aWhTmjQTeR0vfUP+1/XBESt4u4NGxHsuk+ZwwbL6ThYRbzgj/UbvVGVQsanhIwODdJte51XanEo475Woal31++uxwIDAQAB"; diff --git a/modules/web/chromium/extensions/searxng-home/metadata.nix b/modules/web/chromium/extensions/searxng-home/metadata.nix new file mode 100644 index 0000000..0b232f2 --- /dev/null +++ b/modules/web/chromium/extensions/searxng-home/metadata.nix @@ -0,0 +1,8 @@ +{ + pname = "searxng-home"; + owner = "arpitchakladar"; + repo = "searxng-home"; + version = "0.2.0"; + updateType = "release"; + tagPrefix = "v"; +} diff --git a/modules/web/chromium/extensions/theme.nix b/modules/web/chromium/extensions/theme.nix deleted file mode 100644 index a77dc06..0000000 --- a/modules/web/chromium/extensions/theme.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - extLib, - ... -}: -let - pname = "theme"; -in -{ - inherit pname; - version = "1.0.0"; - id = null; - drv = extLib.mkLocalExtension { - inherit pname; - srcDir = ./theme; - }; -} diff --git a/modules/web/chromium/extensions/theme/default.nix b/modules/web/chromium/extensions/theme/default.nix new file mode 100644 index 0000000..674439c --- /dev/null +++ b/modules/web/chromium/extensions/theme/default.nix @@ -0,0 +1,16 @@ +{ + extLib, + ... +}: +let + meta = import ./metadata.nix; +in +{ + inherit (meta) pname; + version = meta.version; + id = null; + drv = extLib.mkLocalExtension { + inherit (meta) pname; + srcDir = ./theme; + }; +} diff --git a/modules/web/chromium/extensions/theme/metadata.nix b/modules/web/chromium/extensions/theme/metadata.nix new file mode 100644 index 0000000..4e9769d --- /dev/null +++ b/modules/web/chromium/extensions/theme/metadata.nix @@ -0,0 +1,4 @@ +{ + pname = "theme"; + version = "1.0.0"; +} diff --git a/modules/web/chromium/extensions/theme/manifest.json b/modules/web/chromium/extensions/theme/theme/manifest.json index 5be8622..5be8622 100644 --- a/modules/web/chromium/extensions/theme/manifest.json +++ b/modules/web/chromium/extensions/theme/theme/manifest.json diff --git a/modules/web/chromium/extensions/ublock-origin.nix b/modules/web/chromium/extensions/ublock-origin/default.nix index a46a74d..ccd46df 100644 --- a/modules/web/chromium/extensions/ublock-origin.nix +++ b/modules/web/chromium/extensions/ublock-origin/default.nix @@ -3,17 +3,14 @@ ... }: let - pname = "ublock-origin"; - owner = "gorhill"; - repo = "uBlock"; - version = "1.73.0"; + meta = import ./metadata.nix; in { - inherit pname version; + inherit (meta) pname version; id = "eahmphincfcmmpgkpobpneimcjndlcna"; drv = extLib.fetchUnpackedExtension { - inherit pname version; - url = "https://github.com/${owner}/${repo}/releases/download/${version}/uBlock0_${version}.chromium.zip"; + inherit (meta) pname version; + url = "https://github.com/${meta.owner}/${meta.repo}/releases/download/${meta.version}/uBlock0_${meta.version}.chromium.zip"; hash = "sha256-IsYrwPNe0MXpXR/IMagprxmcfKb9tPhBvgNMJXGc6RE="; extensionKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtXfkoFzWOh3Fet9x4L6WY1pw755kt7bFwqd/nmTm5Ptg7d40Qde0tTIhceCFVkwrWTQ3n2/WSpYXoU/UMgSW9anBzoUM0ZXanIdoeHwvL3eMNyx+iyvSrRxee26GwzbZ8J0UvH77KT3rW/iV5ejV4wTxTD3rFr0udkI5bbTPYpmGFOKPD8I3IB6BsoUTKW3XTSLM0fUYggdbDNwQGZvLYwqZzk/vWH/oifHR6CEvdFR51JAdf3tJQhttI6My49Vq6etCi9y5ZLXrMksxcEcIlQKaF2fdlfL1bYXRAVFDsieuAmu3gJPBj65PVJif5A7DfcH8zm8YGPwrJlTjaJQeDQIDAQAB"; }; diff --git a/modules/web/chromium/extensions/ublock-origin/metadata.nix b/modules/web/chromium/extensions/ublock-origin/metadata.nix new file mode 100644 index 0000000..2687ec8 --- /dev/null +++ b/modules/web/chromium/extensions/ublock-origin/metadata.nix @@ -0,0 +1,8 @@ +{ + pname = "ublock-origin"; + owner = "gorhill"; + repo = "uBlock"; + version = "1.73.0"; + updateType = "release"; + tagPrefix = ""; +} diff --git a/modules/web/chromium/extensions/vimium.nix b/modules/web/chromium/extensions/vimium/default.nix index 61b10c0..dbb77c0 100644 --- a/modules/web/chromium/extensions/vimium.nix +++ b/modules/web/chromium/extensions/vimium/default.nix @@ -3,17 +3,14 @@ ... }: let - pname = "vimium"; - owner = "philc"; - repo = "vimium"; - version = "2.4.2"; + meta = import ./metadata.nix; in { - inherit pname version; + inherit (meta) pname version; id = "ojbnfglfbelfbgfjlkehclgfkdkkjkdj"; drv = extLib.fetchUnpackedExtension { - inherit pname version; - url = "https://github.com/${owner}/${repo}/archive/refs/tags/v${version}.zip"; + inherit (meta) pname version; + url = "https://github.com/${meta.owner}/${meta.repo}/archive/refs/tags/v${meta.version}.zip"; hash = "sha256-Q+Tus7nl7TiuVJ4hn8vYg9L2cC4NhqWSOr5WKD0RSq0="; extensionKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqUw4MXlUYAqIQqJ1Gb/RH7RdgVjekKed1aoJS1OPM5C9EFfvVlj0/eIf8dVbCMKc7ThRYYJkZPqFNN38T0LtnBJbvdiJztL/nGueJT7GupXisIzJ9s17X+HpogODouDY7qHldQRw/7qnrBe0NeNxWVeUOH9PmHi8nBTZ3JRygS9svZ1BvY0ZkPZyNDTEsXCbb+fkSOOkjqDNqtt98eFJhPGZ0W+cn3KgTdr+rC0rqfacwfu41dpmQPEirOFtshs8DywoI+L66UtqVfwhBNdb3+JN7oeDs4HNFjCPbqOTSKKCng+nNndpIen2CKYUuYztvmrrRdQeEv5i3l7/MFrRXQIDAQAB"; }; diff --git a/modules/web/chromium/extensions/vimium/metadata.nix b/modules/web/chromium/extensions/vimium/metadata.nix new file mode 100644 index 0000000..f9f2465 --- /dev/null +++ b/modules/web/chromium/extensions/vimium/metadata.nix @@ -0,0 +1,8 @@ +{ + pname = "vimium"; + owner = "philc"; + repo = "vimium"; + version = "2.4.2"; + updateType = "tag"; + tagPrefix = "v"; +} diff --git a/updates/web/chromium/extensions.nix b/updates/web/chromium/extensions.nix index a320113..0d44652 100644 --- a/updates/web/chromium/extensions.nix +++ b/updates/web/chromium/extensions.nix @@ -1,68 +1,57 @@ { pkgs, lib, ... }: +let + extensions = import ../../../modules/web/chromium/extensions/metadata.nix; +in { - # Takes a list of extension attribute sets and generates a bash script to check for updates. - # Expected attribute set format per extension: - # { - # pname = "extension-name"; - # owner = "github-owner"; - # repo = "github-repo"; - # version = "current-pinned-version"; - # updateType = "release" | "tag"; - # tagPrefix = "v"; # (Optional) - # } - mkUpdateScript = - { extensions }: - pkgs.writeShellApplication { - name = "check-chromium-extension-updates"; - runtimeInputs = [ - pkgs.curl - pkgs.jq - ]; - text = '' - echo "🔍 Checking for Chromium extension updates..." - echo "----------------------------------------------" - echo "" + mkUpdateScript = pkgs.writeShellApplication { + name = "check-chromium-extension-updates"; + runtimeInputs = [ + pkgs.curl + pkgs.jq + ]; + text = '' + echo "Checking for Chromium extension updates..." + echo "----------------------------------------------" + echo "" - ${lib.concatMapStringsSep "\n" ( - ext: - let - isTag = (ext.updateType or "release") == "tag"; - apiEndpoint = - if isTag then - "https://api.github.com/repos/${ext.owner}/${ext.repo}/tags" - else - "https://api.github.com/repos/${ext.owner}/${ext.repo}/releases/latest"; + ${lib.concatMapStringsSep "\n" ( + ext: + let + isTag = (ext.updateType or "release") == "tag"; + apiEndpoint = + if isTag then + "https://api.github.com/repos/${ext.owner}/${ext.repo}/tags" + else + "https://api.github.com/repos/${ext.owner}/${ext.repo}/releases/latest"; - # jq filter: grab the newest tag name from the tags array, or the tag_name from the release object - jqFilter = if isTag then ".[0].name" else ".tag_name"; - in - '' - # Fetch from GitHub API - HTTP_RESPONSE=$(curl -sL -w "%{http_code}" "https://api.github.com/repos/${ext.owner}/${ext.repo}") + # jq filter: grab the newest tag name from the tags array, or the tag_name from the release object + jqFilter = if isTag then ".[0].name" else ".tag_name"; + in + '' + # Check ${ext.pname} + LATEST_RAW=$(curl -sL --fail "${apiEndpoint}" | jq -r '${jqFilter}') - LATEST_RAW=$(curl -sL --fail "${apiEndpoint}" | jq -r '${jqFilter}') + if [ -z "$LATEST_RAW" ] || [ "$LATEST_RAW" == "null" ]; then + echo "FAIL [${ext.pname}] Failed to fetch data from GitHub API." + else + # Strip prefix if one is specified + PREFIX="${ext.tagPrefix}" + LATEST_STRIPPED="''${LATEST_RAW#$PREFIX}" - if [ -z "$LATEST_RAW" ] || [ "$LATEST_RAW" == "null" ]; then - echo "❌ [${ext.pname}] Failed to fetch data from GitHub API." + if [ "$LATEST_STRIPPED" != "${ext.version}" ]; then + echo "UPDATE [${ext.pname}] ${ext.version} -> $LATEST_STRIPPED" + echo " Repo: https://github.com/${ext.owner}/${ext.repo}" + echo "" else - # Strip prefix if one is specified - PREFIX="${ext.tagPrefix or ""}" - LATEST_STRIPPED="''${LATEST_RAW#$PREFIX}" - - if [ "$LATEST_STRIPPED" != "${ext.version}" ]; then - echo "⚠️ [${ext.pname}] Update available: ${ext.version} -> $LATEST_STRIPPED" - echo " Repo: https://github.com/${ext.owner}/${ext.repo}" - echo "" - else - echo "✅ [${ext.pname}] Up to date (${ext.version})" - fi + echo "OK [${ext.pname}] ${ext.version}" fi - '' - ) extensions} + fi + '' + ) extensions} - echo "----------------------------------------------" - echo "Done!" - ''; - }; + echo "----------------------------------------------" + echo "Done!" + ''; + }; } |