2 files changed, 53 insertions, 56 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;
diff --git a/common/modules/dwm/picom.nix b/common/modules/dwm/picom.nix
index 962d3ea..34b31c2 100644
--- a/common/modules/dwm/picom.nix
+++ b/common/modules/dwm/picom.nix
@@ -3,56 +3,58 @@ let
   cfg = config.beeMods.dwm.picom;
 in
 {
-  services.picom = {
-    enable = cfg.enable;
-    backend = "glx";
-    vSync = true;
+  config = lib.mkIf cfg.enable {
+    services.picom = {
+      enable = true;
+      backend = "glx";
+      vSync = true;
 
-    activeOpacity = if cfg.window.blur.enable then 0.87 else cfg.window.opacity.active;
-    inactiveOpacity = if cfg.window.blur.enable then 0.87 else cfg.window.opacity.inactive;
+      activeOpacity = if cfg.window.blur.enable then 0.87 else cfg.window.opacity.active;
+      inactiveOpacity = if cfg.window.blur.enable then 0.87 else cfg.window.opacity.inactive;
 
-    opacityRules = [
-      "100:fullscreen"
-      "100:_NET_WM_STATE@:32a *= '_NET_WM_STATE_FULLSCREEN'"
-    ];
-    settings = {
-      blur = {
-        method = "dual_kawase";
-        strength = cfg.window.blur.strength;
-        size = cfg.window.blur.size;
-      };
-      blur-background = cfg.window.blur.enable;
-      blur-background-exclude = [
-        "window_type = 'dock'"
-        "window_type = 'desktop'"
-        "class_g = 'slop'"
-        "class_g = 'dwm'"
-        "_GTK_FRAME_EXTENTS@"
-        "fullscreen"
-        "_NET_WM_STATE@:32a *= '_NET_WM_STATE_FULLSCREEN'"
+      opacityRules = [
+        "100:fullscreen"
+        "100:_NET_WM_STATE@:32a *= '_NET_WM_STATE_FULLSCREEN'"
       ];
+      settings = {
+        blur = {
+          method = "dual_kawase";
+          strength = cfg.window.blur.strength;
+          size = cfg.window.blur.size;
+        };
+        blur-background = cfg.window.blur.enable;
+        blur-background-exclude = [
+          "window_type = 'dock'"
+          "window_type = 'desktop'"
+          "class_g = 'slop'"
+          "class_g = 'dwm'"
+          "_GTK_FRAME_EXTENTS@"
+          "fullscreen"
+          "_NET_WM_STATE@:32a *= '_NET_WM_STATE_FULLSCREEN'"
+        ];
 
-      # xrender-sync-fence = true;
-      use-damage = true;
+        # xrender-sync-fence = true;
+        use-damage = true;
 
-      unredir-if-possible = true;
+        unredir-if-possible = true;
 
-      detect-transient = true;
-      detect-client-opacity = true;
-      mark-wmwin-focused = true;
-      mark-ovredir-focused = true;
-      detect-rounded-corners = true;
+        detect-transient = true;
+        detect-client-opacity = true;
+        mark-wmwin-focused = true;
+        mark-ovredir-focused = true;
+        detect-rounded-corners = true;
 
-      shadow = cfg.shadow;
-      fading = false;
-      animations = cfg.animations;
+        shadow = cfg.shadow;
+        fading = false;
+        animations = cfg.animations;
+      };
     };
-  };
 
-  # systemd.user.services.picom.Install.wantedBy = lib.mkForce [ ];
-  systemd.user.services.picom = lib.mkIf cfg.enable {
-    Unit = {
-      ConditionEnvironment = "XDG_SESSION_TYPE=x11";
+    # systemd.user.services.picom.Install.wantedBy = lib.mkForce [ ];
+    systemd.user.services.picom = {
+      Unit = {
+        ConditionEnvironment = "XDG_SESSION_TYPE=x11";
+      };
     };
   };
 }