From c5ce00c6ffbf3be933c28b5c0d34afb987da26c3 Mon Sep 17 00:00:00 2001
From: Mike Vink <ivi@vinkies.net>
Date: Sun, 11 Feb 2024 12:15:06 +0100
Subject: starting to work on syncthing maco

---
 profiles/core/home.nix      | 18 +++++++++---------
 profiles/core/syncthing.nix | 11 ++++++++++-
 2 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'profiles')

diff --git a/profiles/core/home.nix b/profiles/core/home.nix
index 246e73d..7972a75 100644
--- a/profiles/core/home.nix
+++ b/profiles/core/home.nix
@@ -34,15 +34,15 @@
           "x-scheme-handler/msteams"  =  ["teams.desktop"];
         };
       };
-      desktopEntries = optionalAttrs (!machine.isDarwin) {
-        text= { type = "Application"; name = "Text editor"; exec = "${pkgs.st}/bin/st -e kak %u"; };
-        file = { type = "Application"; name = "File Manager"; exec = "${pkgs.st}/bin/st -e lfub %u"; };
-        torrent = { type = "Application"; name = "Torrent"; exec = "${pkgs.coreutils}/bin/env transadd %U"; };
-        img = { type = "Application"; name = "Image Viewer"; exec = "${pkgs.sxiv}/bin/sxiv -a %u"; };
-        video = { type = "Application"; name = "Video Viewer"; exec = "${pkgs.mpv}/bin/mpv -quiet %f"; };
-        mail = { type = "Application"; name = "Mail"; exec = "${pkgs.st}/bin/st -e neomutt %u"; };
-        pdf = { type = "Application"; name = "PDF reader"; exec = "${pkgs.zathura}/bin/zathura %u"; };
-        rss = { type = "Application"; name = "RSS feed addition"; exec = "${pkgs.coreutils}/bin/env rssadd %u"; };
+      desktopEntries = with pkgs; optionalAttrs (!machine.isDarwin) {
+        text= { type = "Application"; name = "Text editor"; exec = "${st}/bin/st -e kak %u"; };
+        file = { type = "Application"; name = "File Manager"; exec = "${st}/bin/st -e lfub %u"; };
+        torrent = { type = "Application"; name = "Torrent"; exec = "${coreutils}/bin/env transadd %U"; };
+        img = { type = "Application"; name = "Image Viewer"; exec = "${sxiv}/bin/sxiv -a %u"; };
+        video = { type = "Application"; name = "Video Viewer"; exec = "${mpv}/bin/mpv -quiet %f"; };
+        mail = { type = "Application"; name = "Mail"; exec = "${st}/bin/st -e neomutt %u"; };
+        pdf = { type = "Application"; name = "PDF reader"; exec = "${zathura}/bin/zathura %u"; };
+        rss = { type = "Application"; name = "RSS feed addition"; exec = "${coreutils}/bin/env rssadd %u"; };
       };
     };
 
diff --git a/profiles/core/syncthing.nix b/profiles/core/syncthing.nix
index ebccdb4..d735cca 100644
--- a/profiles/core/syncthing.nix
+++ b/profiles/core/syncthing.nix
@@ -1,5 +1,14 @@
 {lib,...}: with lib; {
-  hm.services.syncthing = {
+  services.syncthing = {
     enable = true;
+    user = ivi.username;
+    inherit (config.ivi) group;
+    overrideDevices = true;
+    overrideFolders = true;
+
+    devices = mapAttrs (_: m: {
+      inherit (m.syncthing) id;
+      introducer = m.isServer;
+    }) (filterAttrs (_: m: m.syncthing.enable) ivi.machines);
   };
 }
-- 
cgit v1.2.3