From 580bb60f8c6d639e0530bcc0ae7b0549762cd870 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Sat, 5 Oct 2024 15:38:05 -0400 Subject: [PATCH] defaultApps: fuse finalpackage from firefox as default --- homeManagerModules/apps/firefox/default.nix | 1 + homeManagerModules/defaultApps.nix | 2 +- homeManagerModules/options.nix | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/homeManagerModules/apps/firefox/default.nix b/homeManagerModules/apps/firefox/default.nix index 8c041860..14eef966 100644 --- a/homeManagerModules/apps/firefox/default.nix +++ b/homeManagerModules/apps/firefox/default.nix @@ -7,6 +7,7 @@ config = lib.mkIf config.ar.home.apps.firefox.enable { programs.firefox = { enable = true; + nativeMessagingHosts = lib.optionals (config.ar.home.desktop.gnome.enable) [pkgs.gnome-browser-connector] ++ lib.optional (config.ar.home.apps.keepassxc.enable) pkgs.keepassxc; diff --git a/homeManagerModules/defaultApps.nix b/homeManagerModules/defaultApps.nix index 9384a124..b22c9a57 100644 --- a/homeManagerModules/defaultApps.nix +++ b/homeManagerModules/defaultApps.nix @@ -25,7 +25,7 @@ in { terminal terminalEditor videoPlayer - # webBrowser + webBrowser ]; sessionVariables = { diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix index 2499a5c7..ed28406a 100644 --- a/homeManagerModules/options.nix +++ b/homeManagerModules/options.nix @@ -85,7 +85,12 @@ in { terminal = lib.mkPackageOption pkgs "terminal emulator" {default = ["kitty"];}; terminalEditor = lib.mkPackageOption pkgs "terminal text editor" {default = ["vim"];}; videoPlayer = lib.mkPackageOption pkgs "video player" {default = ["celluloid"];}; - webBrowser = lib.mkPackageOption pkgs "web browser" {default = ["firefox"];}; + + webBrowser = lib.mkOption { + description = "web browser"; + default = config.programs.firefox.finalPackage; + type = lib.types.package; + }; }; desktop = {