From c2d4d6f8642d1a3053974f6ddd9ace8078c95349 Mon Sep 17 00:00:00 2001
From: Skylar Hill <stellarskylark@posteo.net>
Date: Tue, 14 Nov 2023 10:23:36 -0600
Subject: [PATCH] Move syncthing service to system config

Apparently home-syncthing-service-type is busted...
---
 home/sanderson-home.scm | 27 +++++++++++++--------------
 sanderson.scm           |  8 ++++++--
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/home/sanderson-home.scm b/home/sanderson-home.scm
index 123041a..6c9abda 100644
--- a/home/sanderson-home.scm
+++ b/home/sanderson-home.scm
@@ -12,18 +12,18 @@
 
 (define cataclysm-dda-xdg
   (package
-	(inherit cataclysm-dda)
-	(name "cataclysm-dda-xdg")
-	(arguments
-	 (list
-	  #:make-flags
-	  #~(list (string-append "PREFIX=" #$output)
-			  "USE_XDG_DIR=1" "DYNAMIC_LINKING=1" "RELEASE=1"
-			  "LOCALIZE=1" "LANGUAGES=all")
-	  #:phases
-	  #~(modify-phases %standard-phases
-		  (delete 'configure))
-	  #:tests? #f))))
+   (inherit cataclysm-dda)
+   (name "cataclysm-dda-xdg")
+   (arguments
+	(list
+	 #:make-flags
+	 #~(list (string-append "PREFIX=" #$output)
+			 "USE_XDG_DIR=1" "DYNAMIC_LINKING=1" "RELEASE=1"
+			 "LOCALIZE=1" "LANGUAGES=all")
+	 #:phases
+	 #~(modify-phases %standard-phases
+					  (delete 'configure))
+	 #:tests? #f))))
 
 (home-environment
  ;; Below is the list of packages that will show up in your
@@ -133,5 +133,4 @@
 				   ("waybar" ,(local-file "./waybar" #:recursive? #t))
 				   ("kitty/kitty.conf" ,(local-file "./kitty.conf"))
 				   ("fish" ,(local-file "./fish" #:recursive? #t))
-				   ("rofi/config.rasi" ,(local-file "./rofi"))))
-		(service home-syncthing-service-type))))
+				   ("rofi/config.rasi" ,(local-file "./rofi")))))))
diff --git a/sanderson.scm b/sanderson.scm
index ac7c8ea..10491ab 100644
--- a/sanderson.scm
+++ b/sanderson.scm
@@ -13,7 +13,7 @@
 			 (nongnu packages linux)
 			 (gnu packages shells)
 			 (gnu packages cups))
-(use-service-modules cups desktop networking ssh xorg audio)
+(use-service-modules audio cups desktop networking ssh syncthing xorg)
 
 (operating-system
  (kernel linux)
@@ -54,7 +54,11 @@
 					 (web-interface? #t)
 					 (extensions
 					  (list brlaser cups-filters epson-inkjet-printer-escpr
-							foomatic-filters hplip splix)))))
+							foomatic-filters hplip splix))))
+		   (service syncthing-service-type
+					(syncthing-configuration
+					 (user "skylar")
+					 (home "/home/skylar"))))
 		  
 		  ;; This is the default list of services we
           ;; are appending to.