diff --git a/hosts/lars/default.nix b/hosts/lars/default.nix index da685ac..5cded42 100644 --- a/hosts/lars/default.nix +++ b/hosts/lars/default.nix @@ -41,6 +41,10 @@ userEmail = "wasser.ian@gmail.com"; defaultBranch = "main"; }; + + firefox = { + enable = true; + }; }; services = { diff --git a/hosts/lars/kronos/configuration.nix b/hosts/lars/kronos/configuration.nix index c7d1182..0189d05 100644 --- a/hosts/lars/kronos/configuration.nix +++ b/hosts/lars/kronos/configuration.nix @@ -15,9 +15,6 @@ "DP-1,1920x1080@60,2560x0,1" ]; }; - firefox = { - enable = true; - }; }; services.getty.autologinUser = "lars"; diff --git a/modules/gui/firefox.nix b/modules/gui/firefox.nix index 79626a3..7e8ffe5 100644 --- a/modules/gui/firefox.nix +++ b/modules/gui/firefox.nix @@ -1,9 +1,9 @@ { config, lib, inputs, pkgs, ... }: with lib; let username = config.modules.other.system.username; - cfg = config.modules.firefox; + cfg = config.modules.programs.firefox; in { - options.modules.firefox = { + options.modules.programs.firefox = { enable = mkEnableOption "firefox"; extensions = mkOption { description = "firefox extensions (format like https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265)"; @@ -14,7 +14,7 @@ in { config = mkIf cfg.enable { home-manager.users.${username} = { - programs.firefox = (lib.mkMerge [{ + programs.firefox = lib.mkMerge [{ enable = true; policies = { ExtensionSettings = { @@ -24,7 +24,7 @@ in { }; }; }; - } cfg.extensions]); + } cfg.extensions]; }; }; }