cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #43396 from volth/xfce-remove-screenLock

Browse source 
nixos: remove option services.xserver.desktopManager.xfce.screenLock
This commit is contained in:
xeji 2018-07-12 14:08:14 +02:00 committed by GitHub
commit cfc2e6795a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/rename.nix
View file

@ -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.")

8
nixos/modules/services/x11/desktop-managers/xfce.nix
View file

@ -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 ]