From 675df06a2ee596141170606c2689f7cefa66578a Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 10 Oct 2019 16:27:58 +0200
Subject: Make changes for release 19.09

---
 system/settings/hardware/intel-gpu.nix |  2 --
 system/settings/hardware/laptop.nix    | 14 ++++----------
 2 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'system/settings/hardware')

diff --git a/system/settings/hardware/intel-gpu.nix b/system/settings/hardware/intel-gpu.nix
index fc6b6fa3..81fd765e 100644
--- a/system/settings/hardware/intel-gpu.nix
+++ b/system/settings/hardware/intel-gpu.nix
@@ -6,8 +6,6 @@
     libvdpau-va-gl
   ];
 
-  services.xserver.videoDrivers = [ "intel" "modesetting" ];
-
   boot.earlyVconsoleSetup = true;
   boot.initrd.kernelModules = [
     "i915"
diff --git a/system/settings/hardware/laptop.nix b/system/settings/hardware/laptop.nix
index 17e27b63..bec1f7f6 100644
--- a/system/settings/hardware/laptop.nix
+++ b/system/settings/hardware/laptop.nix
@@ -17,17 +17,8 @@
       ];
     };
   };
-  systemd.services.bluetooth.wantedBy = lib.mkForce [];
-  systemd.timers.bluetooth = {
-    description = "Delayed startup of Bluetooth";
-    wantedBy = [ "timers.target" ];
-    timerConfig = {
-      OnActiveSec = "1 min";
-    };
-  };
 
   environment.systemPackages = with pkgs; [
-    blueman
     bluez-tools
 
     powerstat
@@ -65,6 +56,10 @@
     '';
   };
 
+  services.blueman = {
+    enable = true;
+  };
+
   services.xserver = {
     libinput = {
       enable = lib.mkDefault true;
@@ -73,7 +68,6 @@
     };
     displayManager.sessionCommands = ''
       ${pkgs.autorandr}/bin/autorandr --change --force
-      ${pkgs.blueman}/bin/blueman-applet &
     '';
   };
 
-- 
cgit 1.4.1