From aacee2d4d7edf93b47d801d7e4de4cdb5b163f19 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Mon, 18 Mar 2024 10:38:50 -0400
Subject: [PATCH] fix(hyprland): use xdg-desktop-hyprland

---
 modules/hyprland/default.nix  | 23 +++++++++--------------
 modules/hyprland/packages.nix |  2 +-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix
index 61de35e7..a5d0ba1d 100644
--- a/modules/hyprland/default.nix
+++ b/modules/hyprland/default.nix
@@ -16,8 +16,10 @@ in {
     ./security.nix
   ];
 
-  # Needed for hycov fork
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
   environment.systemPackages = with pkgs; [
+    # Needed for hycov fork
     gcc
     pciutils
   ];
@@ -27,19 +29,10 @@ in {
     gvfs.enable = true;
   };
 
-  xdg.portal = {
+  programs.hyprland = with hyprland.packages.${pkgs.system}; {
     enable = true;
-    # FIXME: should I be using this?
-    # xdgOpenUsePortal = true;
-
-    config = {
-      common.default = ["gtk"];
-      hyprland.default = ["gtk" "hyprland"];
-    };
-
-    extraPortals = [
-      pkgs.xdg-desktop-portal-gtk
-    ];
+    package = default;
+    portalPackage = xdg-desktop-portal-hyprland;
   };
 
   # HOME-MANAGER CONFIG
@@ -53,7 +46,9 @@ in {
 
     wayland.windowManager.hyprland = {
       enable = true;
-      package = hyprland.packages.${pkgs.system}.default;
+      package = config.programs.hyprland.finalPackage;
+
+      systemd.variables = ["-all"];
 
       settings = {
         env = let
diff --git a/modules/hyprland/packages.nix b/modules/hyprland/packages.nix
index a0c9e8ed..3c801c65 100644
--- a/modules/hyprland/packages.nix
+++ b/modules/hyprland/packages.nix
@@ -79,7 +79,7 @@ in {
                 addOpenGLRunpath.driverLink
                 libglvnd
               ]}"''} \
-          --add-flags "--enable-features=UseOzonePlatform --ozone-platform=wayland"
+          --add-flags "--enable-features=UseOzonePlatform,WebRTCPipeWireCapturer --ozone-platform=wayland"
         '';
       })
     ];