From c5e303db7439663734d93f017c3deb1447f61138 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Wed, 19 Jun 2024 20:29:11 +0200 Subject: [PATCH] fix: do not install Firefox package on none NisOS --- hosts/rick/home-config.nix | 5 ++++- modules/home-manager/web/firefox/default.nix | 23 ++++++++++++++------ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/hosts/rick/home-config.nix b/hosts/rick/home-config.nix index 1bbe835..8db5235 100644 --- a/hosts/rick/home-config.nix +++ b/hosts/rick/home-config.nix @@ -19,7 +19,10 @@ kdenlive.enable = false; mpv.enable = true; }; - web.firefox.enable = true; + web.firefox = { + enable = true; + installPackage = false; + }; web.qutebrowser.enable = false; web.webcord.enable = false; gaming.lutris.enable = false; diff --git a/modules/home-manager/web/firefox/default.nix b/modules/home-manager/web/firefox/default.nix index 1bc53f0..5eca678 100644 --- a/modules/home-manager/web/firefox/default.nix +++ b/modules/home-manager/web/firefox/default.nix @@ -7,6 +7,12 @@ in { options.modules.web.firefox = { enable = mkEnableOption "enable Firefox web browser"; + + installPackage = mkOption { + type = types.bool; + default = true; + description = "install Package, if false relies on distribution packages"; + }; }; config = mkIf cfg.enable { programs.browserpass = { @@ -21,14 +27,17 @@ in "x-scheme-handler/unknown" = "firefox.desktop"; }; programs.firefox = { - package = pkgs.wrapFirefox pkgs.firefox-unwrapped { - nativeMessagingHosts = [ - # Tridactyl native connector - pkgs.tridactyl-native - pkgs.browserpass - ]; - }; enable = true; + package = + if cfg.installPackage + then pkgs.wrapFirefox pkgs.firefox-unwrapped { + nativeMessagingHosts = [ + # Tridactyl native connector + pkgs.tridactyl-native + pkgs.browserpass + ]; + } + else null; profiles.ephase = { id = 0; name = "ephase";