From 4ab637311f86b13305a9c1984f2be25f9833fcf2 Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Sun, 4 May 2025 18:42:50 +0200
Subject: [PATCH] delete unused syncthing ids

---
 modules/kernel-testing.nix      |  6 +++---
 modules/services/kavita.nix     |  4 ++--
 modules/services/syncthing.nix  | 22 ++++++----------------
 pkgs/kop-fhcalendar/default.nix |  2 +-
 pkgs/kop-monitor/default.nix    |  2 +-
 5 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/modules/kernel-testing.nix b/modules/kernel-testing.nix
index e5d7f8c..187d59f 100644
--- a/modules/kernel-testing.nix
+++ b/modules/kernel-testing.nix
@@ -74,11 +74,11 @@ let
   };
 
   linux_6_15 = pkgs.buildLinux {
-    version = "6.15.0-rc2";
+    version = "6.15.0-rc4";
     extraMeta.branch = "6.15";
     src = pkgs.fetchzip {
-      url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-6.15-rc2.tar.gz";
-      hash = "sha256-3/GGVyGoLCv4EfG6e+EBM1NO3/FpKthLb8jp6FSVuFE=";
+      url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-6.15-rc4.tar.gz";
+      hash = "sha256-snhFNqDZzlINbZWA8ywEKHcTd+z19SoZQPSuldYJ6H0=";
     };
   };
 in
diff --git a/modules/services/kavita.nix b/modules/services/kavita.nix
index 82e970a..f173fa2 100644
--- a/modules/services/kavita.nix
+++ b/modules/services/kavita.nix
@@ -52,9 +52,9 @@ in {
         user = "kavita";
         package =
           let
-            backend = pkgs.unstable.kavita.backend.overrideAttrs
+            backend = pkgs.kavita.backend.overrideAttrs
               (old: { patches = old.patches ++ [ ./kavita-patches-chapter-parsing.diff ./kavita-page-size.diff ]; });
-            kavitaPatched = pkgs.unstable.kavita.overrideAttrs (old: { backend = backend; });
+            kavitaPatched = pkgs.kavita.overrideAttrs (old: { backend = backend; });
           in
           kavitaPatched;
         settings = {
diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index 4e29296..4fa1d75 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -38,16 +38,6 @@ in {
             addresses = [ "tcp://192.168.0.11" ];
           };
           server = {
-            id =
-              "HZUUQEQ-JOKYHTU-AVFVC3U-7KUAXVC-QY3OJTF-HGU7RZ3-5HA5TOE-VT4FNQB";
-            addresses = [ "tcp://192.168.0.6" "tcp://192.168.2.1" ];
-          };
-          mini-pc = {
-            id =
-              "NKRWOR6-2YNLVY5-GH6TG7T-V3M4VHD-OFS4XR3-Q45CALD-JVSIBKU-JZBGRQ3";
-            addresses = [ "tcp://192.168.0.10" "tcp://192.168.2.1" ];
-          };
-          mini-pc-proxmox = {
             id =
               "FK3DW4B-6Y7C25O-IDBSOMV-GOUSWZW-KQR7ELS-QUKS4UR-AFZXLZE-67QJXAX";
             addresses = [ "tcp://192.168.0.10" "tcp://192.168.2.1" ];
@@ -67,37 +57,37 @@ in {
           id = "default";
           path = "${cfg.basePath}/default";
           devices =
-            [ "kop-pc" "server" "laptop" "mini-pc" "mini-pc-proxmox" "phone" ];
+            [ "kop-pc" "server" "laptop" "phone" ];
           ignorePerms = false;
         };
 
         folders."books" = {
           id = "books";
           path = "${cfg.basePath}/books";
-          devices = [ "kop-pc" "server" "laptop" "mini-pc" "mini-pc-proxmox" ];
+          devices = [ "kop-pc" "server" "laptop" ];
         };
 
         folders."fh" = {
           id = "fh";
           path = "${cfg.basePath}/fh";
-          devices = [ "kop-pc" "server" "laptop" "mini-pc" "mini-pc-proxmox" ];
+          devices = [ "kop-pc" "server" "laptop" ];
         };
 
         folders."work_drive" = {
           id = "work_drive";
           path = "${cfg.basePath}/work_drive";
-          devices = [ "kop-pc" "server" "laptop" "mini-pc" "mini-pc-proxmox" ];
+          devices = [ "kop-pc" "server" "laptop" ];
         };
 
         folders."no_backup" = {
           id = "no_backup";
           path = "${cfg.basePath}/no_backup";
-          devices = [ "kop-pc" "server" "laptop" "mini-pc" "mini-pc-proxmox" ];
+          devices = [ "kop-pc" "server" "laptop" ];
         };
         folders."emu" = {
           id = "emu";
           path = "${cfg.basePath}/emu";
-          devices = [ "kop-pc" "server" "mini-pc" "mini-pc-proxmox" ];
+          devices = [ "kop-pc" "server" ];
         };
       };
     };
diff --git a/pkgs/kop-fhcalendar/default.nix b/pkgs/kop-fhcalendar/default.nix
index 64cc737..9782cbc 100644
--- a/pkgs/kop-fhcalendar/default.nix
+++ b/pkgs/kop-fhcalendar/default.nix
@@ -9,5 +9,5 @@ rustPlatform.buildRustPackage {
     rev = "328b43766fe4fe3b352a23f160de6bc96a3aee58";
   };
 
-  cargoHash = "sha256-qq9ocPtGT5dfCDlqLZWaSuDNxMEDqfNWwvRZi4jOGqc=";
+  cargoHash = "sha256-N6BWKumzKWXmAbg3GxiCS70yRg8i+TrYu6T8u6nuHdY=";
 }
diff --git a/pkgs/kop-monitor/default.nix b/pkgs/kop-monitor/default.nix
index e7c9559..701a450 100644
--- a/pkgs/kop-monitor/default.nix
+++ b/pkgs/kop-monitor/default.nix
@@ -16,5 +16,5 @@ rustPlatform.buildRustPackage {
   nativeBuildInputs = with pkgs; [ pkg-config ];
   buildInputs = with pkgs; [ openssl ];
 
-  cargoHash = "sha256-rJWjX99keDzKs76u3D2aXKWGmBkQ0mF/HWZYHcQtaW0=";
+  cargoHash = "sha256-xQBAFdwYmwEbH14GAHyboBfJu8kuI+7oOUvHe4N++RI=";
 }