diff options
| author | volth <volth@volth.com> | 2018-07-12 01:41:06 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2018-07-12 01:45:41 +0000 |
| commit | 88939a1949123fc3a17e3464c521ebcca3f7e473 (patch) | |
| tree | f1dc5500a3c71e09526bd3c2d40454c1e7563b9e /nixos/modules | |
| parent | 2ea2cce39165c1cd5c7ada6da0c813a53b1afa4b (diff) | |
| download | nixpkgs-88939a1949123fc3a17e3464c521ebcca3f7e473.tar nixpkgs-88939a1949123fc3a17e3464c521ebcca3f7e473.tar.gz nixpkgs-88939a1949123fc3a17e3464c521ebcca3f7e473.tar.bz2 nixpkgs-88939a1949123fc3a17e3464c521ebcca3f7e473.tar.lz nixpkgs-88939a1949123fc3a17e3464c521ebcca3f7e473.tar.xz nixpkgs-88939a1949123fc3a17e3464c521ebcca3f7e473.tar.zst nixpkgs-88939a1949123fc3a17e3464c521ebcca3f7e473.zip | |
nixos: remove option services.xserver.desktopManager.xfce.screenLock
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/rename.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/xfce.nix | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 7b094fc1420..3d626bf515a 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -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.") diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 7dcc600d266..ae155470419 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -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 ] |