From d72e57b76ebcbdc3d52cd82b3003ca7dc78468a7 Mon Sep 17 00:00:00 2001 From: Payas Relekar Date: Tue, 26 Dec 2023 22:21:07 +0530 Subject: [PATCH] hermes:phoebe: Remove deprecated plasma-browser-integration for firefox There is new nativeMassagingHosts option being suggested instead, but the thing is, plasma-browser-integration for firefox is already enabled by plasma-desktop itself in nixpkgs. So when it is enabled again by user config, there is a conflict and the config does not build. Still need to see if this allows user applicable config instead --- hosts/hermes/home.nix | 1 - hosts/phoebe/home.nix | 1 - modules/plasma-desktop.nix | 11 ++++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/hosts/hermes/home.nix b/hosts/hermes/home.nix index c107eb7..c4849a4 100644 --- a/hosts/hermes/home.nix +++ b/hosts/hermes/home.nix @@ -28,7 +28,6 @@ digikam okular kcalc - firefox-wayland ark # munging archives unrar # So ark can open .rar files spectacle diff --git a/hosts/phoebe/home.nix b/hosts/phoebe/home.nix index 0b84081..d738d5f 100644 --- a/hosts/phoebe/home.nix +++ b/hosts/phoebe/home.nix @@ -21,7 +21,6 @@ # apps vlc strawberry - firefox-wayland nheko # utilities diff --git a/modules/plasma-desktop.nix b/modules/plasma-desktop.nix index 48ceaf8..f3b1eb2 100644 --- a/modules/plasma-desktop.nix +++ b/modules/plasma-desktop.nix @@ -32,6 +32,10 @@ programs = { xwayland.enable = true; kdeconnect.enable = true; + firefox = { + enable = true; + preferencesStatus = "user"; + }; }; qt.platformTheme = "kde"; @@ -45,13 +49,6 @@ fi ''; - nixpkgs = { - config = { - # Enable plasma integration - firefox.enablePlasmaBrowserIntegration = true; - }; - }; - environment = { plasma5.excludePackages = with pkgs; [ plasma5Packages.oxygen