reconfigure hyprland

1 files changed, 44 insertions, 20 deletions

diff --git a/nix/programs/hypr/hyprland.nix b/nix/programs/hypr/hyprland.nix
index 948b880..9d3f069 100644
--- a/nix/programs/hypr/hyprland.nix
+++ b/nix/programs/hypr/hyprland.nix
@@ -10,22 +10,55 @@ let
 in
 
 {
-  #xdg.portal = {
-  #  enable = true;
-  #  extraPortals = [ hyprland.xdg-desktop-portal-hyprland ];
-  #};
+  environment = {
+    variables = {
+      XDG_CURRENT_DESKTOP = "Hyprland";
+      XDG_SESSION_TYPE = "wayland";
+      XDG_SESSION_DESKTOP = "Hyprland";
+      LIBSEAT_BACKEND = "logind";
+    };
+    sessionVariables = {
+      XCURSOR_THEME = "Adwaita";
+      XCURSOR_SIZE = "24";
+
+      GTK_THEME = "Orchis-Teal-Dark";
+
+      MOZ_ENABLE_WAYLAND = "1";
+      MOZ_USE_XINPUT = "1";
+      _JAVA_AWT_WM_NONREPARENTING = "1";
+    };
+  };
+
+  xdg.portal = {
+    enable = true;
+    xdgOpenUsePortal = true;
+    config = {
+      common.default = ["gtk"];
+      hyprland.default = ["gtk" "hyprland"];
+    };
+    extraPortals = [
+      pkgs.xdg-desktop-portal-gtk
+      pkgs.xdg-desktop-portal-wlr
+      hyprland.xdg-desktop-portal-hyprland
+    ];
+  };
 
   nix.settings = {
     substituters = ["https://hyprland.cachix.org"];
-    trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
+    trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkGc="];
   };
 
+  programs.xwayland.enable = true;
+
   home-manager.users.${config.user} = {
     wayland.windowManager.hyprland = {
 
       enable = true;
       package = hyprland.hyprland;
 
+      xwayland.enable = false; # FIXME: keeps crashing!!!
+      systemd.enable = true;
+
       # Plugins
       plugins = [
         hyprland-plugins.hyprexpo
@@ -34,6 +67,12 @@ in
 
       # Config
       settings = {
+
+        # Debug
+        debug.disable_logs = false;
+        debug.disable_time = false;
+        debug.enable_stdout_logs = true;
+
         # Monitors
         monitor = map (monitor:
           "${monitor.name}, highres, auto, ${toString monitor.scale}"
@@ -97,21 +136,6 @@ in
           ];
         };
 
-        # Environment
-        env = [
-          "XDG_CURRENT_DESKTOP,Hyprland"
-          "XDG_SESSION_DESKTOP,Hyprland"
-
-          "XCURSOR_THEME,Adwaita"
-          "XCURSOR_SIZE,24"
-
-          "GTK_THEME,Orchis-Teal-Dark"
-
-          "MOZ_ENABLE_WAYLAND,1"
-          "MOZ_USE_XINPUT,1"
-          "_JAVA_AWT_WM_NONREPARENTING,1"
-        ];
-
         # Input
         input = {
           kb_layout = "us";