feat(syncthing): remove music and mundoiu

configs/cloud.nix

@@ -7,22 +7,6 @@
   inherit (import ../lib) tmpfilesConfig;
 in {
   systemd.tmpfiles.rules = map tmpfilesConfig [
-    {
-      type = "L+";
-      user = config.users.users.me.name;
-      group = "users";
-      mode = "0755";
-      argument = "${config.users.users.me.home}/cloud/nextcloud/Uni";
-      path = "${config.users.users.me.home}/uni";
-    }
-    {
-      type = "L+";
-      user = config.users.users.me.name;
-      group = "users";
-      mode = "0755";
-      argument = "${config.users.users.me.home}/cloud/syncthing/zotero/storage";
-      path = "${config.users.users.me.home}/Zotero/storage";
-    }
   ];
 
   services.gnome.gnome-keyring.enable = true;
@@ -109,15 +93,15 @@ in {
     key = config.age.secrets.syncthing-key.path;
     settings = {
       inherit ((import ../lib).syncthing) devices;
-      folders = let
-        cloud-dir = "${config.users.users.me.home}/cloud";
-      in {
-        "${config.users.users.me.home}/sync".devices = ["kabsa" "manakish" "fatteh"];
-        "${config.users.users.me.home}/tmp".devices = ["kabsa" "manakish" "fatteh" "heym"];
-        "${cloud-dir}/syncthing/mundoiu".devices = ["kabsa" "manakish" "heym" "fatteh"];
-        "${cloud-dir}/syncthing/music" = {
-          devices = ["kabsa" "manakish" "heym" "zaatar" "fatteh"];
-          id = "music";
+      folders = {
+        "${config.users.users.me.home}/sync" = {
+          devices = ["kabsa" "manakish" "fatteh"];
+          label = "sync";
+        };
+        "${config.users.users.me.home}/mobile" = {
+          devices = ["kabsa" "manakish" "fatteh" "heym"];
+          id = "mobile";
+          label = "mobile";
         };
       };
     };

configs/fritzbox.nix

@@ -1,15 +1,15 @@
-{ config, ... }:
 {
-  fileSystems."/media/fritzbox" = {
-    device = "//192.168.178.1/FRITZ.NAS";
+  fileSystems."/media/fritz" = {
+    device = "//192.168.178.1/FRITZ.NAS/Backup";
     fsType = "cifs";
     options = [
       "username=ftpuser"
       "password=ftppassword"
+      "guest"
       "noauto"
-      "uid=${toString config.users.users.me.uid}"
-      "gid=${toString config.users.groups.users.gid}"
+      "workgroup=WORKGROUP"
       "rw"
+      "noserverino" # ref https://askubuntu.com/a/1265165
       "nounix"
       "x-systemd.automount"
       "x-systemd.device-timeout=1"

configs/mime.nix

@@ -17,7 +17,6 @@
         "image/jpeg" = "nsxiv.desktop";
         "image/png" = "nsxiv.desktop";
         "image/vnd.djvu+multipage" = "org.pwmt.zathura.desktop";
-        "inode/directory" = "nemo.desktop";
         "text/html" = "firefox.desktop";
         "text/markdown" = "nvim.desktop";
         "text/plain" = "nvim.desktop";

configs/packages.nix

@@ -69,7 +69,7 @@ in {
     dnsutils
     # FILE MANAGERS
     lf
-    cinnamon.nemo
+    pcmanfm
     # MEDIA
     ffmpeg
     imagemagick

lib/default-applications.nix

@@ -1,5 +1,5 @@
 pkgs: rec {
   terminal = "alacritty";
   browser = "${pkgs.firefox}/bin/firefox";
-  fileManager = "${pkgs.cinnamon.nemo}/bin/nemo";
+  fileManager = "${pkgs.pcmanfm}/bin/pcmanfm";
 }

systems/zaatar/configuration.nix

@@ -18,6 +18,7 @@ in {
     ./spotifyd.nix
     # ../../configs/keyboard.nix
     ../../configs/sound.nix
+    ../../configs/fritzbox.nix
     ../../configs/monitoring.nix
     ../../configs/retiolum.nix
     ../../configs/printing.nix

systems/zaatar/mpd.nix

@@ -8,34 +8,12 @@
   inherit (import ../../lib) tmpfilesConfig;
 
   mukkeMountPoint = "/mnt/mukke";
+  fritzboxMountPoint = "/media/fritz";
 
   streams = import ../../lib/streams.nix {
     di-fm-key = "%DI_FM_KEY%"; # TODO lib.strings.fileContents <secrets/di.fm/key>;
   };
-  multi-room-audio-port = 8000;
 in {
-  services.syncthing = let
-    mpd-directory = config.services.mpd.dataDir;
-  in {
-    enable = true;
-    user = config.services.mpd.user; # config.users.extraUsers.moodle.name;
-    openDefaultPorts = true;
-    configDir = "${mpd-directory}/.config/syncthing";
-    dataDir = "${mpd-directory}/.config/syncthing";
-    cert = config.age.secrets.syncthing-cert.path;
-    key = config.age.secrets.syncthing-key.path;
-    settings = {
-      devices = {
-        inherit ((import ../../lib).syncthing.devices) kabsa manakish heym;
-      };
-      folders."${config.services.mpd.musicDirectory}/sync" = {
-        devices = ["heym" "kabsa" "manakish"];
-        id = "music";
-        type = "receiveonly";
-      };
-    };
-  };
-
   users.users.${config.services.mpd.user}.extraGroups = ["pipewire" "audio"];
 
   services.mpd = {
@@ -74,6 +52,14 @@ in {
       path = "${config.services.mpd.musicDirectory}/mukke";
       argument = mukkeMountPoint;
     })
+    (tmpfilesConfig {
+      type = "L+";
+      mode = "0644";
+      user = "mpd";
+      group = "mpd";
+      path = "${config.services.mpd.musicDirectory}/fritz";
+      argument = "${fritzboxMountPoint}";
+    })
   ];
 
   environment.systemPackages = [pkgs.mpc_cli];
@@ -148,8 +134,6 @@ in {
       group = "nginx";
       mode = "400";
     };
-    syncthing-cert.file = ../../secrets/zaatar-syncthing-cert.age;
-    syncthing-key.file = ../../secrets/zaatar-syncthing-key.age;
     di-fm-key.file = ../../secrets/di-fm-key.age;
   };