diff --git a/etcnixos/common.nix b/etcnixos/common.nix
index 9b8a60f..d445614 100644
--- a/etcnixos/common.nix
+++ b/etcnixos/common.nix
@@ -13,6 +13,7 @@
     ./declarative-nm.nix
     ./distrobox.nix
     ./vm.nix
+    ./steam.nix
 
     inputs.agenix.nixosModules.default
     inputs.nixos-hardware.nixosModules.common-pc-ssd
@@ -27,15 +28,6 @@
     ];
   };
 
-  nixpkgs.config.allowUnfreePredicate =
-    pkg:
-    builtins.elem (lib.getName pkg) [
-      "steam"
-      "steam-original"
-      "steam-unwrapped"
-      "steam-run"
-    ];
-
   nix = {
     # optimize the store
     optimise.automatic = true;
@@ -203,12 +195,6 @@
     enableSSHSupport = false;
   };
 
-  programs.steam = {
-    enable = true;
-    localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
-    extraCompatPackages = with pkgs; [ proton-ge-bin ];
-  };
-
   # System packages
   environment.systemPackages = with pkgs; [
     # mullvad-vpn
diff --git a/etcnixos/steam.nix b/etcnixos/steam.nix
new file mode 100644
index 0000000..60b7edf
--- /dev/null
+++ b/etcnixos/steam.nix
@@ -0,0 +1,27 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+{
+
+  nixpkgs.config.allowUnfreePredicate =
+    pkg:
+    builtins.elem (lib.getName pkg) [
+      "steam"
+      "steam-original"
+      "steam-unwrapped"
+      "steam-run"
+    ];
+
+  programs.steam = {
+    enable = true;
+    localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
+    extraCompatPackages = with pkgs; [ proton-ge-bin ];
+  };
+
+  environment.systemPackages = with pkgs; [
+    steamtinkerlaunch
+  ];
+}
diff --git a/home-manager/flake.lock b/home-manager/flake.lock
index 56985cb..4db8ad1 100644
--- a/home-manager/flake.lock
+++ b/home-manager/flake.lock
@@ -54,11 +54,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741914680,
-        "narHash": "sha256-Vu4DIZvgfWMzhUyxbHUrJaQb5232S5vuwxQ2sBcBVHk=",
+        "lastModified": 1741955947,
+        "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "30cce6848a5aa41ceb5fb33185b84868cc3e9bef",
+        "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4",
         "type": "github"
       },
       "original": {
@@ -79,11 +79,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1741915514,
-        "narHash": "sha256-zpXOsXAk1x823REV4KRDetvWQp9ymRt79Avh9GVAQDo=",
+        "lastModified": 1741945905,
+        "narHash": "sha256-4rDjlQmeMrcJOZx4Crcnj/8C02dvO9y6AexM2UOZbH8=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "0c97d9ef5031198ed85bd0ce8ec75eaec7527927",
+        "rev": "caef77a524e2e86ef578b83688a99a373bb9fc2c",
         "type": "github"
       },
       "original": {
@@ -112,11 +112,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1741891147,
-        "narHash": "sha256-hCD/llnO/I0ARk6divzVG3a82nNgrcG58dIe0yhzNo8=",
+        "lastModified": 1741941540,
+        "narHash": "sha256-e3j+pdOUy4ZcjxUmlTNTOwKeQE1e2n1RQNvPA1g5nV0=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "ee0e2c7f1b4edae42d2f1b05466adbdffe156e61",
+        "rev": "b4922086ce298bb3d7806437c6dbea4a86f52c38",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/gui.nix b/home-manager/gui.nix
index 863b6c3..216ffa0 100644
--- a/home-manager/gui.nix
+++ b/home-manager/gui.nix
@@ -9,7 +9,7 @@
     ./no-gui.nix
     ./progs/alacritty.nix
     ./progs/gpt4all/gpt4all.nix
-    ./progs/trezor.nix
+    # ./progs/trezor.nix # - broken
   ];
 
   nixpkgs.config.allowUnfreePredicate =
@@ -50,7 +50,7 @@
       foliate
 
       #audio mixer (pavucontrol but for pipewire)
-      pwvucontrol
+      # pwvucontrol # - broken
 
       #minecraft launcher
       prismlauncher
@@ -121,6 +121,10 @@
       blender
 
       ghidra-bin
+
+      # for mod organizer 2
+      zenity
+      p7zip
     ]
     ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts));