add swaylock and swayidle and avoid x11 and wayland services clash

1 files changed, 37 insertions, 2 deletions

diff --git a/common/modules/dwm/default.nix b/common/modules/dwm/default.nix
index 4ce4b29..0236f1d 100644
--- a/common/modules/dwm/default.nix
+++ b/common/modules/dwm/default.nix
@@ -96,8 +96,19 @@ in
             dunst &
             clipcatd &
 
-            ${lib.optionalString (cfg.picom.enable) ''
-              systemctl --user restart picom.service
+            ${lib.optionalString (!cfg.picom.enable) ''
+              xrandr --output eDP --set TearFree on
+            ''}
+
+            systemctl --user restart xidlehook.service
+            systemctl --user restart xautolock-session.service
+            systemctl --user restart xss-lock.service
+            systemctl --user restart clipcat.service
+            ${lib.optionalString (config.beeMods.mango.waybar) ''
+              systemctl --user stop waybar.service
+            ''}
+            ${lib.optionalString (config.beeMods.mango.enable) ''
+              systemctl --user stop swayidle.service
             ''}
           '';
         };
@@ -151,6 +162,30 @@ in
           ];
         };
 
+        systemd.user.services.clipcat = {
+          Unit = {
+            ConditionEnvironment = [ "XDG_SESSION_TYPE=x11" ];
+          };
+
+        };
+        systemd.user.services.xidlehook = {
+          Unit = {
+            ConditionEnvironment = [ "XDG_SESSION_TYPE=x11" ];
+          };
+        };
+
+        systemd.user.services.xautolock-session = {
+          Unit = {
+            ConditionEnvironment = [ "XDG_SESSION_TYPE=x11" ];
+          };
+        };
+
+        systemd.user.services.xss-lock = {
+          Unit = {
+            ConditionEnvironment = [ "XDG_SESSION_TYPE=x11" ];
+          };
+        };
+
         xresources.extraConfig = lib.mkIf config.beeMods.matugen.enable ''
           #include "${config.xdg.configHome}/x11/matugen.Xresources"
         '';