From 0a79c2c3121787dc95fbcaf9e40c224118d71371 Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Wed, 14 Aug 2024 22:40:13 +0900
Subject: [PATCH] Remove Logseq

---
 nixos/common/services/syncthing.nix       |  2 +-
 nixos/containers/rdesktop/default.nix     |  1 -
 nixos/containers/rdesktop/syncthing.nix   | 15 ----------
 nixos/hosts/nixos-desktop/syncthing.nix   | 35 ++++++++++------------
 nixos/hosts/nixos-framework/syncthing.nix | 36 ++++++++++-------------
 5 files changed, 31 insertions(+), 58 deletions(-)
 delete mode 100644 nixos/containers/rdesktop/syncthing.nix

diff --git a/nixos/common/services/syncthing.nix b/nixos/common/services/syncthing.nix
index 75e2fec0..61f5a365 100644
--- a/nixos/common/services/syncthing.nix
+++ b/nixos/common/services/syncthing.nix
@@ -12,7 +12,7 @@
   };
 
   networking.firewall.interfaces.tailscale0 = {
-    allowedTCPPorts = [ 8384 22000 ];
+    allowedTCPPorts = [ 8384 22000  ];
     allowedUDPPorts = [ 22000 21027 ];
   };
 
diff --git a/nixos/containers/rdesktop/default.nix b/nixos/containers/rdesktop/default.nix
index cfa87909..64db39f3 100644
--- a/nixos/containers/rdesktop/default.nix
+++ b/nixos/containers/rdesktop/default.nix
@@ -7,7 +7,6 @@
     ../../common/services/gnupg-agent.nix
     ../../common/software/cli/clean-hm.nix
     ../../common/services/tailscale-autoconnect.nix
-    ./syncthing.nix
   ];
 
   hardware.pulseaudio.extraModules = [ pkgs.pulseaudio-module-xrdp ];
diff --git a/nixos/containers/rdesktop/syncthing.nix b/nixos/containers/rdesktop/syncthing.nix
deleted file mode 100644
index 1226dc1c..00000000
--- a/nixos/containers/rdesktop/syncthing.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ username, ... }: {
-    imports = [ ../../common/services/syncthing.nix ];
-
-    services.syncthing = {
-        settings = {
-            folders = {
-                "logseq" = {
-                  id = "logseq";
-                  path = "/home/${username}/.logseq";
-                  devices = [ "framework-server" "nixos-desktop" "nixos-framework" "rdesktop" "google-pixel-8" ];
-                };
-            };
-        };
-    };
-}
diff --git a/nixos/hosts/nixos-desktop/syncthing.nix b/nixos/hosts/nixos-desktop/syncthing.nix
index 67eb7b29..42d9aa2f 100644
--- a/nixos/hosts/nixos-desktop/syncthing.nix
+++ b/nixos/hosts/nixos-desktop/syncthing.nix
@@ -1,25 +1,20 @@
 { username, ... }: {
-    imports = [ ../../common/services/syncthing.nix ];
+  imports = [ ../../common/services/syncthing.nix ];
 
-    services.syncthing = {
-        settings = {
-            folders = {
-               "kenshi-saves" = {
-                  id = "kenshi";
-                  path = "/home/${username}/.steam/steam/steamapps/compatdata/233860/pfx/drive_c/users/steamuser/AppData/Local/kenshi/";
-                  devices = [  "framework-server" "nixos-desktop" "nixos-framework" ];
-                };
-                "world-of-warcraft" = {
-                  id = "ergcw-ay6yg";
-                  path = "/home/${username}/Games/battlenet/drive_c/Program Files (x86)/World of Warcraft/";
-                  devices = [  "framework-server" "nixos-desktop" "nixos-framework" ];
-                };
-                "logseq" = {
-                  id = "logseq";
-                  path = "/home/${username}/.logseq";
-                  devices = [  "framework-server" "nixos-desktop" "nixos-framework" "rdesktop" "google-pixel-8" ];
-                };
-            };
+  services.syncthing = {
+    settings = {
+      folders = {
+         "kenshi-saves" = {
+          id = "kenshi";
+          path = "/home/${username}/.steam/steam/steamapps/compatdata/233860/pfx/drive_c/users/steamuser/AppData/Local/kenshi/";
+          devices = [  "framework-server" "nixos-desktop" "nixos-framework" ];
         };
+        "world-of-warcraft" = {
+          id = "ergcw-ay6yg";
+          path = "/home/${username}/Games/battlenet/drive_c/Program Files (x86)/World of Warcraft/";
+          devices = [  "framework-server" "nixos-desktop" "nixos-framework" ];
+        };
+      };
     };
+  };
 }
diff --git a/nixos/hosts/nixos-framework/syncthing.nix b/nixos/hosts/nixos-framework/syncthing.nix
index 67eb7b29..f84caefd 100644
--- a/nixos/hosts/nixos-framework/syncthing.nix
+++ b/nixos/hosts/nixos-framework/syncthing.nix
@@ -1,25 +1,19 @@
 { username, ... }: {
-    imports = [ ../../common/services/syncthing.nix ];
-
-    services.syncthing = {
-        settings = {
-            folders = {
-               "kenshi-saves" = {
-                  id = "kenshi";
-                  path = "/home/${username}/.steam/steam/steamapps/compatdata/233860/pfx/drive_c/users/steamuser/AppData/Local/kenshi/";
-                  devices = [  "framework-server" "nixos-desktop" "nixos-framework" ];
-                };
-                "world-of-warcraft" = {
-                  id = "ergcw-ay6yg";
-                  path = "/home/${username}/Games/battlenet/drive_c/Program Files (x86)/World of Warcraft/";
-                  devices = [  "framework-server" "nixos-desktop" "nixos-framework" ];
-                };
-                "logseq" = {
-                  id = "logseq";
-                  path = "/home/${username}/.logseq";
-                  devices = [  "framework-server" "nixos-desktop" "nixos-framework" "rdesktop" "google-pixel-8" ];
-                };
-            };
+  imports = [ ../../common/services/syncthing.nix ];
+  services.syncthing = {
+    settings = {
+      folders = {
+         "kenshi-saves" = {
+          id = "kenshi";
+          path = "/home/${username}/.steam/steam/steamapps/compatdata/233860/pfx/drive_c/users/steamuser/AppData/Local/kenshi/";
+          devices = [  "framework-server" "nixos-desktop" "nixos-framework" ];
         };
+        "world-of-warcraft" = {
+          id = "ergcw-ay6yg";
+          path = "/home/${username}/Games/battlenet/drive_c/Program Files (x86)/World of Warcraft/";
+          devices = [  "framework-server" "nixos-desktop" "nixos-framework" ];
+        };
+      };
     };
+  };
 }