mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 03:30:45 +00:00
nixos: remove option services.xserver.desktopManager.xfce.screenLock
This commit is contained in:
parent
2ea2cce391
commit
88939a1949
|
@ -242,6 +242,7 @@ with lib;
|
|||
(mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "")
|
||||
(mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ]
|
||||
"Set the option `services.xserver.displayManager.sddm.package' instead.")
|
||||
(mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "")
|
||||
(mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
|
||||
(mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
|
||||
(mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.")
|
||||
|
|
|
@ -43,12 +43,6 @@ in
|
|||
default = true;
|
||||
description = "Enable the XFWM (default) window manager.";
|
||||
};
|
||||
|
||||
screenLock = mkOption {
|
||||
type = types.enum [ "xscreensaver" "xlockmore" "slock" ];
|
||||
default = "xlockmore";
|
||||
description = "Application used by XFCE to lock the screen.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -92,7 +86,7 @@ in
|
|||
thunar-volman # TODO: drop
|
||||
] ++ (if config.hardware.pulseaudio.enable
|
||||
then [ xfce4-mixer-pulse xfce4-volumed-pulse ]
|
||||
else [ xfce4-mixer xfce4-volumed ])
|
||||
else [ xfce4-mixer xfce4-volumed ])
|
||||
# TODO: NetworkManager doesn't belong here
|
||||
++ optionals config.networking.networkmanager.enable [ networkmanagerapplet ]
|
||||
++ optionals config.powerManagement.enable [ xfce4-power-manager ]
|
||||
|
|
Loading…
Reference in a new issue