From cd3369880a1808ce5896eb9e89be50187790403f Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Sun, 9 Jun 2024 17:00:56 -0400 Subject: [PATCH] fix firefox addons ig? also system var is here lol Signed-off-by: ahuston-0 --- lib/systems.nix | 2 +- modules/base.nix | 4 +++- users/richie/home/gui/firefox.nix | 25 +++++++++++++++---------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/lib/systems.nix b/lib/systems.nix index 11620df..656bc20 100644 --- a/lib/systems.nix +++ b/lib/systems.nix @@ -160,7 +160,7 @@ rec { lib.nixosSystem { inherit system; specialArgs = { - inherit inputs server; + inherit inputs server system; }; modules = [ diff --git a/modules/base.nix b/modules/base.nix index e0c26ad..85d886b 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -2,6 +2,7 @@ lib, inputs, server, + system, ... }: { @@ -25,8 +26,9 @@ useUserPackages = true; sharedModules = [ inputs.sops-nix.homeManagerModules.sops ]; extraSpecialArgs = { + inherit inputs; machineConfig = { - inherit server; + inherit server system; }; }; }; diff --git a/users/richie/home/gui/firefox.nix b/users/richie/home/gui/firefox.nix index e54716a..201631b 100644 --- a/users/richie/home/gui/firefox.nix +++ b/users/richie/home/gui/firefox.nix @@ -1,17 +1,22 @@ -{ pkgs, ... }: +{ + pkgs, + inputs, + machineConfig, + ... +}: { programs.firefox = { enable = true; profiles.richie = { - # extensions = with pkgs.inputs.firefox-addons; [ - # bitwarden-password-manager - # darkreader - # dearrow - # fastforwardteam - # return-youtube-dislikes - # sponsorblock - # ublock-origin - # ]; + extensions = with inputs.firefox-addons.packages.${machineConfig.system}; [ + bitwarden + darkreader + dearrow + fastforwardteam + return-youtube-dislikes + sponsorblock + ublock-origin + ]; search.engines = { "Nix Options" = { urls = [