From 7f7a3f3bd83ac1dc6a064b698b1a0a1d4cf19e25 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Fri, 6 Sep 2024 12:07:03 -0400 Subject: [PATCH] Fixing portal issues on hyprctl --- configs/hyprland/mine/hypr/hyprland.d/monitors.conf | 9 +++++---- configs/hyprland/mine/hypr/monitors.conf | 0 modules/nixos/desktop/default.nix | 5 +++++ modules/nixos/desktop/hyprland/common.nix | 12 +++++++----- modules/nixos/desktop/kde.nix | 1 + 5 files changed, 18 insertions(+), 9 deletions(-) delete mode 100644 configs/hyprland/mine/hypr/monitors.conf diff --git a/configs/hyprland/mine/hypr/hyprland.d/monitors.conf b/configs/hyprland/mine/hypr/hyprland.d/monitors.conf index 9c63cab..20a38e6 100644 --- a/configs/hyprland/mine/hypr/hyprland.d/monitors.conf +++ b/configs/hyprland/mine/hypr/hyprland.d/monitors.conf @@ -1,4 +1,5 @@ -monitor = eDP-1, highres, 0x0, 1 -monitor = DP-9, 1920x1080, 1128x0, 1 -monitor = DP-10, 1920x1080, -970x0, 1 -monitor = , highres, auto-right, 1 \ No newline at end of file +# Generated by nwg-displays on 2024-09-06 at 12:05:04. Do not edit manually. + +monitor=eDP-1,2256x1504@60.0,4176x1381,1.0 +monitor=DP-9,1920x1080@60.0,5186x301,1.0 +monitor=DP-10,1920x1080@60.0,3266x301,1.0 diff --git a/configs/hyprland/mine/hypr/monitors.conf b/configs/hyprland/mine/hypr/monitors.conf deleted file mode 100644 index e69de29..0000000 diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 8a1cfd7..c870b26 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -25,5 +25,10 @@ in services.displayManager.sddm.wayland.enable = false; services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.wayland = true; + xdg.portal = { + enable = true; + wlr.enable = false; + xdgOpenUsePortal = false; + }; }; } diff --git a/modules/nixos/desktop/hyprland/common.nix b/modules/nixos/desktop/hyprland/common.nix index f337338..e12c15f 100644 --- a/modules/nixos/desktop/hyprland/common.nix +++ b/modules/nixos/desktop/hyprland/common.nix @@ -6,12 +6,14 @@ let in { config = mkIf cfg.enabled { - programs.hyprland.enable = true; - programs.hyprland.xwayland.enable = true; - programs.hyprland.systemd.setPath.enable = true; + programs.hyprland = { + enable = true; + portalPackage = pkgs.xdg-desktop-portal-hyprland; + xwayland.enable = true; + systemd.setPath.enable = true; + }; + xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; services.hypridle.enable = true; - # programs.hyprlock.enable = true; - # programs.waybar.enable = true; environment.sessionVariables = { NIXOS_OZONE_WL = "1"; }; environment.systemPackages = with pkgs; [ # sound diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix index 2fccac8..2ac991e 100644 --- a/modules/nixos/desktop/kde.nix +++ b/modules/nixos/desktop/kde.nix @@ -26,5 +26,6 @@ in konsave # save configs ]; services.desktopManager.plasma6.notoPackage = pkgs.fira-code; + xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ]; }; }