summary refs log tree commit diff stats
path: root/system/settings/hardware
diff options
context:
space:
mode:
authorAlan Pearce2019-10-10 16:27:58 +0200
committerAlan Pearce2019-10-16 19:27:33 +0200
commit675df06a2ee596141170606c2689f7cefa66578a (patch)
treec468f2a8419c6f218ba129568ee73aaa484f0bd6 /system/settings/hardware
parent4d8269f5236df2443cec72617443fe0457960db2 (diff)
downloadnixfiles-675df06a2ee596141170606c2689f7cefa66578a.tar.lz
nixfiles-675df06a2ee596141170606c2689f7cefa66578a.tar.zst
nixfiles-675df06a2ee596141170606c2689f7cefa66578a.zip
Make changes for release 19.09
Diffstat (limited to 'system/settings/hardware')
-rw-r--r--system/settings/hardware/intel-gpu.nix2
-rw-r--r--system/settings/hardware/laptop.nix14
2 files changed, 4 insertions, 12 deletions
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 &
     '';
   };