From 9344fcb656ffe9ee250cc5e2ee31f7d5dd0b24af Mon Sep 17 00:00:00 2001
From: Christoph Cullmann <christoph@cullmann.io>
Date: Tue, 1 Apr 2025 21:56:13 +0200
Subject: [PATCH] use sandboxed bottles instead of lutris

---
 README.md         |  1 -
 share/common.nix  |  8 ++------
 share/flatpak.nix |  1 +
 share/users.nix   | 34 ----------------------------------
 4 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/README.md b/README.md
index 5d619dc..7bbc740 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,5 @@ doas dd if=result/iso/nixos-*-x86_64-linux.iso of=/dev/sda bs=4M conv=fsync
 
 ```zsh
 rm /data/home/cullmann/.local/state/nix/profiles/home-manager* /date/home/cullmann/.local/state/home-manager/gcroots/current-home
-rm /data/home/sandbox-games/.local/state/nix/profiles/home-manager* /date/home/sandbox-games/.local/state/home-manager/gcroots/current-home
 rm /data/home/sandbox-kde/.local/state/nix/profiles/home-manager* /date/home/sandbox-kde/.local/state/home-manager/gcroots/current-home
 ```
diff --git a/share/common.nix b/share/common.nix
index 9a498a6..916b6a0 100644
--- a/share/common.nix
+++ b/share/common.nix
@@ -536,11 +536,8 @@ in
     };
   };
 
-  # OpenGL, 32-bit for steam
-  hardware.graphics = {
-    enable = true;
-    enable32Bit = true;
-  };
+  # OpenGL
+  hardware.graphics.enable = true;
 
   # try to ensure we can use our network LaserJet
   services.printing.enable = true;
@@ -596,7 +593,6 @@ in
     { groups = [ "wheel" ]; noPass = false; keepEnv = true; persist = true; }
 
     # wheel users can use sandbox stuff without password
-    { groups = [ "wheel" ]; runAs = "sandbox-games"; noPass = true; }
     { groups = [ "wheel" ]; runAs = "sandbox-kde"; noPass = true; }
   ];
 }
diff --git a/share/flatpak.nix b/share/flatpak.nix
index 40d45ac..83cfccf 100644
--- a/share/flatpak.nix
+++ b/share/flatpak.nix
@@ -6,6 +6,7 @@ let
 
   # all wanted flatpak packages
   desiredFlatpaks = {
+    "com.usebottles.bottles" = "--nofilesystem=xdg-music --nofilesystem=xdg-pictures";
     "com.valvesoftware.Steam" = "--nofilesystem=xdg-music --nofilesystem=xdg-pictures";
     "com.vivaldi.Vivaldi" = "--nofilesystem=xdg-music --nofilesystem=xdg-pictures";
     "io.github.ungoogled_software.ungoogled_chromium" = "--nofilesystem=xdg-music --nofilesystem=xdg-pictures";
diff --git a/share/users.nix b/share/users.nix
index bf2c8c4..2b25809 100644
--- a/share/users.nix
+++ b/share/users.nix
@@ -54,27 +54,6 @@ in
       openssh.authorizedKeys.keys = config.users.users.root.openssh.authorizedKeys.keys;
     };
 
-    #
-    # sandbox for lutris games and Co.
-    #
-    users.sandbox-games = {
-      # home on persistent volume
-      home = "/data/home/sandbox-games";
-
-      # hard code UID for stability over machines
-      # out of range of normal login users
-      uid = 32000;
-
-      # normal user
-      isNormalUser = true;
-
-      # sandbox user
-      description = "Sandbox Games";
-
-      # use fixed auth keys
-      openssh.authorizedKeys.keys = config.users.users.root.openssh.authorizedKeys.keys;
-    };
-
     #
     # sandbox for kde development
     #
@@ -151,19 +130,6 @@ in
       };
     };
 
-    # games user with extra settings
-    users.sandbox-games = {
-      # shared config
-      imports = [ ./home.nix ];
-
-      # install gaming stuff
-      home.packages = with pkgs; [
-        lutris
-        wineWowPackages.stable
-        winetricks
-      ];
-    };
-
     # kde user with extra settings
     users.sandbox-kde = {
       # shared config