@@ -1,45 +1,14 @@
 { config, pkgs, ... }:
 
+let
+  unstablePkgs = import <nixos-unstable> {};
+in
 {
-  home.packages = with pkgs; [
+  home.packages = with unstablePkgs; [
     steam
-    (
-      winePackages.override {
-        pngSupport = true;
-        jpegSupport = true;
-        tiffSupport = true;
-        gettextSupport = true;
-        fontconfigSupport = true;
-        alsaSupport = true;
-        gtkSupport = true;
-        openglSupport = true;
-        tlsSupport = true;
-        gstreamerSupport = true;
-        cupsSupport = true;
-        colorManagementSupport = true;
-        dbusSupport = true;
-        mpg123Support = true;
-        openalSupport = true;
-        openclSupport = true;
-        cairoSupport = true;
-        odbcSupport = true;
-        netapiSupport = true;
-        cursesSupport = true;
-        vaSupport = true;
-        pcapSupport = true;
-        v4lSupport = true;
-        saneSupport = true;
-        gsmSupport = true;
-        gphoto2Support = true;
-        ldapSupport = true;
-        pulseaudioSupport = true;
-        udevSupport = true;
-        xineramaSupport = true;
-        xmlSupport = true;
-        vulkanSupport = true;
-        sdlSupport = true;
-      }
-    )
-    lutris
+    wineWowPackages.stable
+    # winetricks
+
+    pkgs.lutris
   ];
 }

@@ -17,6 +17,17 @@ modifier = mod;
       floating = {
         criteria = [
           { class = "Pinentry$"; }
+          # https://github.com/ValveSoftware/steam-for-linux/issues/1040
+          { class = "^Steam$"; title = "^Friends$"; }
+          { class = "^Steam$"; title = "Steam - News"; }
+          { class = "^Steam$"; title = ".* - Chat"; }
+          { class = "^Steam$"; title = "^Settings$"; }
+          { class = "^Steam$"; title = ".* - event started"; }
+          { class = "^Steam$"; title = ".* CD key"; }
+          { class = "^Steam$"; title = "^Steam - Self Updater$"; }
+          { class = "^Steam$"; title = "^Screenshot Uploader$"; }
+          { class = "^Steam$"; title = "^Steam Guard - Computer Authorization Required$"; }
+          { title = "^Steam Keyboard$"; }
         ];
       };
       window = {