diff options
| author | Lassulus <github@lassul.us> | 2020-08-21 08:51:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 08:51:42 +0200 |
| commit | ebf11e405d7acc9aef9a8e665ed02fcd6a4d5fd7 (patch) | |
| tree | 47745cd317a0e4ecf2dbcf3318038c18a5d6d218 /nixos/modules | |
| parent | a81c1d1fd9a0d38949aaf30a898ee414b895bc64 (diff) | |
| parent | c54beb953d00f576ba73565d0476af241af26013 (diff) | |
| download | nixpkgs-ebf11e405d7acc9aef9a8e665ed02fcd6a4d5fd7.tar nixpkgs-ebf11e405d7acc9aef9a8e665ed02fcd6a4d5fd7.tar.gz nixpkgs-ebf11e405d7acc9aef9a8e665ed02fcd6a4d5fd7.tar.bz2 nixpkgs-ebf11e405d7acc9aef9a8e665ed02fcd6a4d5fd7.tar.lz nixpkgs-ebf11e405d7acc9aef9a8e665ed02fcd6a4d5fd7.tar.xz nixpkgs-ebf11e405d7acc9aef9a8e665ed02fcd6a4d5fd7.tar.zst nixpkgs-ebf11e405d7acc9aef9a8e665ed02fcd6a4d5fd7.zip | |
Merge pull request #95122 from rudolph9/nixos/xmonad
nixos/xmonad: Fix behavior of config opt
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/x11/window-managers/xmonad.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 30c59b88f82..070758720fe 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -82,12 +82,11 @@ in services.xserver.windowManager = { session = [{ name = "xmonad"; - start = if (cfg.config != null) then '' - ${xmonadBin} - waitPID=$! - '' else '' - systemd-cat -t xmonad ${xmonad}/bin/xmonad & - waitPID=$! + start = let + xmonadCommand = if (cfg.config != null) then xmonadBin else "${xmonad}/bin/xmonad"; + in '' + systemd-cat -t xmonad ${xmonadCommand} & + waitPID=$! ''; }]; }; |