From e99b5916db3e224ebf9e68c5dfe111de93e555d2 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Thu, 5 Sep 2024 17:59:33 -0400
Subject: [PATCH] dwm: Move autostart programs out of .xinitrc

---
 home/dwm.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/home/dwm.nix b/home/dwm.nix
index b1bdc5d1..584c81a1 100644
--- a/home/dwm.nix
+++ b/home/dwm.nix
@@ -2,6 +2,7 @@
 
 let
   inherit (config.lib.stylix.colors.withHashtag) base00 base03 base05;
+  inherit (config.home) homeDirectory;
 
   barScript = "dwm/bar.fish";
 in
@@ -35,8 +36,16 @@ in
             };
 
             static const char *const autostart[] = {
+              "${pkgs.nemo}/bin/nemo-desktop", NULL,
+              "xrdb", "-merge", "${homeDirectory}/.Xresources", NULL,
               "mpDris2", NULL,
               "dunst", NULL,
+              "picom", NULL,
+              "fcitx5", NULL,
+              "xset", "r", "rate", "300", "50", NULL,
+              "xset", "-dpms", NULL,
+              "fish", "${homeDirectory}/.config/${barScript}", NULL,
+              "feh", "--no-fehbg", "--bg-scale", "${config.stylix.image}", NULL,
               NULL
             };
 
@@ -171,15 +180,6 @@ in
           export GLFW_IM_MODULE=ibus
           export GTK_CSD=0
 
-          xrdb -merge ~/.Xresources
-          xset r rate 300 50
-          feh --no-fehbg --bg-scale ${config.stylix.image}
-          ~/.config/${barScript} &
-          picom --daemon
-          ${pkgs.nemo}/bin/nemo-desktop &
-          fcitx5 &
-          xset -dpms
-
           while true; do
             dbus-launch --sh-syntax --exit-with-session dwm
           done