diff --git a/hosts/nixos/eple/configuration.nix b/hosts/nixos/eple/configuration.nix index d5b3dff..931453c 100644 --- a/hosts/nixos/eple/configuration.nix +++ b/hosts/nixos/eple/configuration.nix @@ -18,6 +18,7 @@ ../../../users/pbsds ../../../users/bartvbl + ../../../users/pbsds/syncthing.nix ../../../profiles/mounts/panorama-zfs.nix ../../../profiles/shell.nix diff --git a/profiles/mounts/panorama-zfs.nix b/profiles/mounts/panorama-zfs.nix index c4bda4f..b190c64 100644 --- a/profiles/mounts/panorama-zfs.nix +++ b/profiles/mounts/panorama-zfs.nix @@ -10,6 +10,8 @@ systemd.services.zfs-mount.enable = true; boot.zfs.extraPools = [ "Panorama" ]; # import on boot + services.syncthing.dataDir = "/mnt/panorama/Syncthing/pbsds"; + # todo: tailscale nfs mount # TODO: zrepl pull diff --git a/users/pbsds/syncthing.nix b/users/pbsds/syncthing.nix index 445c24f..506e0d6 100644 --- a/users/pbsds/syncthing.nix +++ b/users/pbsds/syncthing.nix @@ -14,10 +14,11 @@ ]; services.syncthing = { - enable = true; + enable = !config.virtualisation.isVmVariant; user = lib.mkDefault "pbsds"; group = lib.mkDefault "pbsds"; + # overridden in for example panorama-zfs.nix dataDir = lib.mkDefault (config.users.users.pbsds.home + "/syncthing"); overrideDevices = true; # overrides devices from WebUI @@ -25,6 +26,7 @@ settings = { options.urAccepted = -1; # disable telemetry + #guiAddress = "127.0.0.1:8384"; # TODO: nox # TODO: eple @@ -41,6 +43,7 @@ devices."rocm".id = "UFW6V4E-LMEDTYR-23BU6BP-2HEMWYB-2ARCJ4X-T67WHZX-BNCCHZ4-5GPSZQV"; devices."sopp".id = "ZQJEWAX-GALDJDO-FBOE5ON-M5XKXNT-PRZD3CY-S7L3XDR-PR27NYL-RZ6O7QW"; devices."nord".id = "C6N5NVA-AXCQ23G-4D4U3A6-WLNXCRC-PBE3PLB-P4SATUU-PSB2MN2-WOZPHAL"; + devices."eple".id = "FJSR2G5-PEXVNU5-OTTKGLG-Z4P3TFO-ELTCV5Z-EMP3HEH-VPREJUH-U2EMAAE"; /* devices."bjarte".autoAcceptFolders = true; # TODO */ folders = lib.flip lib.pipe [ @@ -51,15 +54,15 @@ lib.mkMerge ] { /* "ntnu".ignorePerms = false; # `false` means sync file permissions */ - "DCIM".devices = [ "pjudduzen" "bjarte" "sopp" ]; - "ntnu".devices = [ "bjarte" "sopp" "rocm" ]; - "mihon".devices = [ "pjudduzen" "bjarte" "nord" ]; - "ewesticker".devices = [ "pjudduzen" "bjarte" "sopp" "rocm" "nord" ]; - "pjudduzen-clover".devices = [ "pjudduzen" "sopp" ]; - "pjudduzen-movies".devices = [ "pjudduzen" "sopp" ]; - "pjudduzen-music".devices = [ "pjudduzen" "sopp" ]; - "pjudduzen-pictures".devices = [ "pjudduzen" "sopp" "bjarte" ]; - "pjudduzen-snapchat".devices = [ "pjudduzen" "sopp" ]; + "DCIM".devices = [ "eple" "pjudduzen" "bjarte" "sopp" ]; + "ntnu".devices = [ "eple" "bjarte" "sopp" "rocm" ]; + "mihon".devices = [ "eple" "pjudduzen" "bjarte" "nord" ]; + "ewesticker".devices = [ "eple" "pjudduzen" "bjarte" "sopp" "rocm" "nord" ]; + "pjudduzen-clover".devices = [ "eple" "pjudduzen" "sopp" ]; + "pjudduzen-movies".devices = [ "eple" "pjudduzen" "sopp" ]; + "pjudduzen-music".devices = [ "eple" "pjudduzen" "sopp" ]; + "pjudduzen-pictures".devices = [ "eple" "pjudduzen" "sopp" "bjarte" ]; + "pjudduzen-snapchat".devices = [ "eple" "pjudduzen" "sopp" ]; /* "foobar".type = "receiveencrypted"; */ };