From f0b37c1813b11d86b1eff6ac6cd9fbffec2ec1d5 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Wed, 2 Apr 2025 12:00:00 +0100
Subject: [PATCH] Extract `.xinitrc` into a separate file

---
 modules/home-manager/desktop/default.nix             |  2 +-
 .../desktop/{dwm.nix => dwm/default.nix}             | 12 +-----------
 modules/home-manager/desktop/dwm/xinitrc             |  5 +++++
 3 files changed, 7 insertions(+), 12 deletions(-)
 rename modules/home-manager/desktop/{dwm.nix => dwm/default.nix} (62%)
 create mode 100644 modules/home-manager/desktop/dwm/xinitrc

diff --git a/modules/home-manager/desktop/default.nix b/modules/home-manager/desktop/default.nix
index ce4a16d9..883e04ec 100644
--- a/modules/home-manager/desktop/default.nix
+++ b/modules/home-manager/desktop/default.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ./discord.nix
-    ./dwm.nix
+    ./dwm
     ./flameshot.nix
     ./gtk.nix
     ./media
diff --git a/modules/home-manager/desktop/dwm.nix b/modules/home-manager/desktop/dwm/default.nix
similarity index 62%
rename from modules/home-manager/desktop/dwm.nix
rename to modules/home-manager/desktop/dwm/default.nix
index c6f5f44f..a6f33a4a 100644
--- a/modules/home-manager/desktop/dwm.nix
+++ b/modules/home-manager/desktop/dwm/default.nix
@@ -12,17 +12,7 @@ with lib;
 
   config = mkIf config.homeManagerModules.dwm.enable {
     home = {
-      file."${config.home.sessionVariables.XINITRC}".text = ''
-        systemctl --user import-environment DISPLAY
-
-        poweralertd -s &
-
-        setbg &
-
-        systemctl --user start dwm-status &
-
-        exec dwm
-      '';
+      file."${config.home.sessionVariables.XINITRC}".source = ./xinitrc;
 
       sessionVariables = {
         XINITRC = "${config.xdg.configHome}/X11/xinitrc";
diff --git a/modules/home-manager/desktop/dwm/xinitrc b/modules/home-manager/desktop/dwm/xinitrc
new file mode 100644
index 00000000..ac0f6c3a
--- /dev/null
+++ b/modules/home-manager/desktop/dwm/xinitrc
@@ -0,0 +1,5 @@
+systemctl --user import-environment DISPLAY
+poweralertd -s &
+setbg &
+systemctl --user start dwm-status &
+exec dwm