diff --git a/flake.lock b/flake.lock
index ae43949..e68fcd4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1654593855,
-        "narHash": "sha256-c+SyXvj7THre87OyIdZfRVR+HhI/g1ZDrQ3VUtTuHkU=",
+        "lastModified": 1654682581,
+        "narHash": "sha256-Jb1PQCwKgwdNAp907eR5zPzuxV+kRroA3UIxUxCMJ9s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "033bd4fa9a8fbe0c68a88e925d9a884161044b25",
+        "rev": "e0169d7a9d324afebf5679551407756c77af8930",
         "type": "github"
       },
       "original": {
diff --git a/hosts/microwave/configuration.nix b/hosts/microwave/configuration.nix
index 53464da..e3a629c 100644
--- a/hosts/microwave/configuration.nix
+++ b/hosts/microwave/configuration.nix
@@ -34,7 +34,7 @@
   services.fstrim.enable = true;
 
   boot = {
-    supportedFilesystems = ["btrfs"];
+    supportedFilesystems = [ "btrfs" ];
 
     # use systemd boot by default
     loader = {
@@ -62,8 +62,16 @@
   # Users
   users.users.grue = {
     createHome = true;
-    extraGroups = [ "wheel" "networkmanager" "wireshark" "video"
-                    "libvirtd" "plugdev" "dialout" "bluetooth" ];
+    extraGroups = [
+      "wheel"
+      "networkmanager"
+      "wireshark"
+      "video"
+      "libvirtd"
+      "plugdev"
+      "dialout"
+      "bluetooth"
+    ];
     group = "users";
     home = "/home/grue";
     isNormalUser = true;
@@ -75,6 +83,8 @@
     package = pkgs.wireshark;
   };
 
+
+  programs.steam.enable = true;
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/hosts/microwave/hardware-configuration.nix b/hosts/microwave/hardware-configuration.nix
index 13aefaa..0870699 100644
--- a/hosts/microwave/hardware-configuration.nix
+++ b/hosts/microwave/hardware-configuration.nix
@@ -5,7 +5,8 @@
 
 {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
@@ -14,7 +15,8 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa";
+    {
+      device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa";
       fsType = "btrfs";
       options = [ "subvol=root" "noatime" "compress=zstd" ];
     };
@@ -22,26 +24,30 @@
   boot.initrd.luks.devices."nixos-crypt".device = "/dev/disk/by-uuid/dbee4082-85ae-40f0-9c80-034f3574688f";
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/4B02-CE16";
+    {
+      device = "/dev/disk/by-uuid/4B02-CE16";
       fsType = "vfat";
     };
 
   fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa";
+    {
+      device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa";
       fsType = "btrfs";
-      options = [ "subvol=home"  "noatime" "compress=zstd" ];
+      options = [ "subvol=home" "noatime" "compress=zstd" ];
     };
 
   fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa";
+    {
+      device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa";
       fsType = "btrfs";
-      options = [ "subvol=nix"  "noatime" "compress=zstd" ];
+      options = [ "subvol=nix" "noatime" "compress=zstd" ];
     };
 
   fileSystems."/tmp" =
-    { device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa";
+    {
+      device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa";
       fsType = "btrfs";
-      options = [ "subvol=tmp"  "noatime" "compress=zstd" ];
+      options = [ "subvol=tmp" "noatime" "compress=zstd" ];
     };
 
   # The global useDHCP flag is deprecated, therefore explicitly set to false here.
diff --git a/modules/basic-tools.nix b/modules/basic-tools.nix
index 1500f82..e42d162 100644
--- a/modules/basic-tools.nix
+++ b/modules/basic-tools.nix
@@ -62,8 +62,8 @@
     ls = "exa";
     ll = "exa -l";
     l = "exa -al";
-    ssh="TERM=xterm-256color ssh";
-    mutt="neomutt";
+    ssh = "TERM=xterm-256color ssh";
+    mutt = "neomutt";
   };
 
   users.defaultUserShell = pkgs.zsh;
@@ -75,10 +75,10 @@
       bindkey -e
     '';
     promptInit = ''
-      source /run/current-system/sw/share/zsh/plugins/liquidprompt/liquidprompt
-if [[ -n "$IN_NIX_SHELL" ]]; then
-	prompt_tag "(nix-shell)"
-fi
+            source /run/current-system/sw/share/zsh/plugins/liquidprompt/liquidprompt
+      if [[ -n "$IN_NIX_SHELL" ]]; then
+        prompt_tag "(nix-shell)"
+      fi
     '';
   };
 
diff --git a/modules/binary-caches.nix b/modules/binary-caches.nix
index 7b6a5bd..373e653 100644
--- a/modules/binary-caches.nix
+++ b/modules/binary-caches.nix
@@ -1,5 +1,9 @@
 { pkgs, lib, ... }: {
   nix = {
+    extraOptions = ''
+      builders-use-substitutes = true
+    '';
+
     registry.microvm = {
       from = {
         type = "indirect";
diff --git a/modules/chromium.nix b/modules/chromium.nix
index 412ec59..dd3ac49 100644
--- a/modules/chromium.nix
+++ b/modules/chromium.nix
@@ -1,4 +1,4 @@
-{config, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [
diff --git a/modules/dvb-dump-nfs-automount.nix b/modules/dvb-dump-nfs-automount.nix
index 9032402..2dce2ea 100644
--- a/modules/dvb-dump-nfs-automount.nix
+++ b/modules/dvb-dump-nfs-automount.nix
@@ -16,7 +16,7 @@
   systemd.automounts = [{
     wantedBy = [ "multi-user.target" ];
     requires = [ "wg-quick-wg-dvb.service" ];
-    automountConfig= {
+    automountConfig = {
       TimeoutIdleSec = "600";
     };
     where = "/mnt/dvb";
diff --git a/modules/entertainment.nix b/modules/entertainment.nix
new file mode 100644
index 0000000..92d3e93
--- /dev/null
+++ b/modules/entertainment.nix
@@ -0,0 +1,3 @@
+{ pkgs, ... }
+{
+}
diff --git a/modules/graphical.nix b/modules/graphical.nix
index 729cb1d..9c86493 100644
--- a/modules/graphical.nix
+++ b/modules/graphical.nix
@@ -80,8 +80,8 @@
     zeroconf.discovery.enable = true;
     extraClientConf = ''
       autospawn=yes
-      '';
-    };
+    '';
+  };
 
   services.pipewire = {
     enable = true;
@@ -133,5 +133,11 @@
   programs.bash.vteIntegration = true;
   services.upower.enable = true;
 
+  services.udisks2.enable = true;
+  environment.shellAliases = {
+    mnt = "udisksctl mount -b";
+    umnt = "udisksctl unmount -b";
+  };
+
   qt5.platformTheme = "gnome";
 }
diff --git a/modules/tlp.nix b/modules/tlp.nix
index 4310e74..2a498ab 100644
--- a/modules/tlp.nix
+++ b/modules/tlp.nix
@@ -3,10 +3,10 @@
 {
   powerManagement.cpuFreqGovernor = null;
   services.power-profiles-daemon.enable = false;
-  services.tlp ={
+  services.tlp = {
     enable = true;
     settings = {
-      USB_BLACKLIST="1d50:604b 1d50:6089 1d50:cc15 1fc9:000c";
+      USB_BLACKLIST = "1d50:604b 1d50:6089 1d50:cc15 1fc9:000c";
     };
   };
 }
diff --git a/modules/wireguard.nix b/modules/wireguard.nix
index d989570..17be0d0 100644
--- a/modules/wireguard.nix
+++ b/modules/wireguard.nix
@@ -3,8 +3,8 @@
 {
   networking.wg-quick.interfaces = {
     wg-zw = {
-      privateKeyFile=config.sops.secrets."wg/wg-zw-seckey".path;
-      address = ["172.20.76.226" ];
+      privateKeyFile = config.sops.secrets."wg/wg-zw-seckey".path;
+      address = [ "172.20.76.226" ];
       dns = [ "172.20.73.8" ];
       peers = [
         {
@@ -15,7 +15,7 @@
       ];
     };
     wg-dvb = {
-      privateKeyFile=config.sops.secrets."wg/wg-dvb-seckey".path;
+      privateKeyFile = config.sops.secrets."wg/wg-dvb-seckey".path;
       address = [ "10.13.37.3/32" ];
 
       peers = [
@@ -29,11 +29,11 @@
     };
 
     mlwd-nl = {
-      privateKeyFile=config.sops.secrets."wg/mlwd-nl-seckey".path;
+      privateKeyFile = config.sops.secrets."wg/mlwd-nl-seckey".path;
       address = [ "10.65.79.164/32" "fc00:bbbb:bbbb:bb01::2:4fa3/128" ];
       dns = [ "193.138.218.74" ];
 
-      peers = [ {
+      peers = [{
         publicKey = "StMPmol1+QQQQCJyAkm7t+l/QYTKe5CzXUhw0I6VX14=";
         allowedIPs = [ "0.0.0.0/0" "::0/0" ];
         endpoint = "92.60.40.194:51820";