From 75a57fb331edfc85399a09525e7a2421721c1a31 Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Fri, 19 Apr 2024 19:46:29 -0400
Subject: [PATCH] moved syncthing_base.nix

---
 systems/jeeves/configuration.nix                 |  2 +-
 systems/rhapsody-in-green/configuration.nix      |  2 +-
 .../rhapsody-in-green}/syncthing_base.nix        | 16 ----------------
 3 files changed, 2 insertions(+), 18 deletions(-)
 rename {users/richie => systems/rhapsody-in-green}/syncthing_base.nix (61%)

diff --git a/systems/jeeves/configuration.nix b/systems/jeeves/configuration.nix
index cacb083..71293a9 100644
--- a/systems/jeeves/configuration.nix
+++ b/systems/jeeves/configuration.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 {
-  imports = [ ../../users/richie/syncthing_base.nix ];
+  imports = [ ../rhapsody-in-green/syncthing_base.nix ];
 
   networking = {
     hostId = "1beb3027";
diff --git a/systems/rhapsody-in-green/configuration.nix b/systems/rhapsody-in-green/configuration.nix
index dac1507..f1abefa 100644
--- a/systems/rhapsody-in-green/configuration.nix
+++ b/systems/rhapsody-in-green/configuration.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ./hardware.nix
-    ../../users/richie/syncthing_base.nix
+    ./syncthing_base.nix
   ];
 
   boot = {
diff --git a/users/richie/syncthing_base.nix b/systems/rhapsody-in-green/syncthing_base.nix
similarity index 61%
rename from users/richie/syncthing_base.nix
rename to systems/rhapsody-in-green/syncthing_base.nix
index 27c4198..b620118 100644
--- a/users/richie/syncthing_base.nix
+++ b/systems/rhapsody-in-green/syncthing_base.nix
@@ -1,5 +1,3 @@
-{ config, ... }:
-
 {
   services.syncthing = {
     enable = true;
@@ -9,14 +7,6 @@
     dataDir = "/home/richie/Syncthing";
     configDir = "/home/richie/.config/syncthing";
     settings = {
-      gui = {
-        user = "richie";
-        password.from_command = [
-          "/usr/bin/env"
-          "cat"
-          "${config.sops.secrets."syncthing/password".path}"
-        ];
-      };
       devices = {
         phone.id = "LTGPLAE-M4ZDJTM-TZ3DJGY-SLLAVWF-CQDVEVS-RGCS75T-GAPZYK3-KUM6LA5";
         jeeves.id = "7YQ4UEW-OPQEBH4-6YKJH4B-ZCE3SAX-5EIK5JL-WJDIWUA-WA2N3D5-MNK6GAV";
@@ -24,10 +14,4 @@
       };
     };
   };
-  sops = {
-    defaultSopsFile = ./secrets.yaml;
-    secrets = {
-      "syncthing/password".owner = "richie";
-    };
-  };
 }