config

commit 1d8eaabf78aefaa2ef0d51b720249dc8f3dc7f29 (tree)
parent 80b1aaaac30bf0ab8e3f2dbbf1d5a7433bd3ff40
Author: Motiejus Jakštys <motiejus@jakstys.lt>
Date:   Tue, 24 Oct 2023 22:07:51 +0300

syncthing: M-V

Diffstat:
M
hosts/fwminex/configuration.nix
 | 
15
---------------
M
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
@@ -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
@@ -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;