curacao/options.nix

@@ -6,6 +6,5 @@
       docker = true;
     };
     extra = true;
-    gaming = true;
   };
 }

full/options.nix

@@ -10,6 +10,5 @@
       python = true;
     };
     extra = true;
-    gaming = true;
   };
 }

hm/common.nix

@@ -395,7 +395,6 @@ in
       curl
       python3Packages.pip
       rename
-      which
 
       # shell
       zsh-completions

hm/default.nix

@@ -6,7 +6,6 @@
     ./desktop.nix
     ./dev.nix
     ./extra.nix
-    ./gaming
     ./ssh.nix
     ./style.nix
     ./vim.nix

hm/extra.nix

@@ -49,11 +49,18 @@
 
       # downloading
       transmission-qt
-    ] ++ lib.optionals (builtins.currentSystem == "x86_64-linux") [
+
-      # Not sure this works in case of cross-compilation, but couldn't find a
+      # FIXME Below not on aarch64
-      # thing that works in both os and hm context
+      # wine
       wine
       # TODO wine-gecko wine-mono lib32-libpulse (?)
+
+      # gaming
+      # steam # FIXME Requires i686-linux or something. IIRC the package says to use the NixOS config and not it directly.
+      yuzu-mainline
+      minecraft
+      # TODO factorio
+
     ]);
   };
 }

hm/gaming/default.nix

@@ -1,15 +0,0 @@
-{ pkgs, lib, config, ... }:
-{
-  config = lib.mkIf config.frogeye.gaming {
-    # Using config.nixpkgs.<something> creates an infinite recursion,
-    # but the above might not be correct in case of cross-compiling?
-    home.packages = with pkgs; [
-      # gaming
-      yuzu-mainline
-      minecraft
-      # TODO factorio
-
-      steam # Common pitfall: https://github.com/NixOS/nixpkgs/issues/86506#issuecomment-623746883
-    ];
-  };
-}

options.nix

@@ -2,7 +2,6 @@
 {
   options.frogeye = {
     extra = lib.mkEnableOption "Big software";
-    gaming = lib.mkEnableOption "Games";
     desktop = {
       xorg = lib.mkEnableOption "Enable X11 support";
       nixGLIntel = lib.mkEnableOption "Enable nixGLIntel/nixVulkanIntel for windows manager";

os/common.nix

@@ -25,6 +25,7 @@
     wget
     kexec-tools
     openvpn
+    update-resolv-conf # TODO Is it what I think it is?
 
     # android tools
     android-udev-rules
@@ -63,6 +64,9 @@
 
   };
 
+  # FIXME services.openvpn.servers.<name>.updateResolvConf=true
+  # For profiles in the extensions
+
   # TODO Hibernation?
 
   # TEST

os/default.nix

@@ -3,10 +3,9 @@
   imports = [
     ../options.nix
     ./battery.nix
+    ./geoffrey.nix
     ./common.nix
     ./desktop.nix
-    ./gaming
-    ./geoffrey.nix
     ./wireless.nix
     "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/3cb78c93e6a02f494aaf6aeb37481c27a2e2ee22.tar.gz"}/module.nix"
   ];

os/gaming/default.nix

@@ -1,7 +0,0 @@
-{ pkgs, lib, config, ... }:
-{
-  config = lib.mkIf config.frogeye.gaming {
-    programs.steam.enable = true;
-    hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses
-  };
-}

pindakaas/options.nix

@@ -1,6 +1,6 @@
 { ... }:
 {
-  frogeye.extra = true;
+  frogeye.extra = false; # FIXME Not working yet
   frogeye.desktop.xorg = true;
   frogeye.dev.docker = true;
 }