From ade032d52024db76f13ca102de53548a5686f040 Mon Sep 17 00:00:00 2001 From: buffet Date: Mon, 10 Jul 2023 14:47:29 +0200 Subject: [PATCH] feat(firefox): switch to 10-ten-ja-reader --- flake.lock | 236 ++++++++++++++++++++++++++++++++++++++++++- programs/firefox.nix | 18 +--- 2 files changed, 233 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 5d62af7..da83370 100644 --- a/flake.lock +++ b/flake.lock @@ -102,6 +102,52 @@ "type": "github" } }, + "cosmic": { + "inputs": { + "crane": "crane", + "fenix": "fenix", + "flake-utils": "flake-utils_2", + "nix-filter": "nix-filter", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1688130921, + "narHash": "sha256-h4XE3LSv2hP0Q8nFA6kPyT8r9z0W/hfs4iDz9iJDFqU=", + "owner": "pop-os", + "repo": "cosmic-comp", + "rev": "bdcb803efaa3e4d37973562eb710fec9477f4640", + "type": "github" + }, + "original": { + "owner": "pop-os", + "repo": "cosmic-comp", + "type": "github" + } + }, + "crane": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": [ + "cosmic", + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1684981077, + "narHash": "sha256-68X9cFm0RTZm8u0rXPbeBzOVUH5OoUGAfeHHVoxGd9o=", + "owner": "ipetkov", + "repo": "crane", + "rev": "35110cccf28823320f4fd697fcafcb5038683982", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -124,6 +170,80 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "cosmic", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1685600533, + "narHash": "sha256-7oly5/7xJMtFH44I/Bsrnc2VG4M6HyUVhph3WoZrG64=", + "owner": "nix-community", + "repo": "fenix", + "rev": "360c6a0bc9b78b896fdd60c8803ba98298a37f7c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gh-nvim": { "flake": false, "locked": { @@ -197,18 +317,33 @@ "type": "github" } }, + "nix-filter": { + "locked": { + "lastModified": 1681154353, + "narHash": "sha256-MCJ5FHOlbfQRFwN0brqPbCunLEVw05D/3sRVoNVt2tI=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "f529f42792ade8e32c4be274af6b6d60857fbee7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1688177999, - "narHash": "sha256-JZ5nk90Ym79b4J593xYb0mI79QxU0efJLuCU3sXDalQ=", + "lastModified": 1688403656, + "narHash": "sha256-zmNai3dKWUCKpKubPWsEJ1Q7od96KebWVDJNCnk+fr0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0de86059128947b2438995450f2c2ca08cc783d5", + "rev": "453da3c28f7a95374b73d1f3fd665dd40e6049e9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -229,6 +364,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1688177999, + "narHash": "sha256-JZ5nk90Ym79b4J593xYb0mI79QxU0efJLuCU3sXDalQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0de86059128947b2438995450f2c2ca08cc783d5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1688373029, @@ -268,10 +419,11 @@ "cmp-git": "cmp-git", "copilot-cmp": "copilot-cmp", "copilot-lua": "copilot-lua", + "cosmic": "cosmic", "gh-nvim": "gh-nvim", "home-manager": "home-manager_2", "impermanence": "impermanence", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "nvim-cmp-vlime": "nvim-cmp-vlime", @@ -280,6 +432,50 @@ "vlime": "vlime" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1685541053, + "narHash": "sha256-ck8hhiuxvy8jLIv2cPsQK8bfc/aYZjrIelmLAv16T4o=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "bafa6c4ee5d3acdbb62ec289364564270357c6a2", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "cosmic", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "cosmic", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1683080331, + "narHash": "sha256-nGDvJ1DAxZIwdn6ww8IFwzoHb2rqBP4wv/65Wt5vflk=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "d59c3fa0cba8336e115b376c2d9e91053aa59e56", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "rust-tools-nvim": { "flake": false, "locked": { @@ -296,6 +492,36 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "vim-hy": { "flake": false, "locked": { diff --git a/programs/firefox.nix b/programs/firefox.nix index 76a06bc..91d2eb8 100644 --- a/programs/firefox.nix +++ b/programs/firefox.nix @@ -10,27 +10,13 @@ package = pkgs.firefox-wayland; profiles."buffet" = { - extensions = with config.nur.repos.rycee.firefox-addons; let - # TODO: switch to yomitan - yomichan = buildFirefoxXpiAddon { - pname = "yomichan"; - version = "20.5.22.1"; - addonId = "alex@foosoft.net"; - url = "https://addons.mozilla.org/firefox/downloads/file/3585060/yomichan-20.5.22.1.xpi"; - sha256 = "sha256-/icvPD/nCJYS31owfYMD25QzFjsxAqapy/UAehhxsy8="; - meta = with lib; { - description = "Yomichan turns your browser into a tool for building Japanese language literacy by helping you to decipher texts which would be otherwise too difficult tackle. It features a robust dictionary with EPWING and flashcard creation support."; - license = licenses.gpl3; - platforms = platforms.all; - }; - }; - in [ + extensions = with config.nur.repos.rycee.firefox-addons; [ + config.nur.repos.rycee.firefox-addons."10ten-ja-reader" bitwarden istilldontcareaboutcookies refined-github sidebery ublock-origin - yomichan ]; settings = {