From 8ff56542bcec27663ab4d8e81ca26f7b33d86902 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 14 Jun 2020 11:51:07 +0200 Subject: ma telegraf: add zigbee nodes --- makefu/2configs/stats/telegraf/default.nix | 19 +++++---- makefu/2configs/stats/telegraf/hamstats.nix | 60 ++++++++++++++++++++++------- 2 files changed, 58 insertions(+), 21 deletions(-) (limited to 'makefu/2configs') diff --git a/makefu/2configs/stats/telegraf/default.nix b/makefu/2configs/stats/telegraf/default.nix index c60539c7..5a81e274 100644 --- a/makefu/2configs/stats/telegraf/default.nix +++ b/makefu/2configs/stats/telegraf/default.nix @@ -12,13 +12,18 @@ in { urls = [ url ]; database = "telegraf"; }]; - mqtt = [{ - servers = [ mqtt_server ]; - topic_prefix = "/telegraf"; - data_format = "json"; - qos = 0; - batch = false; - }]; + #file = [{ # debugging + # files = [ "stdout" ]; + # data_format = "influx"; + #}]; + + #mqtt = [{ + # servers = [ mqtt_server ]; + # topic_prefix = "/telegraf"; + # data_format = "json"; + # qos = 0; + # batch = false; + #}]; }; }; }; diff --git a/makefu/2configs/stats/telegraf/hamstats.nix b/makefu/2configs/stats/telegraf/hamstats.nix index 88c1b6d5..0b172306 100644 --- a/makefu/2configs/stats/telegraf/hamstats.nix +++ b/makefu/2configs/stats/telegraf/hamstats.nix @@ -1,28 +1,60 @@ -{ pkgs, ...}: +{ pkgs, lib, ...}: let - genTopic = name: topic: tags: { + genTopic_zigbee = name: tags: { servers = [ "tcp://localhost:1883" ]; username = "stats"; - password = builtins.readFile ; + password = lib.removeSuffix "\n" (builtins.readFile ); qos = 0; connection_timeout = "30s"; - topics = [ topic ]; - tags = tags; + topics = [ "/ham/zigbee/${name}" ]; + inherit tags; persistent_session = false; - name_override = name; + name_override = "zigbee ${tags.room} ${name}"; data_format = "json"; + json_string_fields = [ "linkquality" "temperature" "humidity" "pressure" "battery" "contact" ]; + # json_name_key = + + }; + genTopic_plain = name: topic: tags: { + servers = [ "tcp://localhost:1883" ]; + username = "stats"; + password = lib.removeSuffix "\n" (builtins.readFile ); + qos = 0; + connection_timeout = "30s"; + topics = [ topic ]; + inherit tags; + persistent_session = false; + name_override = tags.sensor; + data_type = "float"; + data_format = "value"; # json_query = tags.sensor; #TODO? }; - hamStat = host: - sensor: - (genTopic sensor - "/ham/${host}/${sensor}/tele/SENSOR" - {"host" = host; + esensor = room: name: sensor: + (genTopic_plain sensor ''/ham/${room}/${name}/sensor/${sensor}/state'' + { inherit room sensor name; + "scope" = "ham"; + } ); + zsensor = room: name: + (genTopic_zigbee name + { inherit room name; "scope" = "ham"; - "sensor" = sensor; } ); - bme = host: [(hamStat host "BME280")]; + zigbee_temphum = room: name: [ + (zsensor room name) + ]; + esphome_temphum = room: name: [ + (esensor room name ''${room}_${name}_temperature'') + (esensor room name ''${room}_${name}_humidity'') + (esensor room name ''${room}_${name}_pressure'') + ]; in { - services.telegraf.extraConfig.inputs.mqtt_consumer = (bme "schlafzimmer"); + services.telegraf.extraConfig.inputs.mqtt_consumer = + (zigbee_temphum "Wohnzimmer" "temp1") + ++ (zigbee_temphum "Badezimmer" "temp2") + ++ (zigbee_temphum "Kinderzimmer" "temp3") + ++ (esphome_temphum "arbeitszimmer" "box") + ++ (esphome_temphum "schlafzimmer" "plug") + ++ (esphome_temphum "wohnzimmer" "plug") + ++ (esphome_temphum "terrasse" "plug"); } -- cgit v1.2.3 From d530d0132ad904d930457682ee98a1aee7d6791b Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 17 Jun 2020 09:33:32 +0200 Subject: ma tools:update toolset --- makefu/2configs/tools/android-pentest.nix | 2 +- makefu/2configs/tools/core-gui.nix | 1 + makefu/2configs/tools/core.nix | 2 +- makefu/2configs/tools/dev.nix | 1 + makefu/2configs/tools/extra-gui.nix | 1 + makefu/2configs/tools/media.nix | 2 ++ 6 files changed, 7 insertions(+), 2 deletions(-) (limited to 'makefu/2configs') diff --git a/makefu/2configs/tools/android-pentest.nix b/makefu/2configs/tools/android-pentest.nix index 036f6e6f..766aacb9 100644 --- a/makefu/2configs/tools/android-pentest.nix +++ b/makefu/2configs/tools/android-pentest.nix @@ -7,7 +7,7 @@ nmap msf drozer - dex2jar + #dex2jar apktool jd-gui # android-studio diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix index ee4f0598..95b6b0f5 100644 --- a/makefu/2configs/tools/core-gui.nix +++ b/makefu/2configs/tools/core-gui.nix @@ -17,5 +17,6 @@ xdotool xorg.xbacklight scrot + libnotify ]; } diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix index b4c3a431..8339c932 100644 --- a/makefu/2configs/tools/core.nix +++ b/makefu/2configs/tools/core.nix @@ -49,7 +49,7 @@ ${gnused}/bin/sed -i "''${1}d" ~/.ssh/known_hosts populate rxvt_unicode.terminfo - krebspaste + kpaste ]; } diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix index f184b5be..276ed6cd 100644 --- a/makefu/2configs/tools/dev.nix +++ b/makefu/2configs/tools/dev.nix @@ -39,5 +39,6 @@ # network related sshuttle pciutils + navi ]; } diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix index 49b36a5d..aae00b97 100644 --- a/makefu/2configs/tools/extra-gui.nix +++ b/makefu/2configs/tools/extra-gui.nix @@ -8,6 +8,7 @@ inkscape libreoffice # skype + teams synergy tdesktop virtmanager diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix index 3f2cf309..004222ba 100644 --- a/makefu/2configs/tools/media.nix +++ b/makefu/2configs/tools/media.nix @@ -8,11 +8,13 @@ mumble mplayer # quodlibet # exfalso + tinymediamanager plowshare streamripper youtube-dl pulseeffects + ]; } -- cgit v1.2.3 From 9d5f48c288c35670af59964cb8160dd3a9d02762 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 17 Jun 2020 09:50:53 +0200 Subject: ma legacy_v4: this is a sad day --- makefu/2configs/legacy_v4.nix | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 makefu/2configs/legacy_v4.nix (limited to 'makefu/2configs') diff --git a/makefu/2configs/legacy_v4.nix b/makefu/2configs/legacy_v4.nix new file mode 100644 index 00000000..3d40471b --- /dev/null +++ b/makefu/2configs/legacy_v4.nix @@ -0,0 +1,8 @@ +{ networking.enableIPv6 = false; + boot.kernel.sysctl = { + "net.ipv6.conf.all.disable_ipv6" = 1; + "net.ipv6.conf.default.disable_ipv6" = 1; + "net.ipv6.conf.lo.disable_ipv6" = 1; + }; + boot.kernelParams = [ "ipv6.disable=1" ]; +} -- cgit v1.2.3 From 5cd6756ceda7da9bfc467a7e2275d2a6a8bd1a80 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 17 Jun 2020 09:51:37 +0200 Subject: ma kdeconnect: init --- makefu/2configs/kdeconnect.nix | 6 ++++++ makefu/2configs/legacy_v4.nix | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 makefu/2configs/kdeconnect.nix delete mode 100644 makefu/2configs/legacy_v4.nix (limited to 'makefu/2configs') diff --git a/makefu/2configs/kdeconnect.nix b/makefu/2configs/kdeconnect.nix new file mode 100644 index 00000000..ca025ee4 --- /dev/null +++ b/makefu/2configs/kdeconnect.nix @@ -0,0 +1,6 @@ +{pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ kdeconnect ]; + networking.firewall.allowedUDPPortRanges = [ { from = 1714; to = 1764; } ]; + networking.firewall.allowedTCPPortRanges = [ { from = 1714; to = 1764; } ]; +} diff --git a/makefu/2configs/legacy_v4.nix b/makefu/2configs/legacy_v4.nix deleted file mode 100644 index 3d40471b..00000000 --- a/makefu/2configs/legacy_v4.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ networking.enableIPv6 = false; - boot.kernel.sysctl = { - "net.ipv6.conf.all.disable_ipv6" = 1; - "net.ipv6.conf.default.disable_ipv6" = 1; - "net.ipv6.conf.lo.disable_ipv6" = 1; - }; - boot.kernelParams = [ "ipv6.disable=1" ]; -} -- cgit v1.2.3