gaming: move to components, fixe steam xdg home, misc fixes

common/desktop.nix

@@ -1,10 +1,9 @@
 { config, lib, pkgs, ... }:
 
 {
-
   imports = [
-              ./headfull.nix
-              ./graphical.nix
-              ./gaming.nix
-            ];
+    ./headfull.nix
+    ./graphical.nix
+  ];
+  navi.components.headfull.graphical.gaming.enable = true;
 }

common/gaming.nix

@@ -1,32 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  navi.components.hardening = {
-    legacy = true;
-  };
-  hardware.opengl.driSupport32Bit = true;
-  hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
-  hardware.pulseaudio.support32Bit = true;
-  nixpkgs.config.allowUnfree = true;
-
-
-  environment.systemPackages = with pkgs; [
-    steam 
-    (
-      pkgs.writeTextFile {
-        name = "startsteam";
-        destination = "/bin/startsteam";
-        executable = true;
-        text = ''
-          #! ${pkgs.bash}/bin/bash
-
-          # XDG compliance
-          mkdir -p $XDG_DATA_HOME/steam-home
-          HOME=$XDG_DATA_HOME/steam
-          # then start the launcher 
-          exec steam
-        '';
-      }
-      )
-      retroarch
-    ];
-  }

components/headfull/graphical/default.nix

@@ -4,5 +4,6 @@
     ./browser.nix
     ./splash.nix
     ./wm.nix
+    ./gaming.nix
   ];
 }

components/headfull/graphical/gaming.nix

@@ -0,0 +1,46 @@
+{ config, pkgs, lib, ... }:
+with lib;
+let
+  cfg = config.navi.components.headfull.graphical.gaming;
+in
+{
+  options.navi.components.headfull.graphical.gaming = {
+    enable = mkEnableOption "Enable navi's gaming setup";
+    retro = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        This adds various emulators to navi's gaming setup
+      '';
+    };
+  };
+  config = mkIf cfg.enable {
+    # we need to enable x86 if we want to start most games
+    navi.components.hardening = {
+      legacy = true;
+    };
+    hardware.opengl.driSupport32Bit = true;
+    hardware.pulseaudio.support32Bit = true;
+
+    nixpkgs.config.allowUnfree = true;
+
+    environment.systemPackages = with pkgs; [
+      steam
+      (
+        pkgs.writeTextFile {
+          name = "startsteam";
+          destination = "/bin/startsteam";
+          executable = true;
+          text = ''
+            #!${pkgs.bash}/bin/bash
+
+            # XDG compliance
+            mkdir -p $XDG_DATA_HOME/steam-home
+            HOME=$XDG_DATA_HOME/steam-home
+            # then start the launcher
+            exec steam
+          '';
+        }
+      )] ++ optionals cfg.retro [ retroarch pcsx2 ];
+    };
+}

components/macspoofer.nix

@@ -5,7 +5,7 @@ let
 in
 {
   options.navi.components.macspoofer = {
-    enable = mkEnableOption "Force programs to adhere to the XDG base specification";
+    enable = mkEnableOption "Enables navi's MAC address spoofer";
     full_random = mkOption {
       type = types.bool;
       default = false;

components/xdg.nix

@@ -27,7 +27,7 @@ in
       type = types.str;
       default = ".local/share";
       description = ''
-        Value assigned to XDG_CONFIG_HOME minus the HOME
+        Value assigned to XDG_DATA_HOME minus the HOME
       '';
     };
     cache = mkOption {