restructuring4

home-manager/home.nix

@@ -15,7 +15,6 @@
     ./gtk
     ./shell
     ./firefox
-    ./steam
   ];
 
   nixpkgs = {

home-manager/steam/default.nix

@@ -1,61 +1,23 @@
+{ pkgs, ... }:
 {
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-let
-  steam-with-pkgs = pkgs.steam.override {
-    extraPkgs =
-      pkgs: with pkgs; [
-        xorg.libXcursor
-        xorg.libXi
-        xorg.libXinerama
-        xorg.libXScrnSaver
-        libpng
-        libpulseaudio
-        libvorbis
-        stdenv.cc.cc.lib
-        libkrb5
-        keyutils
-        gamescope
-        mangohud
-      ];
+  programs.steam = {
+    enable = true;
+    package = pkgs.steam.override {
+      extraPkgs =
+        pkgs: with pkgs; [
+          xorg.libXcursor
+          xorg.libXi
+          xorg.libXinerama
+          xorg.libXScrnSaver
+          libpng
+          libpulseaudio
+          libvorbis
+          stdenv.cc.cc.lib
+          libkrb5
+          keyutils
+          gamescope
+          mangohud
+        ];
+    };
   };
-
-  monitor = lib.head (lib.filter (m: m.primary) config.monitors);
-  steam-session =
-    let
-      gamescope = lib.concatStringsSep " " [
-        (lib.getExe pkgs.gamescope)
-        "--output-width ${toString monitor.width}"
-        "--output-height ${toString monitor.height}"
-        "--framerate-limit ${toString monitor.refreshRate}"
-        "--prefer-output ${monitor.name}"
-        "--adaptive-sync"
-        "--expose-wayland"
-        "--steam"
-      ];
-      steam = lib.concatStringsSep " " [
-        "steam"
-        "steam://open/bigpicture"
-      ];
-    in
-    pkgs.writeTextDir "share/wayland-sessions/steam-sesson.desktop" # ini
-
-      ''
-        [Desktop Entry]
-        Name=Steam Session
-        Exec=${gamescope} -- ${steam}
-        Type=Application
-      '';
-in
-{
-  home.packages = [
-    steam-with-pkgs
-    steam-session
-    pkgs.gamescope
-    pkgs.mangohud
-    pkgs.protontricks
-  ];
 }

nixos/configuration.nix

@@ -16,7 +16,7 @@
     # If you want to use modules from other flakes (such as nixos-hardware):
     # inputs.hardware.nixosModules.common-cpu-amd
     # inputs.hardware.nixosModules.common-ssd
-
+    ./steam
     # You can also split up your configuration and import pieces of it here:
     # ./users.nix
     # Import your generated (nixos-generate-config) hardware configuration

nixos/steam/default.nix

@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+{
+  programs.steam = {
+    enable = true;
+    package = pkgs.steam.override {
+      extraPkgs =
+        pkgs: with pkgs; [
+          xorg.libXcursor
+          xorg.libXi
+          xorg.libXinerama
+          xorg.libXScrnSaver
+          libpng
+          libpulseaudio
+          libvorbis
+          stdenv.cc.cc.lib
+          libkrb5
+          keyutils
+          gamescope
+          mangohud
+        ];
+    };
+  };
+}