From a09e0c246ece438d0f9e37d7e080513735ae36ac Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Mon, 25 Sep 2023 15:28:59 +0800 Subject: [PATCH] users/foo-dogsquared: make Firefox config optional Only when the Firefox Nix module is not configured. --- users/home-manager/foo-dogsquared/modules/browser.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/home-manager/foo-dogsquared/modules/browser.nix b/users/home-manager/foo-dogsquared/modules/browser.nix index 51961790..93f78adf 100644 --- a/users/home-manager/foo-dogsquared/modules/browser.nix +++ b/users/home-manager/foo-dogsquared/modules/browser.nix @@ -1,5 +1,5 @@ # WHOA! Even browsers with extensions can be declarative! -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, osConfig ? { }, ... }: { home.packages = with pkgs; [ @@ -33,7 +33,7 @@ }; # Despite the name, it isn't a browser for furries. - programs.firefox = { + programs.firefox = lib.mkIf (osConfig ? programs.firefox.enable && !osConfig.programs.firefox.enable) { enable = true; package = with pkgs; wrapFirefox firefox-unwrapped {