add steam session, drop steam user

5 files changed, 37 insertions, 35 deletions

diff --git a/machines/common/base.nix b/machines/common/base.nix
index fbef8ae..9ee5dfb 100644
--- a/machines/common/base.nix
+++ b/machines/common/base.nix
@@ -13,10 +13,6 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  programs.steam.enable = true;
-  hardware.steam-hardware.enable = true;
-  programs.gamescope.enable = true;
-  
   time.timeZone = "America/Los_Angeles";
   i18n.defaultLocale = "en_US.UTF-8";
 
diff --git a/machines/common/default.nix b/machines/common/default.nix
index 9af7dc0..1922bad 100644
--- a/machines/common/default.nix
+++ b/machines/common/default.nix
@@ -7,6 +7,7 @@
     ./printer.nix
     ./rip.nix
     ./tailscale.nix
+    ./steam.nix
     ./user.nix
   ];
 }
diff --git a/machines/common/steam.nix b/machines/common/steam.nix
index aa4ad84..0f68ca8 100644
--- a/machines/common/steam.nix
+++ b/machines/common/steam.nix
@@ -1,35 +1,28 @@
-{lib, pkgs, ...}: {
-  users.users.steam = {
-    isNormalUser = true;
-    uid = 1001;
-    home = "/home/steam";
-    extraGroups = [
-      "wheel"
-      "video"
-      "docker"
-      "input"
-      "audio"
-    ];
-  };
+{...}: {
+  programs.steam = {
+    enable = true;
 
-  programs = {
-    gamescope = {
+    gamescopeSession = {
       enable = true;
-      capSysNice = true;
+      args = [
+        "-W"
+        "3840"
+        "-H"
+        "2160"
+        "-f"
+        "-e"
+        "--xwayland-count"
+        "2"
+        "--hdr-enabled"
+        "--hdr-itm-enabled"
+      ];
     };
-    steam.gamescopeSession.enable = true;
   };
-  
-  programs.steam.enable = true;
-  hardware.steam-hardware.enable = true;
 
-  services.greetd = {
+  programs.gamescope = {
     enable = true;
-    settings = {
-      default_session = {
-        command = "${lib.getExe pkgs.gamescope} -W 3840 -H 2160 -f -e --xwayland-count 2 --hdr-enabled --hdr-itm-enabled -- steam -pipewire-dmabuf -gamepadui -steamdeck -steamos3 > /dev/null 2>&1";
-        user = "steam";
-      };
-    };
+    capSysNice = false;
   };
+
+  hardware.steam-hardware.enable = true;
 }
diff --git a/machines/hierophant/configuration.nix b/machines/hierophant/configuration.nix
index 8e04e44..6360204 100644
--- a/machines/hierophant/configuration.nix
+++ b/machines/hierophant/configuration.nix
@@ -12,10 +12,16 @@
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.efi.efiSysMountPoint = "/efi";
+  boot.loader.systemd-boot.xbootldrMountPoint = "/boot";
+  boot.loader.systemd-boot.configurationLimit = 20;
 
   hardware.graphics.enable = true;
   services.xserver.videoDrivers = [ "nvidia" ];
-  hardware.nvidia.open = true;
+  hardware.nvidia = {
+    open = true;
+    modesetting.enable = true;
+  };
 
   services.xserver.displayManager.sessionCommands = ''
     xrandr --output DP-0 --mode 3840x2160 --rate 159.98
@@ -40,8 +46,8 @@
       ];
     };
 
-  networking.hostName = "hierophant"; 
- 
+  networking.hostName = "hierophant";
+
   # This option defines the first version of NixOS you have installed on this particular machine,
   # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
   #
diff --git a/machines/hierophant/hardware-configuration.nix b/machines/hierophant/hardware-configuration.nix
index fec933d..123d29f 100644
--- a/machines/hierophant/hardware-configuration.nix
+++ b/machines/hierophant/hardware-configuration.nix
@@ -18,12 +18,18 @@
       fsType = "ext4";
     };
 
-  fileSystems."/boot" =
+  fileSystems."/efi" =
     { device = "/dev/disk/by-uuid/34EF-0D81";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/12CE-A600";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
   swapDevices = [ ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";