Testing

nixos/common/services/syncthing/pictures.nix

@@ -1,8 +1,4 @@
-
-{ 
-  username ? username, 
-  path     ? "/home/${username}/Pictures/RAW"
-}: let
+{ path, ... }: let
   devices = [ 
     "framework13"
     "framework16"
@@ -13,8 +9,8 @@ in {
   services.syncthing = {
     settings = {
       folders = {
-         "Photos" = {
-          id = "photos";
+         "Pictures" = {
+          id = "pictures";
           path = path;
           devices = devices;
         };

nixos/hosts/framework16/default.nix

@@ -1,5 +1,6 @@
-{ hostname, inputs, config, lib, pkgs, modulesPath, ... }: {
+{ hostname, inputs, config, lib, pkgs, modulesPath, username, ... }: {
   imports = [ 
+    ( import ../../common/services/syncthing/pictures.nix { path = "/home/${username}/Pictures/RAW"; })
     inputs.nixos-hardware.nixosModules.framework-16-7040-amd
     (modulesPath + "/installer/scan/not-detected.nix")
     ./disks.nix
@@ -14,7 +15,6 @@
     ../../common/services/ollama.nix
     ../../common/services/forgejo-runner.nix
     ../../common/services/syncthing/default.nix
-    ../../common/services/syncthing/pictures.nix
   ];
 
   nixpkgs.config.rocmSupport = true;

nixos/hosts/nixos-desktop/default.nix

@@ -1,5 +1,6 @@
-{ inputs, config, lib, pkgs, system, ... }: {
+{ inputs, config, lib, pkgs, system, username, ... }: {
   imports = [ 
+    ( import ../../common/services/syncthing/pictures.nix { path = "/home/${username}/Pictures/RAW"; })
     ../../common/modules/secureboot.nix
     # ../../common/modules/yubikey-auth.nix
     # ../../common/modules/boot.nix
@@ -10,7 +11,6 @@
     ../../common/modules/builder.nix
     ../../common/services/geoclue.nix
     ../../common/services/syncthing/default.nix
-    ../../common/services/syncthing/pictures.nix
     ./disks.nix
   ];