diff --git a/nixos/components/network/tinc/retiolum.nix b/nixos/components/network/tinc/retiolum.nix deleted file mode 100644 index 1636e01..0000000 --- a/nixos/components/network/tinc/retiolum.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ config, pkgs, lib, retiolum, ... }: -{ - - # nix-shell -p tinc_pre --run "tinc --config . generate-keys 4096" - module.cluster.services.tinc."retiolum" = { - networkSubnet = "10.243.0.0/16"; - port = 720; - extraConfig = '' - LocalDiscovery = yes - AutoConnect = yes - ''; - privateEd25519KeyFile = toString config.sops.secrets.tinc_retiolum_ed25519_key.path; - privateRsaKeyFile = toString config.sops.secrets.tinc_retiolum_rsa_key.path; - hosts = { - pepe = { - tincIp = "10.243.23.1"; - publicKey = lib.fileContents ../../../assets/tinc/retiolum/host_file; - }; - sterni = { - tincIp = "10.243.23.3"; - publicKey = lib.fileContents ../../../assets/tinc/retiolum/host_file; - }; - }; - }; - - networking.extraHosts = builtins.readFile (toString "${retiolum}/etc.hosts"); - systemd.services."tinc.retiolum" = { - preStart = '' - cp -R ${retiolum}/hosts /etc/tinc/retiolum/ || true - ''; - }; - -} - diff --git a/nixos/machines/pepe/mqtt.nix b/nixos/machines/pepe/mqtt.nix index 6da92bd..97e3848 100644 --- a/nixos/machines/pepe/mqtt.nix +++ b/nixos/machines/pepe/mqtt.nix @@ -9,4 +9,6 @@ }]; }; + networking.firewall.allowedTCPPorts = [ 1883 ]; + } diff --git a/nixos/machines/robi/syncthing.nix b/nixos/machines/robi/syncthing.nix index cc0a17e..f4658d9 100644 --- a/nixos/machines/robi/syncthing.nix +++ b/nixos/machines/robi/syncthing.nix @@ -11,8 +11,8 @@ services.syncthing = { enable = true; openDefaultPorts = false; - dataDir = "/media/syncthing"; - configDir = "/media/syncthing"; + dataDir = "/media/syncthing/config"; + configDir = "/media/syncthing/config"; overrideDevices = true; overrideFolders = true; cert = toString config.sops.secrets.syncthing_cert.path; diff --git a/nixos/machines/sterni/packages.nix b/nixos/machines/sterni/packages.nix index cd6813e..6fd1fb2 100644 --- a/nixos/machines/sterni/packages.nix +++ b/nixos/machines/sterni/packages.nix @@ -12,6 +12,7 @@ let "https://${user}:${password}@nextcloud.ingolf-wagner.de" ''; + in { environment.systemPackages = with pkgs; [ @@ -58,6 +59,14 @@ in darktable #blender + mosquitto + (pkgs.writers.writeBashBin "mqtt-tail" '' + ${pkgs.mosquitto}/bin/mosquitto_sub -v \ + -h pepe.private \ + -u homeassistant \ + -P password \ + -t "#" + '') # rust development environment rustup