diff --git a/modules/applications/wayland.nix b/modules/applications/wayland.nix index 4886865..baffeef 100644 --- a/modules/applications/wayland.nix +++ b/modules/applications/wayland.nix @@ -19,19 +19,13 @@ in # modules do not each append their own portal backends. xdg.portal = { enable = true; - wlr.enable = true; extraPortals = [ pkgs.xdg-desktop-portal-gnome pkgs.xdg-desktop-portal-gtk - pkgs.xdg-desktop-portal-wlr ]; xdgOpenUsePortal = true; config = { common.default = [ "gtk" ]; - niri.default = lib.mkForce [ - "wlr" - "gtk" - ]; gnome.default = [ "gnome" "gtk" diff --git a/modules/applications/zoom.nix b/modules/applications/zoom.nix index 91c5c69..34f70c2 100644 --- a/modules/applications/zoom.nix +++ b/modules/applications/zoom.nix @@ -1,19 +1,10 @@ { - pkgs, lib, config, ... }: let cfg = config.my.applications.zoom; - zoomX11 = pkgs.zoom-us.overrideAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ]; - - postFixup = (old.postFixup or "") + '' - wrapProgram $out/bin/zoom \ - --set QT_QPA_PLATFORM xcb - ''; - }); in { options.my.applications.zoom = { @@ -21,12 +12,6 @@ in }; config = lib.mkIf cfg.enable { - home-manager.sharedModules = [ - { - home.packages = with pkgs; [ - zoomX11 # Video conferencing application with XWayland startup for GNOME stability - ]; - } - ]; + programs.zoom-us.enable = true; }; }