diff --git a/nixos-configuration/steveej-laptop/system.nix b/nixos-configuration/steveej-laptop/system.nix
index 53251ed..6cc6298 100644
--- a/nixos-configuration/steveej-laptop/system.nix
+++ b/nixos-configuration/steveej-laptop/system.nix
@@ -138,49 +138,53 @@ rec {
 
   services.pcscd.enable = true;
   services.xserver = {
+    enable = true;
     libinput.enable = true;
     libinput.naturalScrolling = true;
 
     videoDrivers = [ "qxl" "modesetting" ];
-    enable = true;
-    layout = "us";
+    xkbVariant = "altgr-intl";
+    xkbOptions = "nodeadkeys,caps:swapescape";
 
     windowManager.qtile.enable = true;
     windowManager.default = "qtile";
     desktopManager = {
+      gnome3.enable = true;
       xterm.enable = true;
-      gnome3.enable = false;
-      xfce.enable = true;
+      plasma5.enable = false;
     };
 
     displayManager = {
-      sddm.enable = true;
+      gdm.enable = true;
+      gdm.wayland = false;
+        # ${pkgs.xautolock}/bin/xautolock -time 10 -locker slimlock &
+        # ${pkgs.redshift}/bin/redshift-gtk -v -b 1.0:1.0 -l 47.6691:9.1698 -t 7000:4500 -m randr &
       sessionCommands = ''
-        xscreensaver -no-splash &
+        ${pkgs.redshift}/bin/redshift-gtk -v -l 47.6691:9.1698 -t 7000:4500 -m randr &
         ${pkgs.networkmanagerapplet}/bin/nm-applet &
-        $(sleep 2; xmodmap ~/.Xmodmap) &
+        ${pkgs.xorg.xsetroot}/bin/xsetroot -solid darkblue &
+        ${pkgs.autorandr}/bin/autorandr -l common &
       '';
     };
   };
-
   services.udev.packages = [
-    pkgs.libu2f-host
-    pkgs.yubikey-personalization
-  ];
+      pkgs.libu2f-host
+      pkgs.yubikey-personalization
+    ];
   services.udev.extraRules = ''
     # OnePlusOne
     ATTR{idVendor}=="05c6", ATTR{idProduct}=="6764", SYMLINK+="libmtp-%k", MODE="660", GROUP="audio", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="uaccess"
     ATTR{idVendor}=="05c6", ATTR{idProduct}=="6765", SYMLINK+="libmtp-%k", MODE="660", GROUP="audio", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="uaccess"
   ''
-#    + builtins.readFile (pkgs.fetchurl {
-#        url="https://raw.githubusercontent.com/Yubico/libu2f-host/master/70-u2f.rules";
-#        sha256="1vmvk6pybvw92y97xbf8gm08x54f4zhvjawmbc37f25g2x97kgrf";
-#      })
       ;
 
+  services.packagekit.enable = true;
+
   services.resolved.enable = false;
 
   # hardware related services
+  services.illum.enable = true;
+
   hardware = {
     bluetooth.enable = true;
     pulseaudio = {
@@ -197,9 +201,17 @@ rec {
     virtualbox.host.addNetworkInterface = true;
   };
 
+  # Activation scripts for impure set up of paths in /
   system.activationScripts.bin = ''
     echo "setting up /bin..."
     ln -sfn ${pkgs.bash}/bin/bash /tmp/.binbash
     mv /tmp/.binbash /bin/bash
   '';
+  system.activationScripts.etcX11sessinos = ''
+    echo "setting up /etc/X11/sessions..."
+    mkdir -p /etc/X11
+    [[ ! -L /etc/X11/sessions ]] || rm /etc/X11/sessions
+    ln -sf ${config.services.xserver.displayManager.session.desktops} /etc/X11/sessions
+  '';
+
 }