summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2018-07-12 01:41:06 +0000
committervolth <volth@volth.com>2018-07-12 01:45:41 +0000
commit88939a1949123fc3a17e3464c521ebcca3f7e473 (patch)
treef1dc5500a3c71e09526bd3c2d40454c1e7563b9e /nixos/modules/services
parent2ea2cce39165c1cd5c7ada6da0c813a53b1afa4b (diff)
downloadnixlib-88939a1949123fc3a17e3464c521ebcca3f7e473.tar
nixlib-88939a1949123fc3a17e3464c521ebcca3f7e473.tar.gz
nixlib-88939a1949123fc3a17e3464c521ebcca3f7e473.tar.bz2
nixlib-88939a1949123fc3a17e3464c521ebcca3f7e473.tar.lz
nixlib-88939a1949123fc3a17e3464c521ebcca3f7e473.tar.xz
nixlib-88939a1949123fc3a17e3464c521ebcca3f7e473.tar.zst
nixlib-88939a1949123fc3a17e3464c521ebcca3f7e473.zip
nixos: remove option services.xserver.desktopManager.xfce.screenLock
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/x11/desktop-managers/xfce.nix8
1 files changed, 1 insertions, 7 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 7dcc600d2664..ae155470419d 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 ]