From 9218a5b47ac3efa015f398b717399375b40659c7 Mon Sep 17 00:00:00 2001 From: Christoph Schmatzler Date: Thu, 14 Aug 2025 07:57:41 +0200 Subject: [PATCH] up --- hosts/darwin/chidi/default.nix | 7 +++++++ hosts/darwin/jason/default.nix | 7 +++++++ hosts/nixos/tahani/default.nix | 11 +++++++++++ modules/services/syncthing.nix | 12 ++---------- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/hosts/darwin/chidi/default.nix b/hosts/darwin/chidi/default.nix index abf49f4..09d2993 100644 --- a/hosts/darwin/chidi/default.nix +++ b/hosts/darwin/chidi/default.nix @@ -10,6 +10,13 @@ networking.hostName = "chidi"; networking.computerName = "Chidi"; + services.syncthing.settings.folders = { + "Projects/Work" = { + path = "/Users/${user}/Projects/Work"; + devices = ["tahani" "chidi"]; + }; + }; + home-manager.users.${user} = { programs.git.userEmail = "christoph@tuist.dev"; }; diff --git a/hosts/darwin/jason/default.nix b/hosts/darwin/jason/default.nix index 3bfc599..106a6fc 100644 --- a/hosts/darwin/jason/default.nix +++ b/hosts/darwin/jason/default.nix @@ -9,6 +9,13 @@ networking.hostName = "jason"; networking.computerName = "Jason"; + services.syncthing.settings.folders = { + "Projects/Personal" = { + path = "/Users/${user}/Projects/Personal"; + devices = ["tahani" "jason"]; + }; + }; + home-manager.users.${user} = { programs.git.userEmail = "christoph@schmatzler.com"; }; diff --git a/hosts/nixos/tahani/default.nix b/hosts/nixos/tahani/default.nix index ae3f20d..637fa98 100644 --- a/hosts/nixos/tahani/default.nix +++ b/hosts/nixos/tahani/default.nix @@ -100,6 +100,17 @@ enable = true; }; + services.syncthing.settings.folders = { + "Projects/Personal" = { + path = "/home/${user}/Projects/Personal"; + devices = ["tahani" "jason"]; + }; + "Projects/Work" = { + path = "/home/${user}/Projects/Work"; + devices = ["tahani" "chidi"]; + }; + }; + home-manager.users.${user} = { programs.git.userEmail = "christoph@schmatzler.com"; }; diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix index b134933..6156b76 100644 --- a/modules/services/syncthing.nix +++ b/modules/services/syncthing.nix @@ -1,6 +1,7 @@ { user, pkgs, + lib, ... }: let isDarwin = pkgs.stdenv.isDarwin; @@ -33,16 +34,7 @@ in { "jason" = {id = "42II2VO-QYPJG26-ZS3MB2I-AOPVZ67-JJNSE76-U54CO5Y-634A5OG-ECU4YQA";}; "chidi" = {id = "N7W6SUT-QO6J4BE-T3Y65SM-OFGYGNV-TGYBJPX-JVN4Z72-AENZ247-KWXOQA6";}; }; - folders = { - "Projects-Personal" = { - path = "${platformConfig.homeDir}/Projects/Personal"; - devices = ["tahani" "jason"]; - }; - "Projects-Work" = { - path = "${platformConfig.homeDir}/Projects/Work"; - devices = ["tahani" "chidi"]; - }; - }; + options.globalAnnounceEnabled = false; }; };