Fix merge conflcut

machines/universeair/configuration.nix

@@ -13,7 +13,7 @@ in
     nixpkgs.config.allowUnfree = true;
     # Auto upgrade nix package and the daemon service.
     services.nix-daemon.enable = true;
-    nix.package = pkgs.nixUnstable;
+    # nix.package = pkgs.nixUnstable;
     nix.settings.auto-optimise-store = false;
 
     users.users.universelaptop = {

machines/universedesktop/programs/games.nix

@@ -1,51 +1,5 @@
-{ lib, config, pkgs, ... }: let
+{ lib, config, pkgs, ... }: {
-  wiiUDownloader = pkgs.stdenv.mkDerivation rec {
+  # For steam
-    pname = "WiiUDownloader";
-    version = "1.32";
-    src = pkgs.fetchFromGitHub {
-      owner = "Xpl0itU";
-      repo = "WiiUDownloader";
-      rev = "v${version}";
-      fetchSubmodules = true;
-      hash = "sha256-R3FiNiK27Q2x5HbHmWw3F4LPJNKz5BAoOyl4fYAEQlc=";
-    };
-    preConfigure = ''
-      cp ${./gtitles.c} src/gtitles.c
-    '';
-    nativeBuildInputs = with pkgs; [
-      cmake
-      pkg-config
-      wrapGAppsHook
-    ];
-    buildInputs = with pkgs; [
-      curl
-      mbedtls
-      gtkmm3
-      pcre2
-      pcre-cpp
-      util-linux
-      libselinux
-      libsepol
-      libthai
-      libdatrie
-      xorg.libXdmcp
-      libxkbcommon
-      libepoxy
-      xorg.libXtst
-    ];
-
-    propagatedBuildInputs = with pkgs; [
-      gsettings-desktop-schemas
-    ];
-
-    installPhase = ''
-      runHook preInstall
-      mkdir -p $out/bin
-      mv * $out/bin
-      runHook postInstall
-    '';
-  };
-in {
   services.flatpak.enable = true;
   programs.steam.enable = true;
   # Game compat
@@ -61,11 +15,5 @@ in {
     
     # PS2 Games
     pcsx2
-
-    # Switch / WiiU Games
-    cemu
-    wiiUDownloader
-    yuzu-early-access
-    ukmm
   ];
 }