@@ -1,8 +1,8 @@ { config, pkgs, ... }:
 
 { time.timeZone = "Europe/Berlin";
-  services.redshift = {
-    latitude = "52.586";
-    longitude = "13.300";
+  location = {
+    latitude = 52.586;
+    longitude = 13.300;
   };
 }

@@ -2,7 +2,7 @@ { config, pkgs, ... }: 
 { time.timeZone = "Europe/London";
   services.redshift = {
-    latitude = "52.2394";
-    longitude = "-0.9416";
+    latitude = 52.2394;
+    longitude = -0.9416;
   };
 }

@@ -6,8 +6,6 @@ vaapiVdpau     libvdpau-va-gl
   ];
 
-  services.xserver.videoDrivers = [ "intel" "modesetting" ];
-
   boot.earlyVconsoleSetup = true;
   boot.initrd.kernelModules = [
     "i915"

@@ -17,17 +17,8 @@ pulseaudio-modules-bt       ];
     };
   };
-  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 @@ DEVICES_TO_DISABLE_ON_BAT_NOT_IN_USE="bluetooth wwan"     '';
   };
 
+  services.blueman = {
+    enable = true;
+  };
+
   services.xserver = {
     libinput = {
       enable = lib.mkDefault true;
@@ -73,7 +68,6 @@ disableWhileTyping = true;     };
     displayManager.sessionCommands = ''
       ${pkgs.autorandr}/bin/autorandr --change --force
-      ${pkgs.blueman}/bin/blueman-applet &
     '';
   };
 

@@ -6,7 +6,6 @@ gnome3 = {       gnome-documents.enable = false;
       gnome-user-share.enable = false;
       gnome-online-accounts.enable = false;
-      seahorse.enable = false;
       tracker.enable = false;
     };
     telepathy.enable = false;

@@ -27,7 +27,7 @@ }; 
   services.xserver.displayManager.setupCommands = ''
     ${pkgs.redshift}/bin/redshift \
-      -l ${toString config.services.redshift.latitude}:${toString config.services.redshift.longitude} \
+      -l ${toString config.location.latitude}:${toString config.location.longitude} \
       -t ${toString config.services.redshift.temperature.day}:${toString config.services.redshift.temperature.night} \
       -b 1:1 \
       -o \

@@ -41,7 +41,7 @@   services.compton = {
     enable = true;
     backend = "glx";
-    vSync = "opengl-swc";
+    vSync = true;
   };
 
   services.devmon.enable = true;
@@ -80,9 +80,9 @@   programs.ssh.startAgent = true;
 
   programs.dconf.enable = true;
+  programs.seahorse.enable = true;
   services.gnome3 = {
     gnome-keyring.enable = true;
-    seahorse.enable = true;
     at-spi2-core.enable = true;
   };
 

@@ -21,7 +21,6 @@ if !stdenv.isDarwin     then [
       ldns
       httping
-      http-prompt
       firefox-devedition-bin
     ] else [
     ]