From 1d8eaabf78aefaa2ef0d51b720249dc8f3dc7f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Tue, 24 Oct 2023 22:07:51 +0300 Subject: [PATCH] syncthing: M-V --- hosts/fwminex/configuration.nix | 15 --------------- modules/services/syncthing/default.nix | 8 ++++++++ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix index 04aa058..a99a7ed 100644 --- a/hosts/fwminex/configuration.nix +++ b/hosts/fwminex/configuration.nix @@ -28,21 +28,6 @@ in { boot.binfmt.emulatedSystems = ["aarch64-linux"]; - boot.loader.grub.extraEntries = '' - menuentry "Debian via bpool label" { - search --set=bpool --label bpool - configfile "$(bpool)/@/BOOT/debian@/grub/grub.cfg" - } - menuentry "Debian 3915eee7610a7d61" { - search --set=root 3915eee7610a7d61 - configfile "/BOOT/debian@/grub/grub.cfg" - } - menuentry "Debian 4113456512205749601" { - search --set=root 4113456512205749601 - configfile "/BOOT/debian@/grub/grub.cfg" - } - ''; - systemd.services.zfs-mount.enable = false; mj = { diff --git a/modules/services/syncthing/default.nix b/modules/services/syncthing/default.nix index 75f07ac..422664f 100644 --- a/modules/services/syncthing/default.nix +++ b/modules/services/syncthing/default.nix @@ -33,6 +33,11 @@ id = "4fu7z-z6es2"; label = "M-Documents"; }; + M-V = { + devices = ["fwminex" "vno1-vinc"]; + id = "oq3ht-a9hnb"; + label = "M-V"; + }; M-Camera = { devices = ["mxp10" "fwminex" "vno1-oh2" "mtwork"]; id = "pixel_xl_dtm3-photos"; @@ -140,6 +145,7 @@ in { vno1-oh2 mxp10 rzj-744P2PE + vno1-vinc ; }) // {}; @@ -151,6 +157,7 @@ in { "/var/www/dl/tel" = www-mxp10; "/var/www/dl/fwminex" = www-fwminex; "/var/www/dl/mykolo" = mykolo; + "${cfg.dataDir}/M-V" = M-V; "${cfg.dataDir}/annex2/Books" = Books; "${cfg.dataDir}/annex2/M-Active" = M-Active; "${cfg.dataDir}/annex2/M-Camera" = M-Camera; @@ -173,6 +180,7 @@ in { "${cfg.dataDir}/Pictures" = Pictures; "${cfg.dataDir}/Music" = Music; "${cfg.dataDir}/M-R" = M-R; + "${cfg.dataDir}/M-V" = M-V; "${cfg.dataDir}/Video" = video-shared; "${cfg.dataDir}/stud-cache" = stud-cache; "${cfg.dataDir}/www" = www-fwminex;