diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 16:14:15 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 22:45:56 +0100 |
commit | d5047faedef254d01a21618224698c190bb67e5b (patch) | |
tree | 42a43de15611b5e35b2888f02fb940365edb1402 /nixos/modules/services/x11/window-managers/default.nix | |
parent | f4a418761b481b15900c78b8086e7be58b0afe4e (diff) | |
download | nixpkgs-d5047faedef254d01a21618224698c190bb67e5b.tar nixpkgs-d5047faedef254d01a21618224698c190bb67e5b.tar.gz nixpkgs-d5047faedef254d01a21618224698c190bb67e5b.tar.bz2 nixpkgs-d5047faedef254d01a21618224698c190bb67e5b.tar.lz nixpkgs-d5047faedef254d01a21618224698c190bb67e5b.tar.xz nixpkgs-d5047faedef254d01a21618224698c190bb67e5b.tar.zst nixpkgs-d5047faedef254d01a21618224698c190bb67e5b.zip |
Remove uses of the "merge" option attribute
It's redundant because you can (and should) specify an option type, or an apply function.
Diffstat (limited to 'nixos/modules/services/x11/window-managers/default.nix')
-rw-r--r-- | nixos/modules/services/x11/window-managers/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index c201b789ae4..e856a9e2079 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -40,10 +40,10 @@ in }; default = mkOption { + type = types.uniq types.string; default = "none"; example = "wmii"; description = "Default window manager loaded if none have been chosen."; - merge = mergeOneOption; apply = defaultWM: if any (w: w.name == defaultWM) cfg.session then defaultWM |