enable systemd for waybar and mango and update wallpaper script

1 files changed, 11 insertions, 14 deletions

diff --git a/common/modules/mango/default.nix b/common/modules/mango/default.nix
index c7634e9..f8b1297 100644
--- a/common/modules/mango/default.nix
+++ b/common/modules/mango/default.nix
@@ -84,6 +84,8 @@ in
       {
         wayland.windowManager.mango = {
           enable = true;
+          systemd.enable = true;
+          systemd.variables = [ "--all" ];
           settings = ''
             ${lib.optionalString (config.beeMods.matugen.enable) ''
               source=~/.config/mango/mango-colors.conf
@@ -387,25 +389,20 @@ in
             env=GDK_BACKEND,wayland,x11
             env=GDK_SCALE,1
 
-            # exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-            exec-once = /bin/sh -c 'eval $(gnome-keyring-daemon --start --components=secrets,ssh); dbus-update-activation-environment --systemd --all'
-            exec-once = ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1
-
+            exec-once = ~/.config/mango/autostart.sh
+          '';
+          autostart_sh = ''
+            wl-clip-persist --clipboard regular &
+            ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1 &
             ${lib.optionalString (config.services.picom.enable) ''
-              exec-once = systemctl --user stop picom.service
+              systemctl --user stop picom.service
             ''}
-            exec-once = sh ~/.swaybg
-
-            ${lib.optionalString (cfg.waybar) ''
-              exec-once = waybar &
-            ''}
-            exec-once = dunst &
-
-            exec-once = wl-clip-persist --clipboard regular
+	    gnome-keyring-daemon --start --components=secrets,ssh,pkcs11 &
+	    swww-daemon -q &
           '';
         };
         home.packages = with pkgs; [
-          swaybg
+	  swww
           wl-clipboard-rs
           wl-clip-persist
         ];