diff --git a/flake.nix b/flake.nix
index 82d9457..8fc203b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -291,7 +291,7 @@
 
               ./modules/nixos/pro_audio.nix
               ./modules/nixos/kdeconnect.nix
-              # ./modules/nixos/steam.nix
+              ./modules/nixos/steam.nix
               # ./modules/nixos/minio_local.nix
 
               ./modules/nixos/hyprland.nix
@@ -322,7 +322,9 @@
               inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
               ./instances/odin/hardware-configuration.nix
               ./instances/odin/configuration.nix
+
               ./modules/nixos/server
+              ./modules/nixos/steam.nix
             ] ++ homeManagerUModules ++ [{
               home-manager.users.bertof = import ./instances/odin/hm.nix;
             }];
diff --git a/instances/odin/common_configuration.nix b/instances/odin/common_configuration.nix
index b7429e0..ca9eb82 100644
--- a/instances/odin/common_configuration.nix
+++ b/instances/odin/common_configuration.nix
@@ -329,11 +329,6 @@
   security.pam.services.sddm.enableGnomeKeyring = true;
   security.pam.services.autoUnlockKwallet.enableKwallet = true;
 
-  nixpkgs.config = {
-    allowUnfree = true;
-    packageOverrides = pkgs: { steam = pkgs.steam.override { extraPkgs = pkgs: [ pkgs.icu ]; }; };
-  };
-
   zramSwap.enable = true;
 
   # This value determines the NixOS release from which the default
diff --git a/instances/odin/configuration.nix b/instances/odin/configuration.nix
index acbb8e8..f5a94eb 100644
--- a/instances/odin/configuration.nix
+++ b/instances/odin/configuration.nix
@@ -63,12 +63,7 @@ in
     };
   };
 
-  programs.steam = {
-    enable = true;
-    extest.enable = true;
-    gamescopeSession.enable = true;
-    remotePlay.openFirewall = true;
-  };
+  programs.steam.gamescopeSession.enable = true;
 
   services = {
     avahi = {
diff --git a/instances/sif/configuration.nix b/instances/sif/configuration.nix
index c3fcf3e..260339a 100644
--- a/instances/sif/configuration.nix
+++ b/instances/sif/configuration.nix
@@ -203,21 +203,7 @@
   programs = {
     dconf.enable = true;
     flashrom.enable = true;
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-    steam = {
-      enable = true;
-      package = pkgs.steam.override {
-        extraPkgs = pkgs: [ pkgs.icu ];
-        extraProfile = ''
-          export GSETTINGS_SCHEMA_DIR="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}/glib-2.0/schemas/"
-        '';
-      };
-      extest.enable = true;
-      remotePlay.openFirewall = true;
-    };
+    gnupg.agent = { enable = true; enableSSHSupport = true; };
     zsh.enable = true;
   };
   # services.joycond.enable = true;
@@ -257,6 +243,7 @@
   };
 
   hardware = {
+    opengl.driSupport32Bit = true;
     steam-hardware.enable = true;
     bluetooth = {
       enable = true;
@@ -342,11 +329,6 @@
     };
   };
 
-  nixpkgs.config = {
-    allowUnfree = true;
-    packageOverrides = pkgs: { steam = pkgs.steam.override { extraPkgs = pkgs: [ pkgs.icu ]; }; };
-  };
-
   zramSwap.enable = true;
 
   # This value determines the NixOS release from which the default
diff --git a/instances/thor/configuration.nix b/instances/thor/configuration.nix
index 0ef62a3..ee5086d 100644
--- a/instances/thor/configuration.nix
+++ b/instances/thor/configuration.nix
@@ -80,7 +80,7 @@
     };
     nvidia-container-toolkit.enable = true;
 
-    graphics.enable = true;
+    graphics = { enable = true; enable32Bit = true; };
     bluetooth = {
       enable = true;
       # package = pkgs.bluezFull;
@@ -292,12 +292,6 @@
     # virtualbox.host.enable = true;
   };
 
-  nixpkgs.config = {
-    allowUnfree = true;
-    packageOverrides = pkgs: { steam = pkgs.steam.override { extraPkgs = pkgs: [ pkgs.icu ]; }; };
-    # cudaSupport = true;
-  };
-
   zramSwap.enable = true;
 
   system.stateVersion = "22.11"; # Did you read the comment?
diff --git a/modules/nixos/steam.nix b/modules/nixos/steam.nix
index 00a4098..2d003c8 100644
--- a/modules/nixos/steam.nix
+++ b/modules/nixos/steam.nix
@@ -1,24 +1,44 @@
-{
+{ pkgs, ... }: {
   programs.steam = {
     enable = true;
-    # package = pkgs.steam.override {
-    #   # extraPkgs = pkgs: with pkgs; [ icu ];
-    #   # extraLibraries = pkgs: with pkgs; [ dconf.lib gnome.gvfs icu libdrm ];
-    #   # extraProfile = ''
-    #   #   export GSETTINGS_SCHEMA_DIR="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}/glib-2.0/schemas/"
-    #   # '';
-    # };
-    remotePlay.openFirewall = true; # incorrect values
+
+    package = pkgs.steam.override {
+      # extraLibraries = pkgs: with pkgs; [
+      #   dconf.lib
+      #   gnome.gvfs
+      #   # icu
+      #   # libdrm
+      # ];
+      # extraPkgs = pkgs: with pkgs; [
+      #   # icu
+      # ];
+      # extraProfile = ''
+      #   export GSETTINGS_SCHEMA_DIR="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}/glib-2.0/schemas/"
+      # '';
+    };
+    extraPackages = [
+      pkgs.gamescope
+    ];
+    extraCompatPackages = [
+      pkgs.proton-ge-bin
+    ];
+    remotePlay.openFirewall = true;
     extest.enable = true;
   };
-  networking.firewall = {
-    allowedTCPPorts = [
-      27036
-      27037
-    ];
-    allowedUDPPorts = [
-      27031
-      27036
-    ];
-  };
+
+  fonts.packages = [
+    pkgs.liberation_ttf
+    pkgs.wqy_zenhei
+  ];
+
+  # networking.firewall = {
+  #   allowedTCPPorts = [
+  #     27036
+  #     27037
+  #   ];
+  #   allowedUDPPorts = [
+  #     27031
+  #     27036
+  #   ];
+  # };
 }