From be65eb3b8854105cd5244958d23b75f5f22d36e2 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 20:47:21 +0300 Subject: [PATCH] firefox --- modules/home-manager/programs/firefox.nix | 18 +++++++++++++----- modules/nixos/system/home-manager.nix | 6 +++++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/modules/home-manager/programs/firefox.nix b/modules/home-manager/programs/firefox.nix index 435e104..d571487 100644 --- a/modules/home-manager/programs/firefox.nix +++ b/modules/home-manager/programs/firefox.nix @@ -1,13 +1,20 @@ { lib, config, + nixosConfig ? null, # Receive the NixOS config ... }: { - options.enableFirefox = lib.mkEnableOption "enableFirefox"; - config = { - programs.firefox = { - enable = config.enableFirefox; + config = lib.mkMerge [ + # Auto-enable Firefox if system has a desktop environment + (lib.mkIf (nixosConfig != null && nixosConfig.osbmModules.desktopEnvironment != "none") { + # Set enableFirefox to true by default when there's a desktop environment + programs.firefox.enable = lib.mkDefault true; + }) + + # Firefox configuration + { + programs.firefox = { languagePacks = [ "ja" "tr" @@ -100,5 +107,6 @@ }; }; }; - }; + } + ]; } diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix index a94170a..15a2e27 100644 --- a/modules/nixos/system/home-manager.nix +++ b/modules/nixos/system/home-manager.nix @@ -22,7 +22,11 @@ useUserPackages = true; # Pass inputs and outputs to home-manager modules - extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = { + inherit inputs; + # Pass the NixOS system config to home-manager modules + nixosConfig = config; + }; # Configure home-manager for each user (excluding root) users =