From 13a314ec17c01f6052e529dd551666a079264666 Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Fri, 4 Sep 2015 09:32:29 -0600 Subject: [PATCH] Remove all explicit assignments of desktopManagerHandlesLidAndPower --- nixos/modules/services/x11/desktop-managers/e19.nix | 1 - nixos/modules/services/x11/desktop-managers/gnome3.nix | 1 - nixos/modules/services/x11/desktop-managers/kde4.nix | 1 - nixos/modules/services/x11/desktop-managers/kde5.nix | 1 - nixos/modules/services/x11/desktop-managers/kodi.nix | 1 - nixos/modules/services/x11/desktop-managers/xfce.nix | 1 - 6 files changed, 6 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/e19.nix b/nixos/modules/services/x11/desktop-managers/e19.nix index 74065c862ef..2d5c7b192bc 100644 --- a/nixos/modules/services/x11/desktop-managers/e19.nix +++ b/nixos/modules/services/x11/desktop-managers/e19.nix @@ -62,7 +62,6 @@ in waitPID=$! ''; }]; - services.xserver.displayManager.desktopManagerHandlesLidAndPower = true; security.setuidPrograms = [ "e19_freqset" ]; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 507c2d2da13..fdee5fbc6c5 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -99,7 +99,6 @@ in { networking.networkmanager.enable = mkDefault true; services.upower.enable = config.powerManagement.enable; hardware.bluetooth.enable = mkDefault true; - services.xserver.displayManager.desktopManagerHandlesLidAndPower = false; # true doesn't make sense here, GNOME just doesn't handle it anymore fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ]; diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix index 7830e984219..21b6243ba18 100644 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ b/nixos/modules/services/x11/desktop-managers/kde4.nix @@ -111,7 +111,6 @@ in exec ${kde_workspace}/bin/startkde ''; }; - services.xserver.displayManager.desktopManagerHandlesLidAndPower = true; security.setuidOwners = singleton { program = "kcheckpass"; diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 01a8704fea7..5061d59b7c7 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -78,7 +78,6 @@ in bgSupport = true; start = ''exec ${plasma5.plasma-workspace}/bin/startkde;''; }; - services.xserver.displayManager.desktopManagerHandlesLidAndPower = true; security.setuidOwners = singleton { program = "kcheckpass"; diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix index e6d6efaf3a6..de00ff93b17 100644 --- a/nixos/modules/services/x11/desktop-managers/kodi.nix +++ b/nixos/modules/services/x11/desktop-managers/kodi.nix @@ -25,7 +25,6 @@ in waitPID=$! ''; }]; - services.xserver.displayManager.desktopManagerHandlesLidAndPower = true; environment.systemPackages = [ pkgs.kodi ]; }; diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 746f810a11f..88eefa13de3 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -37,7 +37,6 @@ in exec ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc} ''; }; - services.xserver.displayManager.desktopManagerHandlesLidAndPower = true; environment.systemPackages = [ pkgs.gtk # To get GTK+'s themes.