updated modules to work for cloud

modules/machine/cloud/configuration.nix

@@ -1,17 +1,32 @@
 {
   config,
+  lib,
   pkgs,
   userName,
   ...
-}: {
+}:
+  let flatpakPackages = [
+    "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"
+  ];
+in {
   imports = [
-    ../../apps/flatpak.nix
+    (import ../../apps/flatpak.nix {
+      inherit lib pkgs flatpakPackages;
+    })
+    ../../apps/gaming.nix
+    ../../graphics
     ../../pwrMgmt
     ../../sound/pipewire.nix
     ../../sound/shairport.nix
     ../../virtualization/podman.nix
     ../../virtualization/hardware.nix
-    (config.nixosModules.gpuHardware {gpuVendor = "amd";})
   ];
 
   # Enable flakes for NixOS
@@ -68,8 +83,15 @@
   # Enable Polkit
   security.polkit.enable = true;
 
+  graphics = {
+    enable = true;
+    gpuVendor = "nvidia"; # or "amd" or "intel"
+    wayland.enable = true;
+    vulkan.enable = true;
+  };
+
   # Gaming module (see ../../apps/gaming.nix)
-  customGaming = {
+  gaming = {
     steam = {
       enable = true;
       firewall = {
@@ -83,13 +105,10 @@
       enable = true;
       wine = {
         enable = true;
-        package = pkgs.wine;
+        package = pkgs.wine-staging;
       };
       compatibility = {
         protonSupport = true;
-        extraTools = with pkgs; [
-          proton-ge-custom
-        ];
       };
       extraPackages = with pkgs; [
         gamemode
@@ -97,17 +116,18 @@
       ];
     };
 
+    ffxiv.enable = true;
     minecraft.enable = true;
   };
 
   # Power management (see ../../pwrMgmt/default.nix)
-  customPowerManagement = {
+  pwrMgmt = {
     enable = true;
     cpuFreqGovernor = "performance";
     powertop.enable = false;
   };
 
-  containers.podman = {
+  podman = {
     enable = true;
     extraPackages = with pkgs; [
       docker-credential-helpers
@@ -119,9 +139,9 @@
     ];
   };
 
-  customNetworking = {
+  networking = {
     firewall.enable = true;
-    networkManager.enable = true;
+    networkmanager.enable = true;
   };
 
   # Enable dconf
@@ -130,6 +150,9 @@
   # Add username to groups "wheel" and "video" - more may be added here later
   users.users.${userName}.extraGroups = ["wheel" "video" "gamemode" "podman" "network"];
 
+  # Flatpak packages (see ../../apps/flatpak.nix)
+  services.flatpak.packages = flatpakPackages;
+
   # XDG stuff
   xdg = {
     portal = {
@@ -150,11 +173,5 @@
     };
   };
 
-  # Firewall stuff not allowed in common user and network creation
-  networking.firewall.enable = true; # VERY important, do not touch
-  networking.firewall.allowedTCPPorts = [];
-  networking.firewall.allowedUDPPorts = [];
-  networking.networkmanager.enable = true; # Linux tool for managing network connections
-
-  system.stateVersion = "24.05";
+  system.stateVersion = "24.11";
 }