i like it boxy fix xorg systemd services startup and more

1 files changed, 10 insertions, 15 deletions

diff --git a/common/modules/dwm/default.nix b/common/modules/dwm/default.nix
index 0236f1d..8aadbfb 100644
--- a/common/modules/dwm/default.nix
+++ b/common/modules/dwm/default.nix
@@ -56,9 +56,10 @@ in
           autoRepeatDelay = 300;
           autoRepeatInterval = 20;
           excludePackages = with pkgs; [ xterm ];
-          displayManager = {
-            startx.enable = true;
-          };
+          displayManager.sessionCommands = ''
+            ${pkgs.systemd}/bin/systemctl --user import-environment DISPLAY XAUTHORITY XDG_SESSION_TYPE
+            ${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY XAUTHORITY XDG_SESSION_TYPE
+          '';
           windowManager.dwm = {
             enable = true;
             package = inputs.mydwm.packages.${pkgs.stdenv.hostPlatform.system}.default;
@@ -82,28 +83,22 @@ in
           text = ''
             #!${pkgs.bash}/bin/bash
 
-            dbus-update-activation-environment --systemd --all
-            systemctl --user import-environment DISPLAY XAUTHORITY
-
             gnome-keyring-daemon --start --components=secrets,ssh,pkcs11 &
             ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1 &
 
-            if [ -f ~/.fehbg ]; then
-              sh ~/.fehbg
-            fi
+            [ -f ~/.fehbg ] && sh ~/.fehbg
             [ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
 
             dunst &
             clipcatd &
-
             ${lib.optionalString (!cfg.picom.enable) ''
               xrandr --output eDP --set TearFree on
             ''}
+            ${lib.optionalString (cfg.picom.enable) ''
+              systemctl --user restart picom.service
+            ''}
 
-            systemctl --user restart xidlehook.service
-            systemctl --user restart xautolock-session.service
-            systemctl --user restart xss-lock.service
-            systemctl --user restart clipcat.service
+            systemctl --user restart xidlehook.service xautolock-session.service xss-lock.service clipcat.service
             ${lib.optionalString (config.beeMods.mango.waybar) ''
               systemctl --user stop waybar.service
             ''}
@@ -114,7 +109,7 @@ in
         };
 
         services.clipcat = {
-          enable = cfg.enable;
+          enable = true;
           daemonSettings = {
             daemonize = false;
             max_history = 50;