From e5a260a569960ff26fca6dbf3e6a99c733e40211 Mon Sep 17 00:00:00 2001
From: Nicolas Berbiche <nicolas@normie.dev>
Date: Wed, 7 Apr 2021 13:05:21 -0400
Subject: [PATCH] xmonad: use compiled configuration when config is not null
 (#1893)

If the configuration is `null`, the compiled configuration
`xmonadBin` should not be used and instead the WM startup command
should be set to the bare `xmonad` binary.
---
 modules/services/window-managers/xmonad.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/services/window-managers/xmonad.nix b/modules/services/window-managers/xmonad.nix
index d55693aa1..07ed2846f 100644
--- a/modules/services/window-managers/xmonad.nix
+++ b/modules/services/window-managers/xmonad.nix
@@ -132,12 +132,12 @@ in {
       }/bin/xmonad-${pkgs.hostPlatform.system}";
 
   in mkIf cfg.enable (mkMerge [
-    {
-      home.packages = [ (lowPrio xmonad) ];
-      xsession.windowManager.command = xmonadBin;
-    }
-
+    { home.packages = [ (lowPrio xmonad) ]; }
+    (mkIf (cfg.config == null) {
+      xsession.windowManager.command = "${xmonad}/bin/xmonad";
+    })
     (mkIf (cfg.config != null) {
+      xsession.windowManager.command = xmonadBin;
       home.file.".xmonad/xmonad.hs".source = cfg.config;
       home.file.".xmonad/xmonad-${pkgs.hostPlatform.system}" = {
         source = xmonadBin;