updated modules to work for cloud

modules/apps/flatpak.nix

@@ -16,16 +16,6 @@
         }
       ]
       else flatpakRemotes;
-    # packages = [
-    #   "com.github.tchx84.Flatseal"
-    #   "com.slack.Slack"
-    #   "info.beyondallreason.bar"
-    #   "io.dbeaver.DBeaverCommunity"
-    #   "io.openrct2.OpenRCT2"
-    #   "md.obsidian.Obsidian"
-    #   "org.prismlauncher.PrismLauncher"
-    #   "sh.cider.Cider"
-    # ];
     packages = flatpakPackages;
     update = {
       auto = {

modules/apps/gaming.nix

@@ -71,15 +71,10 @@ in {
       };
 
       wine = {
-        enable = lib.mkOption {
-          type = lib.types.bool;
-          default = true;
-          description = "Enable Wine support for Lutris";
-        };
-
+        enable = lib.mkEnableOption "Enable Wine support for Lutris";
         package = lib.mkOption {
           type = lib.types.package;
-          default = pkgs.wineWow;
+          default = pkgs.wine-staging;
           description = "Wine package to use with Lutris";
         };
       };
@@ -107,10 +102,10 @@ in {
       };
     };
 
-    minecraft = lib.mkOption {
+    minecraft = {
       enable = lib.mkEnableOption "Minecraft in the form of PrismLauncher, a tool for launching Minecraft";
     };
-    ffxiv = lib.mkOption {
+    ffxiv = {
       enable = lib.mkEnableOption "Final Fantasy XIV and it's accompanied (unofficial) launcher";
     };
   };
@@ -145,36 +140,20 @@ in {
     };
 
     environment.systemPackages =
-      lib.mkIf cfg.lutris.enable (
-        # Base Lutris package
-        [cfg.lutris.package]
-        ++
-        # Wine packages if enabled
+      (lib.optionals cfg.lutris.enable (
+        [cfg.lutris.package] ++
         (lib.optionals cfg.lutris.wine.enable [
           cfg.lutris.wine.package
           pkgs.winetricks
-        ])
-        ++
-        # Proton and compatibility tools
+        ]) ++
         (lib.optionals cfg.lutris.compatibility.protonSupport [
-          pkgs.proton-ge-custom
-        ])
-        ++
-        # Extra compatibility tools
-        cfg.lutris.compatibility.extraTools
-        ++
-        # User-specified extra packages
+          pkgs.protonup-ng
+          pkgs.protonup-qt
+        ]) ++
+        cfg.lutris.compatibility.extraTools ++
         cfg.lutris.extraPackages
-      )
-      lib.mkIf
-      cfg.minecraft.enable [pkgs.prismlauncher]
-      lib.mkIf
-      cfg.ffxiv.enable [pkgs.xivlauncher];
-
-    # Wine configuration
-    programs.wine = lib.mkIf (cfg.lutris.enable && cfg.lutris.wine.enable) {
-      enable = true;
-      package = cfg.lutris.wine.package;
-    };
+      )) ++
+      (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++
+      (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher]);
   };
 }