From f5d62b276d85ecdb16d8321da26fb6d8f69e7dfe Mon Sep 17 00:00:00 2001 From: Alexander Heldt Date: Sun, 16 Aug 2026 13:48:10 +0000 Subject: [PATCH] backwards: Remove syncthing, repoint pinwheel folders to manatee --- hosts/backwards/configuration.nix | 1 - hosts/backwards/modules/default.nix | 1 - hosts/backwards/modules/syncthing/default.nix | 109 ------------------ hosts/pinwheel/modules/syncthing/default.nix | 17 +-- secrets/backwards/syncthing-cert.age | Bin 1115 -> 0 bytes secrets/backwards/syncthing-key.age | Bin 609 -> 0 bytes secrets/secrets.nix | 2 - shared-modules/syncthing.nix | 1 - 8 files changed, 2 insertions(+), 129 deletions(-) delete mode 100644 hosts/backwards/modules/syncthing/default.nix delete mode 100644 secrets/backwards/syncthing-cert.age delete mode 100644 secrets/backwards/syncthing-key.age diff --git a/hosts/backwards/configuration.nix b/hosts/backwards/configuration.nix index 0c9084c..35562ae 100644 --- a/hosts/backwards/configuration.nix +++ b/hosts/backwards/configuration.nix @@ -2,7 +2,6 @@ { imports = [ ../../config-manager/default.nix - ../../shared-modules/syncthing.nix ./hardware-configuration.nix ./modules ]; diff --git a/hosts/backwards/modules/default.nix b/hosts/backwards/modules/default.nix index 319e800..5d9236b 100644 --- a/hosts/backwards/modules/default.nix +++ b/hosts/backwards/modules/default.nix @@ -13,7 +13,6 @@ in ssh.enable = true; git.enable = true; nginx.enable = true; - syncthing.enable = true; }; }; } diff --git a/hosts/backwards/modules/syncthing/default.nix b/hosts/backwards/modules/syncthing/default.nix deleted file mode 100644 index 0147611..0000000 --- a/hosts/backwards/modules/syncthing/default.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ lib, config, ... }: -let - enabled = config.mod.syncthing.enable; -in -{ - options = { - mod.syncthing = { - enable = lib.mkEnableOption "Enable syncthing module"; - }; - }; - - config = lib.mkIf enabled { - services.syncthing = { - enable = true; - openDefaultPorts = true; - - cert = config.age.secrets.syncthing-cert.path; - key = config.age.secrets.syncthing-key.path; - - user = "alex"; - group = "users"; - - dataDir = "/home/alex/sync"; - - guiAddress = "0.0.0.0:8384"; - - settings = { - gui = { - user = "syncthing"; - password = "$2a$12$J/h/JOUiW24ZXsLYLEl2kOZUS1LftxANi0OlZxLy8Dst3/jpBd0v2"; - insecureSkipHostcheck = false; - }; - - devices = { - phone.id = config.lib.syncthing.phone; - pinwheel.id = config.lib.syncthing.pinwheel; - tablet.id = config.lib.syncthing.tablet; - }; - - folders = { - org = { - path = "/home/alex/sync/org"; - devices = [ - "phone" - "pinwheel" - ]; - versioning = { - type = "staggered"; - params = { - maxage = "2592000"; # 30 days - }; - }; - }; - - personal = { - path = "/home/alex/sync/personal"; - devices = [ "pinwheel" ]; - versioning = { - type = "staggered"; - params = { - maxAge = "2592000"; # 30 days - }; - }; - }; - - work = { - path = "/home/alex/sync/work"; - devices = [ "pinwheel" ]; - versioning = { - type = "staggered"; - params = { - maxAge = "2592000"; # 30 days - }; - }; - }; - - books = { - path = "/home/alex/sync/reading-material/books"; - devices = [ "pinwheel" ]; - versioning = { - type = "staggered"; - params = { - maxAge = "2592000"; # 30 days - }; - }; - }; - - "phone-gps" = { - path = "/home/alex/sync/phone-gps"; - devices = [ "phone" ]; - versioning = { - type = "staggered"; - params = { - maxage = "2592000"; # 30 days - }; - }; - }; - }; - }; - }; - - age = { - secrets = { - "syncthing-cert".file = ../../../../secrets/backwards/syncthing-cert.age; - "syncthing-key".file = ../../../../secrets/backwards/syncthing-key.age; - }; - }; - }; -} diff --git a/hosts/pinwheel/modules/syncthing/default.nix b/hosts/pinwheel/modules/syncthing/default.nix index 798406c..63d2d2c 100644 --- a/hosts/pinwheel/modules/syncthing/default.nix +++ b/hosts/pinwheel/modules/syncthing/default.nix @@ -15,7 +15,6 @@ settings = { devices = { phone.id = config.lib.syncthing.phone; - backwards.id = config.lib.syncthing.backwards; manatee.id = config.lib.syncthing.manatee; }; @@ -24,7 +23,6 @@ path = "/home/alex/sync/org"; devices = [ "phone" - "backwards" "manatee" ]; versioning = { @@ -37,7 +35,7 @@ personal = { path = "/home/alex/sync/personal"; - devices = [ "backwards" ]; + devices = [ "manatee" ]; versioning = { type = "staggered"; params = { @@ -48,18 +46,7 @@ work = { path = "/home/alex/sync/work"; - devices = [ "backwards" ]; - versioning = { - type = "staggered"; - params = { - maxAge = "2592000"; # 30 days - }; - }; - }; - - books = { - path = "/home/alex/sync/reading-material/books"; - devices = [ "backwards" ]; + devices = [ "manatee" ]; versioning = { type = "staggered"; params = { diff --git a/secrets/backwards/syncthing-cert.age b/secrets/backwards/syncthing-cert.age deleted file mode 100644 index 2808be147c6dbb6cbf784281509e5c48d7d23179..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1115 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+C^hg1PggMTjtue5 z@G>_Kamg%*$V@d&HBB-}%=F1ItI8=XFV8P7sdP&#_boKd3goKF4K1<=F!V3bE-*^e z4lMR_Dlbh=FE=qMDKQK)F|^3c&kk`jEY8bvk3_dkJKrzSBTyl-z{1im&B!~%E59Vq zIl!_aJWbytt0K=R&DF)R)YmW2IVa68yC@^j!-C7yFW4o@s7l)>(Z#VOFWlTT(K*1q zs-P?=$iS^ERNu(cv%)OVJGa2cz?Dl^S69J1!#S%Yv&b~f&(Jm4$RsDQ$|B7$#LV0v zu{_ObM$!d8bQ`sB6+4IE}xFpX^n8@{ivLK)8#*W|} zuY&@`vL*GI&)Gz$vhK4xIJJM}g1a)z`F}1PTpKIScreZ7+IK_aq`XYwO-vWB8sC?w zN}a8k>9H^O-rTaq_yvyi`hD2en8;o&EE@Dmg}yvV{zId|8wf~uPRftL>LU_ zay(lnY9~?}X`CI>;^llil=Y&~muqSVKA$<^`A6npQ2DGx(f_t8XI0KJyWN-jvq`cPP$0vgpzPH@dT|9WDec%IppJN&w~u8S?1 G3giH`{_Fq% diff --git a/secrets/backwards/syncthing-key.age b/secrets/backwards/syncthing-key.age deleted file mode 100644 index 9b23e857cf0bbbc51645711d8a7d2fb4bc83a1f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 609 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+C^hg1PggK33oZ@G zDl#gM@(d{|aB&RD%gW4k_wjZOb~6w2G4m|;3^Dh}O3EwGGvLZ}GIunL%nmk7Pfn^b zuuO``Ne=g}Ob#qawn)iNuP83p_6i8f(GN2;4n((2JKrzSBTykAEvmpE#UiC5#k`=P zI5;RgSHC38A}A;)xHKdxxjZy0tEAj0#iuga(Uq&jteZ|BFDvTH`o+(@r>b9S?*Z6Q1ll%r}p@|P?E?Hdv_3$1y(|Ly#G{P8meyKh1$3=@T z`HgK^PV0A-qpI$A{xjJ!5 tSDe@hnVGRGR%F+zT?)$+@eb5e+j`G_OY!#hhvA1ZqNdkLxSQO(4FE3(@z?+W diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 29cad23..561781f 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -53,8 +53,6 @@ in { "backwards/root.backwards.pub.age".publicKeys = [ backwards alex ]; "backwards/alex.backwards-manatee.age".publicKeys = [ backwards alex ]; "backwards/alex.backwards-manatee.pub.age".publicKeys = [ backwards manatee alex ]; - "backwards/syncthing-cert.age".publicKeys = [ backwards alex ]; - "backwards/syncthing-key.age".publicKeys = [ backwards alex ]; "backwards/alex.backwards-git.ppp.pm.age".publicKeys = [ backwards alex ]; "backwards/alex.backwards-git.ppp.pm.pub.age".publicKeys = [ backwards alex ]; "backwards/wireless-network-secrets.age".publicKeys = [ backwards alex ]; diff --git a/shared-modules/syncthing.nix b/shared-modules/syncthing.nix index 39816a7..c3c898f 100644 --- a/shared-modules/syncthing.nix +++ b/shared-modules/syncthing.nix @@ -4,7 +4,6 @@ phone = "WLDQC7C-EFOW5HM-R3PULLO-ZMADECF-6FK73FD-FRK5NF4-J6UB7DY-7B4DFQR"; pinwheel = "AKS5L2A-NFCG5GV-3U5SSSZ-PLOX6BQ-ZL5ALXI-D7OK4KE-R2JPWRJ-B6AQJQ7"; manatee = "6YDVLXR-NZV6XKD-ASWPZQS-WKBRHAD-52JV5HU-JEPQ32G-6RGY7KJ-OVBO7AM"; - backwards = "XRSQ4NZ-LHCZS6H-R3A75S5-W4FH7F4-3DGA5X2-SOPYWOP-A2WRKGC-IPXH4AM"; tablet = "5BEPSWB-BN4MDZM-7W3ITMP-KJ53J6M-WJMLWEF-GTDJTWI-C4C5SPQ-SFS3DAY"; }; };