From ca7dd48db3b25b911b77317ea95c3f0a71a26093 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Tue, 3 Oct 2023 00:36:14 +0200
Subject: [PATCH 1/3] Gaming: restructure role

---
 roles/gaming/default.nix                 | 5 ++---
 roles/gaming/programs/default.nix        | 9 +++++++++
 roles/gaming/{ => programs}/mangohud.nix | 0
 roles/gaming/{ => programs}/rpcs3.nix    | 0
 roles/gaming/{ => programs}/steam.nix    | 0
 roles/gaming/services/default.nix        | 5 +++++
 6 files changed, 16 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 roles/gaming/default.nix
 create mode 100755 roles/gaming/programs/default.nix
 rename roles/gaming/{ => programs}/mangohud.nix (100%)
 rename roles/gaming/{ => programs}/rpcs3.nix (100%)
 rename roles/gaming/{ => programs}/steam.nix (100%)
 create mode 100644 roles/gaming/services/default.nix

diff --git a/roles/gaming/default.nix b/roles/gaming/default.nix
old mode 100755
new mode 100644
index dc70b10..cccac83
--- a/roles/gaming/default.nix
+++ b/roles/gaming/default.nix
@@ -2,8 +2,7 @@
 
 {
 	imports = [
-		./steam.nix
-		./mangohud.nix
-		./rpcs3.nix
+		./programs
+		./services
 	];
 }
diff --git a/roles/gaming/programs/default.nix b/roles/gaming/programs/default.nix
new file mode 100755
index 0000000..dc70b10
--- /dev/null
+++ b/roles/gaming/programs/default.nix
@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+	imports = [
+		./steam.nix
+		./mangohud.nix
+		./rpcs3.nix
+	];
+}
diff --git a/roles/gaming/mangohud.nix b/roles/gaming/programs/mangohud.nix
similarity index 100%
rename from roles/gaming/mangohud.nix
rename to roles/gaming/programs/mangohud.nix
diff --git a/roles/gaming/rpcs3.nix b/roles/gaming/programs/rpcs3.nix
similarity index 100%
rename from roles/gaming/rpcs3.nix
rename to roles/gaming/programs/rpcs3.nix
diff --git a/roles/gaming/steam.nix b/roles/gaming/programs/steam.nix
similarity index 100%
rename from roles/gaming/steam.nix
rename to roles/gaming/programs/steam.nix
diff --git a/roles/gaming/services/default.nix b/roles/gaming/services/default.nix
new file mode 100644
index 0000000..d8147ea
--- /dev/null
+++ b/roles/gaming/services/default.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+
+}

From 5fc18d212f5307cf8a056ff91de3c9d7a5bd541d Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Tue, 3 Oct 2023 01:39:13 +0200
Subject: [PATCH 2/3] Gaming: configure syncthiing

---
 roles/gaming/services/default.nix   |  4 +++-
 roles/gaming/services/syncthing.nix | 21 +++++++++++++++++++++
 roles/server/syncthing.nix          |  6 ++++++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 roles/gaming/services/syncthing.nix

diff --git a/roles/gaming/services/default.nix b/roles/gaming/services/default.nix
index d8147ea..69a706a 100644
--- a/roles/gaming/services/default.nix
+++ b/roles/gaming/services/default.nix
@@ -1,5 +1,7 @@
 { ... }:
 
 {
-
+	imports = [
+		./syncthing.nix
+	];
 }
diff --git a/roles/gaming/services/syncthing.nix b/roles/gaming/services/syncthing.nix
new file mode 100644
index 0000000..d275d88
--- /dev/null
+++ b/roles/gaming/services/syncthing.nix
@@ -0,0 +1,21 @@
+{ config, ... }:
+
+{
+	/*
+	This file will sync saves for games that don't have cloud saves
+	TODO: turn this into a module eventually
+	*/
+
+	services.syncthing.folders = {
+		"steam-201810" = {
+			label = "Wolfenstein The New Order Saves";
+			id = "laxxf-t2wmy";
+			devices = [ "steamdeck" "server" "pc" ];
+			path = "~/.local/share/Steam/steamapps/compatdata/201810/pfx/drive_c/users/steamuser/Saved Games/MachineGames/Wolfenstein The New Order/";
+		};
+	};
+	home-manager.users.toast.home.file."steam-201810-ignore" = {
+		target = ".local/share/Steam/steamapps/compatdata/201810/pfx/drive_c/users/steamuser/Saved Games/MachineGames/Wolfenstein The New Order/.stignore";
+		text = "base/qconsole.log\nbase/wolfConfig.cfg";
+	};
+}
diff --git a/roles/server/syncthing.nix b/roles/server/syncthing.nix
index 8e0cc71..2f3ca48 100755
--- a/roles/server/syncthing.nix
+++ b/roles/server/syncthing.nix
@@ -21,6 +21,12 @@
 				devices = [ "steamdeck" "server" ];
 				path = "${config.services.syncthing.dataDir}/school-things";
 			};
+			"steam-201810" = {
+				label = "Wolfenstein The New Order Saves";
+				id = "laxxf-t2wmy";
+				devices = [ "steamdeck" "server" "pc" ];
+				path = "${config.services.syncthing.dataDir}/steam-201810";
+			};
 		};
 	};
 	systemd.services.syncthing.serviceConfig = {

From 3ecf51580d0c30fcda93c809b445ba43944293d6 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Tue, 3 Oct 2023 01:40:07 +0200
Subject: [PATCH 3/3] Server: make Everest share school-things folder with
 Archie

---
 roles/server/syncthing.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/server/syncthing.nix b/roles/server/syncthing.nix
index 2f3ca48..9c84f89 100755
--- a/roles/server/syncthing.nix
+++ b/roles/server/syncthing.nix
@@ -18,7 +18,7 @@
 			"school-things" = {
 				label = "School things";
 				id = "z6alc-nfoqr";
-				devices = [ "steamdeck" "server" ];
+				devices = [ "steamdeck" "server" "pc"];
 				path = "${config.services.syncthing.dataDir}/school-things";
 			};
 			"steam-201810" = {