5 files changed, 12 insertions, 6 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index faa29f3db..892eb1095 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -56,7 +56,6 @@ with import <stockholm/lib>;
       <stockholm/makefu/2configs/git/brain-retiolum.nix>
       <stockholm/makefu/2configs/tor.nix>
       <stockholm/makefu/2configs/vpn/vpngate.nix>
-      <stockholm/makefu/2configs/steam.nix>
       # <stockholm/makefu/2configs/buildbot-standalone.nix>
 
       # Hardware
diff --git a/makefu/2configs/tools/games.nix b/makefu/2configs/tools/games.nix
index 47f06287b..8e815da5e 100644
--- a/makefu/2configs/tools/games.nix
+++ b/makefu/2configs/tools/games.nix
@@ -1,8 +1,10 @@
 { pkgs, ... }:
 
 {
-  krebs.per-user.makefu.packages = with pkgs; [
-    steam
+  imports = [
+    ./steam.nix
+  ];
+  users.users.makefu.packages = with pkgs; [
     games-user-env
   ];
 }
diff --git a/makefu/2configs/steam.nix b/makefu/2configs/tools/steam.nix
index d4ec84abf..dbe51270d 100644
--- a/makefu/2configs/steam.nix
+++ b/makefu/2configs/tools/steam.nix
@@ -1,6 +1,10 @@
 {pkgs, ...}:
 {
-  environment.systemPackages = [ pkgs.steam ];
+  environment.systemPackages = [ 
+    (pkgs.steam.override {
+      newStdcpp = true;
+    })
+  ];
   hardware.opengl.driSupport32Bit = true;
   hardware.pulseaudio.support32Bit = true;
 }
diff --git a/makefu/2configs/virtualisation/docker.nix b/makefu/2configs/virtualisation/docker.nix
index ddef9e371..951bdbf26 100644
--- a/makefu/2configs/virtualisation/docker.nix
+++ b/makefu/2configs/virtualisation/docker.nix
@@ -1,8 +1,9 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 {
   virtualisation.docker.enable = true;
   environment.systemPackages = with pkgs;[
     docker
     docker_compose
   ];
+  users.extraUsers.${config.krebs.build.user.name}.extraGroups = [ "docker" ];
 }
diff --git a/makefu/2configs/vncserver.nix b/makefu/2configs/vncserver.nix
index 3d1d9fe75..e62a3f748 100644
--- a/makefu/2configs/vncserver.nix
+++ b/makefu/2configs/vncserver.nix
@@ -33,7 +33,7 @@ in {
       serviceConfig = {
         User = "nobody";
         ExecStart = "${pkgs.novnc}/bin/launch-novnc.sh --listen ${toString web_port} --vnc localhost:${toString vnc_port}";
-				PrivateTmp = true;
+        PrivateTmp = true;
       };
     };
   };