Merge pull request #95122 from rudolph9/nixos/xmonad

nixos/xmonad: Fix behavior of config opt
2020-08-21 08:51:42 +02:00
parent a81c1d1fd9 c54beb953d
commit ebf11e405d
1 changed files with 5 additions and 6 deletions
@@ -82,12 +82,11 @@ in
    services.xserver.windowManager = {
      session = [{
        name = "xmonad";
-        start = if (cfg.config != null) then ''
+        start = let
-          ${xmonadBin}
+          xmonadCommand = if (cfg.config != null) then xmonadBin else "${xmonad}/bin/xmonad";
-          waitPID=$!
+        in ''
-        '' else ''
+           systemd-cat -t xmonad ${xmonadCommand} &
-          systemd-cat -t xmonad ${xmonad}/bin/xmonad &
+           waitPID=$!
          waitPID=$!
        '';
      }];
    };