diff --git a/common/home-manager.nix b/common/home-manager.nix index 171a382..cb4e6bd 100644 --- a/common/home-manager.nix +++ b/common/home-manager.nix @@ -1,9 +1,12 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, inputs, ... }: { home-manager = { useUserPackages = true; useGlobalPkgs = true; backupFileExtension = "backup"; + extraSpecialArgs = { + inherit inputs; + }; }; } diff --git a/flake.lock b/flake.lock index 7f25a1f..d8bb0c1 100644 --- a/flake.lock +++ b/flake.lock @@ -84,6 +84,30 @@ "type": "github" } }, + "firefox-addons": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "dir": "pkgs/firefox-addons", + "lastModified": 1735202720, + "narHash": "sha256-7aEdACqT2B7nZNFjn2Y66Qucfl1AHHVFKxm4yvO0O10=", + "owner": "rycee", + "repo": "nur-expressions", + "rev": "fe816609e68ee1887ee89e43c9ca1aad75362477", + "type": "gitlab" + }, + "original": { + "dir": "pkgs/firefox-addons", + "owner": "rycee", + "ref": "master", + "repo": "nur-expressions", + "type": "gitlab" + } + }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -100,6 +124,21 @@ } }, "flake-utils_2": { + "locked": { + "lastModified": 1629284811, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "inputs": { "systems": "systems_2" }, @@ -189,7 +228,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "flakey-profile": "flakey-profile", "lix": "lix", "nixpkgs": [ @@ -335,6 +374,7 @@ "agenix": "agenix", "birdsong": "birdsong", "colmena": "colmena", + "firefox-addons": "firefox-addons", "home-manager": "home-manager", "home-manager-unstable": "home-manager-unstable", "lix-module": "lix-module", diff --git a/flake.nix b/flake.nix index 290d9a3..4e1132d 100644 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,11 @@ flake = false; }; + firefox-addons = { + url = "gitlab:rycee/nur-expressions?ref=master&dir=pkgs/firefox-addons"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + # Third-party flake providing package and NixOS module for Actual Budget as # nixpkgs are having trouble: https://github.com/NixOS/nixpkgs/issues/269069 actual = { diff --git a/home/qenya/firefox.nix b/home/qenya/firefox.nix index 23642f8..96715e5 100644 --- a/home/qenya/firefox.nix +++ b/home/qenya/firefox.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, osConfig, ... }: +{ config, lib, pkgs, osConfig, inputs, ... }: let inherit (lib) mkIf; @@ -7,12 +7,10 @@ in { programs.firefox = lib.mkIf isGraphical { enable = true; - - # coming in 24.11 - # languagePacks = [ "en-GB" ]; + languagePacks = [ "en-GB" ]; profiles.default = { - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + extensions = with inputs.firefox-addons.packages.${pkgs.hostPlatform.system}; [ bitwarden ublock-origin ];