Fix rpcs3 config.

nix/configuration/hosts/quark/default.nix

@@ -13,6 +13,7 @@
     ./wifi.nix
   ];
 
+  config = {
     # Generate with `head -c4 /dev/urandom | od -A none -t x4`
     networking.hostId = "47ee7d7c";
 
@@ -49,6 +50,9 @@
     # Enable TRIM
     # services.fstrim.enable = lib.mkDefault true;
 
+    # RPCS3 has difficulty with znver5
+    me.rpcs3.config.Core."Use LLVM CPU" = "znver4";
+
     me.alacritty.enable = true;
     me.ansible.enable = true;
     me.ares.enable = true;
@@ -105,4 +109,5 @@
     me.sm64ex.enable = true;
     me.shipwright.enable = true;
     me.ship2harkinian.enable = true;
+  };
 }

nix/configuration/roles/rpcs3/default.nix

@@ -6,12 +6,8 @@
 }:
 
 let
-  rpcs3_config_yaml = (
+  rpcs3_config_yaml = settingsFormat.generate "config.yml" config.me.rpcs3.config;
-    pkgs.writeTextFile {
+  settingsFormat = pkgs.formats.yaml { };
-      name = "config.yml";
-      text = lib.generators.toYAML { } config.me.rpcs3.config;
-    }
-  );
 in
 {
   imports = [ ];
@@ -24,9 +20,13 @@ in
       description = "Whether we want to install rpcs3.";
     };
 
-    rpcs3.config = lib.mkOption {
+    rpcs3.config = lib.mkOption rec {
-      type = lib.types.nullOr lib.types.attrs;
+      apply = lib.recursiveUpdate default;
+      inherit (settingsFormat) type;
       default = {
+        Core = {
+          "Use LLVM CPU" = lib.mkIf (config.me.optimizations.enable) config.me.optimizations.arch;
+        };
         VFS = {
           "Enable /host_root/" = false;
         };
@@ -70,9 +70,6 @@ in
           }
         ];
 
-        me.rpcs3.config.Core."Use LLVM CPU" =
-          lib.mkIf (config.me.optimizations.enable) config.me.optimizations.arch;
-
         home-manager.users.talexander =
           { pkgs, ... }:
           {
@@ -84,8 +81,6 @@ in
             };
           };
 
-        # TODO?: .config/rpcs3/GuiConfigs/CurrentSettings.ini
-
         environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
           hideMounts = true;
           users.talexander = {