nixos/wayland: programs.hyprland.withUWSM = true

thiagokokada · Dec 28, 2024 · ad8a01f · ad8a01f
1 parent 1ccc2df
commit ad8a01f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/modules/home-manager/desktop/wayland/hyprland/default.nix b/modules/home-manager/desktop/wayland/hyprland/default.nix
@@ -37,6 +37,8 @@ in
 
     wayland.windowManager.hyprland = {
       enable = true;
+      # Conflicts with programs.hyprland.withUWSM
+      systemd.enable = false;
       settings =
         let
           inherit (config.home-manager.desktop.default) browser terminal fileManager;

diff --git a/modules/home-manager/desktop/wayland/swayidle.nix b/modules/home-manager/desktop/wayland/swayidle.nix
@@ -78,10 +78,13 @@ in
 
     # Add some time before restart, to avoid the following error:
     # swayidle.service: Start request repeated too quickly.
-    systemd.user.services.swayidle.Service = {
-      # Use exponential restart
-      RestartSteps = 5;
-      RestartMaxDelaySec = 10;
+    systemd.user.services.swayidle = {
+      Unit.After = [ "graphical-session.target" ];
+      Service = {
+        # Use exponential restart
+        RestartSteps = 5;
+        RestartMaxDelaySec = 10;
+      };
     };
   };
 }
diff --git a/modules/home-manager/desktop/wayland/waybar.nix b/modules/home-manager/desktop/wayland/waybar.nix
@@ -419,15 +419,18 @@ in
     };
 
     systemd.user.services.waybar = {
-      Unit.ConditionEnvironment = "WAYLAND_DISPLAY";
+      Unit = {
+        After = lib.mkForce [ "graphical-session.target" ];
+        ConditionEnvironment = "WAYLAND_DISPLAY";
+      };
       Service = {
         # Use exponential restart
         # https://enotty.pipebreaker.pl/posts/2024/01/how-systemd-exponential-restart-delay-works/
         RestartSec = "250ms";
         RestartSteps = 5;
         RestartMaxDelaySec = 5;
         # https://github.com/nix-community/home-manager/issues/4099
-        Environment = "PATH=${config.home.profileDirectory}/bin";
+        Environment = [ "PATH=${config.home.profileDirectory}/bin:/run/current-system/sw/bin" ];
       };
     };
   };

diff --git a/modules/nixos/desktop/wayland.nix b/modules/nixos/desktop/wayland.nix
@@ -12,7 +12,10 @@
 
   config = lib.mkIf config.nixos.desktop.wayland.enable {
     programs = {
-      hyprland.enable = true;
+      hyprland = {
+        enable = true;
+        withUWSM = true;
+      };
       sway = {
         # Make Sway available for display managers and make things like swaylock work
         enable = true;