From 87d4cc1823d96788114c1d561f389b2fea52c29e Mon Sep 17 00:00:00 2001 From: randomuser Date: Fri, 22 Dec 2023 18:27:03 -0600 Subject: [PATCH] firefox addons workigngit add * git add * but they arn't enabled by default --- flake.lock | 28 +++++++--------------------- flake.nix | 4 ++-- home/firefox/default.nix | 4 ++-- 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 73f648f..4cc3329 100644 --- a/flake.lock +++ b/flake.lock @@ -3,15 +3,17 @@ "firefox-addons": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1703186936, - "narHash": "sha256-+kBiJ++R59cLnCX0XTaYJ94KO6xdgLX724+o7PUP4dI=", + "lastModified": 1703265473, + "narHash": "sha256-K1HYRKlLAjroFfT+DDEmCfuyT7X7+MC5ggJVfBOfB20=", "owner": "rycee", "repo": "nur-expressions", - "rev": "c7e25b8a8abc8175d1caa33f7eda32bdb48aec66", + "rev": "df0c32112abbf265303f615ea8055aa28480d350", "type": "gitlab" }, "original": { @@ -58,22 +60,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1627814220, - "narHash": "sha256-P+MDgdZw2CBk9X1ZZaUgHgN+32pTfLFf3XVIBOXirI4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ab5b6828af26215bf2646c31961da5d3749591ef", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1702921762, "narHash": "sha256-O/rP7gulApQAB47u6szEd8Pn8Biw0d84j5iuP2tcxzY=", @@ -93,7 +79,7 @@ "inputs": { "firefox-addons": "firefox-addons", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index fe57a86..577b9a5 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,7 @@ }; firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -17,7 +18,6 @@ virtbox = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; - extraSpecialArgs = { inherit inputs; }; modules = [ ./bootstrap.nix ./boxes/virtbox.nix @@ -26,7 +26,7 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - + home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.users.usr = import ./home/terminal.nix; } ]; diff --git a/home/firefox/default.nix b/home/firefox/default.nix index fb7e1c8..1760bd9 100644 --- a/home/firefox/default.nix +++ b/home/firefox/default.nix @@ -5,8 +5,8 @@ enable = true; profiles = { - "main" = { - extensions = with inputs.firefox-addons; [ + main = { + extensions = with inputs.firefox-addons.packages.${pkgs.system}; [ bitwarden ]; };