From 51cf9ead8b5df9c2c5dbb47b27f8e28a10a25c89 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Thu, 25 May 2023 08:46:45 +0100
Subject: [PATCH] Move device definitions into single file

---
 syncthing/devices/H0615.nix      |  3 ---
 syncthing/devices/default.nix    | 16 ++++++++--------
 syncthing/devices/ion.nix        |  3 ---
 syncthing/devices/monarch.nix    |  3 ---
 syncthing/devices/northstar.nix  |  3 ---
 syncthing/devices/remarkable.nix |  3 ---
 syncthing/devices/vanguard.nix   |  3 ---
 syncthing/folders/default.nix    |  2 +-
 8 files changed, 9 insertions(+), 27 deletions(-)
 delete mode 100644 syncthing/devices/H0615.nix
 delete mode 100644 syncthing/devices/ion.nix
 delete mode 100644 syncthing/devices/monarch.nix
 delete mode 100644 syncthing/devices/northstar.nix
 delete mode 100644 syncthing/devices/remarkable.nix
 delete mode 100644 syncthing/devices/vanguard.nix

diff --git a/syncthing/devices/H0615.nix b/syncthing/devices/H0615.nix
deleted file mode 100644
index 911a8d9d..00000000
--- a/syncthing/devices/H0615.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{...}: {
-  services.syncthing.settings.devices."H0615" = {id = "VVKKUT6-DMNEJ6J-ZI2QREG-SOLG7S5-V2V6WN3-UCQH2EN-6S2XXLS-FKN6KQF";};
-}
diff --git a/syncthing/devices/default.nix b/syncthing/devices/default.nix
index 412f6fc7..9e591ec4 100644
--- a/syncthing/devices/default.nix
+++ b/syncthing/devices/default.nix
@@ -1,10 +1,10 @@
 {...}: {
-  imports = [
-    ./H0615.nix
-    ./ion.nix
-    ./monarch.nix
-    ./northstar.nix
-    ./remarkable.nix
-    ./vanguard.nix
-  ];
+  services.syncthing.devices = {
+    "H0615".id = "VVKKUT6-DMNEJ6J-ZI2QREG-SOLG7S5-V2V6WN3-UCQH2EN-6S2XXLS-FKN6KQF";
+    "ion".id = "7DD4NPH-6T2ET5A-4FCLFWW-CS6UR2W-IO5XQXC-DM5B2Q4-6X7DGU2-UKKVEAB";
+    "monarch".id = "CJSUZQY-67XBLEZ-VKVHQHI-BLEUZNF-G4237AV-AW44CGH-F3JDKXU-CWT3RQZ";
+    "northstar".id = "DMQZNMB-BM3SSE4-5XV2GHE-IDRNFTS-QNZSICS-6JWHUCV-O3NHMWY-2OBC2QD";
+    "remarkable".id = "GHB6JKS-JOA3HHP-TYHB3IJ-GLV26QW-RWRZAMG-XYFGFB6-QLUHDSH-GNPZVAO";
+    "vanguard".id = "YNGBLJP-TWY6Y3C-DPPYAWL-3ZQFNQH-RDPIU5T-L54UI62-FPPA3JQ-WYXBZQZ";
+  };
 }
diff --git a/syncthing/devices/ion.nix b/syncthing/devices/ion.nix
deleted file mode 100644
index f0f90942..00000000
--- a/syncthing/devices/ion.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{...}: {
-  services.syncthing.settings.devices."ion" = {id = "7DD4NPH-6T2ET5A-4FCLFWW-CS6UR2W-IO5XQXC-DM5B2Q4-6X7DGU2-UKKVEAB";};
-}
diff --git a/syncthing/devices/monarch.nix b/syncthing/devices/monarch.nix
deleted file mode 100644
index 643fe585..00000000
--- a/syncthing/devices/monarch.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{...}: {
-  services.syncthing.settings.devices."monarch" = {id = "CJSUZQY-67XBLEZ-VKVHQHI-BLEUZNF-G4237AV-AW44CGH-F3JDKXU-CWT3RQZ";};
-}
diff --git a/syncthing/devices/northstar.nix b/syncthing/devices/northstar.nix
deleted file mode 100644
index ec5afc60..00000000
--- a/syncthing/devices/northstar.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{...}: {
-  services.syncthing.settings.devices."northstar" = {id = "DMQZNMB-BM3SSE4-5XV2GHE-IDRNFTS-QNZSICS-6JWHUCV-O3NHMWY-2OBC2QD";};
-}
diff --git a/syncthing/devices/remarkable.nix b/syncthing/devices/remarkable.nix
deleted file mode 100644
index 1ad70f34..00000000
--- a/syncthing/devices/remarkable.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{...}: {
-  services.syncthing.settings.devices."remarkable" = {id = "GHB6JKS-JOA3HHP-TYHB3IJ-GLV26QW-RWRZAMG-XYFGFB6-QLUHDSH-GNPZVAO";};
-}
diff --git a/syncthing/devices/vanguard.nix b/syncthing/devices/vanguard.nix
deleted file mode 100644
index a8e8ced3..00000000
--- a/syncthing/devices/vanguard.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{...}: {
-  services.syncthing.settings.devices."vanguard" = {id = "YNGBLJP-TWY6Y3C-DPPYAWL-3ZQFNQH-RDPIU5T-L54UI62-FPPA3JQ-WYXBZQZ";};
-}
diff --git a/syncthing/folders/default.nix b/syncthing/folders/default.nix
index 077b9869..cf87efa6 100644
--- a/syncthing/folders/default.nix
+++ b/syncthing/folders/default.nix
@@ -1,5 +1,5 @@
 {lib, ...}: {
-  services.syncthing.settings.folders = {
+  services.syncthing.folders = {
     "Archive" = {
       label = "Archive";
       id = "hwnqy-xzcdx";