From 7339260277093c4083e4381c4b570bbff3a89e89 Mon Sep 17 00:00:00 2001
From: joy <mail@joygnu.org>
Date: Fri, 8 Nov 2024 13:50:09 +0100
Subject: [PATCH] norisk update

---
 modules/games/default.nix          |  1 -
 modules/games/emulator/default.nix | 35 +++++++++++++++++++++++---
 modules/games/norisk/default.nix   | 14 +++++------
 modules/games/suyu/default.nix     | 40 ------------------------------
 4 files changed, 39 insertions(+), 51 deletions(-)
 delete mode 100644 modules/games/suyu/default.nix

diff --git a/modules/games/default.nix b/modules/games/default.nix
index dc62757..ebd4ace 100644
--- a/modules/games/default.nix
+++ b/modules/games/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
-    ./suyu
     ./norisk
     ./steam
     ./emulator
diff --git a/modules/games/emulator/default.nix b/modules/games/emulator/default.nix
index 7875d44..9ec168f 100644
--- a/modules/games/emulator/default.nix
+++ b/modules/games/emulator/default.nix
@@ -3,10 +3,39 @@
   lib,
   config,
   ...
-}: {
+}: let
+  customPkgs =
+    pkgs
+    // {
+      suyu = pkgs.appimageTools.wrapType1 {
+        name = "suyu";
+        version = "0.0.3";
+
+        src = pkgs.fetchurl {
+          url = "https://git.suyu.dev/suyu/suyu/releases/download/v0.0.3/Suyu-Linux_x86_64.AppImage";
+          hash = "sha256-26sWhTvB6K1i/K3fmwYg5pDIUi+7xs3dz8yVj5q7H0c=";
+        };
+      };
+    };
+in {
   config = lib.mkIf config.games.enable {
-    environment.systemPackages = with pkgs; [
-      cemu
+    environment.systemPackages = [
+      # pkgs.cemu
+      customPkgs.suyu
     ];
+
+    home-manager.users.joy.xdg = {
+      desktopEntries = {
+        suyu = {
+          name = "Suyu";
+          exec = "suyu";
+          icon = "suyu";
+          terminal = false;
+          type = "Application";
+          categories = ["Game" "Emulator"];
+          mimeType = ["text/plain"];
+        };
+      };
+    };
   };
 }
diff --git a/modules/games/norisk/default.nix b/modules/games/norisk/default.nix
index 41bd7aa..e45a364 100644
--- a/modules/games/norisk/default.nix
+++ b/modules/games/norisk/default.nix
@@ -9,16 +9,16 @@
     // {
       noriskclient = pkgs.appimageTools.wrapType1 {
         name = "noriskclient";
-        version = "0.5.10";
+        version = "0.5.11";
 
         src = pkgs.fetchurl {
-          url = "https://github.com/NoRiskClient/noriskclient-launcher/releases/download/v0.5.10/NoRiskClient-Linux.AppImage";
-          hash = "sha256-y5kXP3kEW0UsV04JBeJCvSOuJf3/zo5s7ZigOpxbwkk=";
+          url = "https://github.com/NoRiskClient/noriskclient-launcher/releases/download/v0.5.11/NoRiskClient-Linux.AppImage";
+          hash = "sha256-Y0TSMQkJhpEgOgPbJwEK3vW85qYnnj69bRp5V7lhd/Q=";
         };
       };
     };
-  logourl = "https://raw.githubusercontent.com/NoRiskClient/noriskclient-launcher/refs/heads/main/src/images/norisk_logo.png";
-  logsha256 = "sha256-VwWwShUrT055mcabS8QTqqb8INgRB/08U2qEEIVYHlg=";
+  iconurl = "https://raw.githubusercontent.com/NoRiskClient/noriskclient-launcher/refs/heads/main/src/images/norisk_logo.png";
+  iconsha256 = "sha256-VwWwShUrT055mcabS8QTqqb8INgRB/08U2qEEIVYHlg=";
 in {
   config = lib.mkIf config.games.enable {
     environment.systemPackages = [
@@ -31,8 +31,8 @@ in {
           name = "NoRisk Client";
           exec = "noriskclient";
           icon = pkgs.fetchurl {
-            url = logourl;
-            sha256 = logsha256;
+            url = iconurl;
+            sha256 = iconsha256;
           };
           terminal = false;
           type = "Application";
diff --git a/modules/games/suyu/default.nix b/modules/games/suyu/default.nix
deleted file mode 100644
index df31bda..0000000
--- a/modules/games/suyu/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: let
-  customPkgs =
-    pkgs
-    // {
-      suyu = pkgs.appimageTools.wrapType1 {
-        name = "suyu";
-        version = "0.0.3";
-
-        src = pkgs.fetchurl {
-          url = "https://git.suyu.dev/suyu/suyu/releases/download/v0.0.3/Suyu-Linux_x86_64.AppImage";
-          hash = "sha256-26sWhTvB6K1i/K3fmwYg5pDIUi+7xs3dz8yVj5q7H0c=";
-        };
-      };
-    };
-in {
-  config = lib.mkIf config.games.enable {
-    environment.systemPackages = [
-      customPkgs.suyu
-    ];
-
-    home-manager.users.joy.xdg = {
-      desktopEntries = {
-        suyu = {
-          name = "Suyu";
-          exec = "suyu";
-          icon = "suyu";
-          terminal = false;
-          type = "Application";
-          categories = ["Game" "Emulator"];
-          mimeType = ["text/plain"];
-        };
-      };
-    };
-  };
-}