From 550a320c755782c88cb07434399ab539006a0b8a Mon Sep 17 00:00:00 2001 From: Simon Parri Date: Mon, 2 Jun 2025 17:00:48 -0500 Subject: modules/sets: Add www.browser set and use it --- hosts/muspell/default.nix | 5 +---- hosts/thyme/packages.nix | 9 +-------- modules/sets.nix | 7 +++++++ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/hosts/muspell/default.nix b/hosts/muspell/default.nix index 420d0c0..cea43df 100644 --- a/hosts/muspell/default.nix +++ b/hosts/muspell/default.nix @@ -25,6 +25,7 @@ in script.utils = true; sound.tools = true; sys.tools = true; + www.browser = true; }; services.xserver = { @@ -39,10 +40,6 @@ in ''; }; }; - programs.firefox = { - enable = true; - package = pkgs.firefox-esr; - }; hardware.bluetooth.enable = true; powerManagement.enable = true; diff --git a/hosts/thyme/packages.nix b/hosts/thyme/packages.nix index 72182d4..dbff8d5 100644 --- a/hosts/thyme/packages.nix +++ b/hosts/thyme/packages.nix @@ -19,6 +19,7 @@ sound.tools = true; sys.tools = true; writing.tools = true; + www.browser = true; }; environment.systemPackages = with pkgs; [ @@ -38,12 +39,4 @@ ppsspp wesnoth ]; - - programs.firefox = { - enable = true; - package = pkgs.firefox-esr; - nativeMessagingHosts.packages = with pkgs; [ - passff-host - ]; - }; } diff --git a/modules/sets.nix b/modules/sets.nix index 40b6af8..6ed2e75 100644 --- a/modules/sets.nix +++ b/modules/sets.nix @@ -38,6 +38,7 @@ in sound.tools = lib.mkEnableOption "package set"; sys.tools = lib.mkEnableOption "package set"; writing.tools = lib.mkEnableOption "package set"; + www.browser = lib.mkEnableOption "package set"; gui.usePicom = lib.mkEnableOption "picom package" // { default = true; }; gui.useEmoji = lib.mkEnableOption "emoji font package" // { default = true; }; @@ -151,6 +152,12 @@ in enable = cfg.de.utils; pinentryPackage = pkgs.pinentry-qt; }; + programs.firefox = { + enable = cfg.www.browser; + package = pkgs.firefox-esr; + nativeMessagingHosts.packages = + lib.optional cfg.de.utils pkgs.passff-host; + }; fonts.packages = lib.optionals cfg.gui.fonts ( lib.optional cfg.gui.useEmoji -- cgit v1.2.3