From ba8d509390066bce082b7a5555e716e25cafb213 Mon Sep 17 00:00:00 2001
From: Seven Of Aces <sevenofaces42@gmail.com>
Date: Mon, 26 Aug 2024 21:33:17 -0700
Subject: [PATCH] 	modified:   hosts/blackstar/nixos/configuration.nix 
 modified:   modules/default.nix    	new file:  
 modules/desktop/apps/emulationstation.nix 	modified:  
 modules/desktop/games.nix

---
 hosts/blackstar/nixos/configuration.nix   |  1 +
 modules/default.nix                       |  1 +
 modules/desktop/apps/emulationstation.nix | 20 ++++++++++++++++++++
 modules/desktop/games.nix                 | 14 +++-----------
 4 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 modules/desktop/apps/emulationstation.nix

diff --git a/hosts/blackstar/nixos/configuration.nix b/hosts/blackstar/nixos/configuration.nix
index 985b330..9ef3584 100644
--- a/hosts/blackstar/nixos/configuration.nix
+++ b/hosts/blackstar/nixos/configuration.nix
@@ -42,6 +42,7 @@
         xiv.enable = true;
         godot.enable = true;
         minecraft.enable = true;
+        emulationstation.enable = true;
       };
     };
     #   system.boot.grub.enable = true;
diff --git a/modules/default.nix b/modules/default.nix
index 2a70406..a0f3911 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -4,6 +4,7 @@
         ./desktop/apps/godot.nix
         ./desktop/apps/xiv.nix
         ./desktop/apps/minecraft.nix
+        ./desktop/apps/emulationstation.nix
 
         ./desktop/cad.nix
         ./desktop/cam.nix
diff --git a/modules/desktop/apps/emulationstation.nix b/modules/desktop/apps/emulationstation.nix
new file mode 100644
index 0000000..0298e14
--- /dev/null
+++ b/modules/desktop/apps/emulationstation.nix
@@ -0,0 +1,20 @@
+/* -------------------------------------------------------------------------- */
+/*                          App config: EmulationStation                      */
+/* -------------------------------------------------------------------------- */
+
+{ lib, config, options, pkgs ? import <nixpkgs>, ... }:
+
+with lib;
+let cfg = config.modules.desktop.apps.emulationstation;
+in {
+  options.modules.desktop.apps.emulationstation = {
+    enable = mkEnableOption false;
+  };
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = with pkgs.unstable; [
+        emulationstation-de
+    ];
+  };
+}
\ No newline at end of file
diff --git a/modules/desktop/games.nix b/modules/desktop/games.nix
index afc2eb7..3e9dd12 100644
--- a/modules/desktop/games.nix
+++ b/modules/desktop/games.nix
@@ -8,17 +8,9 @@ in {
   };
 
   config = mkIf cfg.enable {
-    /* Driver includes support for Huion Kamvas Pro */
-    hardware.opentabletdriver.enable = true;
-
-    environment.systemPackages = with pkgs.unstable; [
-        steam
-        lutris
-        emulationstation-de
-    ];
-
-    permittedInsecurePackages = [
-      "freeimage-unstable-2021-11-01"
+    environment.systemPackages = with pkgs; [
+      steam
+      lutris
     ];
   };
 }
\ No newline at end of file