From b5414e56953783cd3edb274f31a09f723b6ff7d4 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Wed, 24 Apr 2024 21:53:44 -0400 Subject: [PATCH] moved syncthing from home-manager to nixOS modules syncthing: upated mauville ID syncthing: update lavaridge ID syncthing: update dpetalburg ID --- aly.nix | 2 +- nixosModules/system/default.nix | 1 - nixosModules/user/aly/default.nix | 40 +++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/aly.nix b/aly.nix index 7ff05538..25d129ad 100644 --- a/aly.nix +++ b/aly.nix @@ -30,7 +30,7 @@ ]; alyraffauf = { - services.syncthing.enable = true; + services.syncthing.enable = false; desktop = { hyprland = { enable = true; diff --git a/nixosModules/system/default.nix b/nixosModules/system/default.nix index 1a3718a4..c706dff6 100644 --- a/nixosModules/system/default.nix +++ b/nixosModules/system/default.nix @@ -101,7 +101,6 @@ openFirewall = true; }; printing.enable = true; - syncthing.openDefaultPorts = true; tailscale.enable = true; }; diff --git a/nixosModules/user/aly/default.nix b/nixosModules/user/aly/default.nix index 44a00096..e36a3b8a 100644 --- a/nixosModules/user/aly/default.nix +++ b/nixosModules/user/aly/default.nix @@ -16,5 +16,45 @@ description = "Aly Raffauf"; extraGroups = ["networkmanager" "wheel" "docker" "libvirtd" "video"]; }; + + services.syncthing = { + enable = true; + openDefaultPorts = true; + user = "aly"; + dataDir = "/home/aly"; + settings = { + devices = { + "brawly" = {id = "BBIBWMR-CN4CFC4-2XMPLII-XFWXBT5-EPCZCAF-JOWAX5J-DHIGNM4-O3XQ4Q3";}; # Pixel 6a + "gsgmba" = {id = "V2YCZSL-XY7H72L-FGJFWP2-JNYX72O-OJ5V2HY-V4SSSJM-77A7E3Z-7EJFAAV";}; # Work Macbook Air + "lavaridge" = {id = "6ZHSHTQ-HO7NLK5-JVKGTAN-H7W7KXS-QB5FN2X-CEDETRE-7E6LDHE-U5FYLAS";}; # Framework 13 AMD + "mauville" = {id = "52MTCMC-PKEWSAU-HADMTZU-DY5EKFO-B323P7V-OBXLNTQ-EJY7F7Y-EUWFBQX";}; # Desktop/Homelab + "petalburg" = {id = "E7XBKXN-QGEPQGZ-P6PIYXI-3IHWXRD-VJCFLYP-D3M6ACJ-EDZDQ3D-ZLTEBAC";}; # Yoga 9i + "rustboro" = {id = "MUCZMA2-5K3XVT7-CF5W5MG-WZUG3PU-VAX6ZZY-FCTFPEZ-FNRSCNC-A4W5LAR";}; # Thinkpad t440p + "mossdeep" = {id = "XRIGHMT-54OGBWP-UAAGAJS-LGTRHA2-EMKOMEB-EJEWKZN-GJFK6FO-3O6KQQ4";}; # Steam Deck OLED + "wattson" = {id = "B2EYRQJ-LE2FR2J-D4M35TY-FXVGJ6D-USE7S2T-5V357SV-IQQWEAT-RQBLJQB";}; # Samsung a54 5g + "winona" = {id = "IGAW5SS-WY2QN6J-5TF74YZ-6XPNPTC-RCH3HIT-ZZQKCAI-6L54IS2-SNRIMA2";}; # Pixel Tablet + }; + folders = { + "sync" = { + id = "default"; + path = "/home/aly/sync"; + devices = ["brawly" "gsgmba" "lavaridge" "mauville" "petalburg" "rustboro" "mossdeep" "wattson" "winona"]; + }; + "camera" = { + id = "fcsgh-dlxys"; + path = "/home/aly/pics/camera"; + devices = ["brawly" "lavaridge" "mauville" "petalburg" "rustboro" "wattson" "winona"]; + }; + "music" = { + id = "6nzmu-z9der"; + path = + if config.networking.hostName == "mauville" + then "/mnt/Media/Music" + else "/home/aly/music"; + devices = ["lavaridge" "mauville" "petalburg" "rustboro" "wattson"]; + }; + }; + }; + }; }; }