diff --git a/configs/fritzbox.nix b/configs/fritzbox.nix index 8de75ee..27612c0 100644 --- a/configs/fritzbox.nix +++ b/configs/fritzbox.nix @@ -1,14 +1,12 @@ -{ config, ... }: { fileSystems."/media/fritz" = { - device = "//192.168.178.1/FRITZ.NAS"; + 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 diff --git a/secrets b/secrets index 5df85ac..5405c6e 160000 --- a/secrets +++ b/secrets @@ -1 +1 @@ -Subproject commit 5df85ac31b46e8588a6eff09380817e476ee1964 +Subproject commit 5405c6eb5fe0afa91121103621d01eb889738da8 diff --git a/systems/zaatar/configuration.nix b/systems/zaatar/configuration.nix index 98d2b95..1a172af 100644 --- a/systems/zaatar/configuration.nix +++ b/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 diff --git a/systems/zaatar/mpd.nix b/systems/zaatar/mpd.nix index 1efb502..af4da2f 100644 --- a/systems/zaatar/mpd.nix +++ b/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 ; }; - 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; };