diff --git a/configs/pepe/home-assistant/zigbee2mqtt.nix b/configs/pepe/home-assistant/zigbee2mqtt.nix index 0b00c1b..8ca2474 100644 --- a/configs/pepe/home-assistant/zigbee2mqtt.nix +++ b/configs/pepe/home-assistant/zigbee2mqtt.nix @@ -28,7 +28,7 @@ in { homeassistant = false; # allow new devices to join - permit_join = false; + permit_join = true; # MQTT settings mqtt = { @@ -43,9 +43,10 @@ in { # Serial settings serial = { - port = "/dev/ttyACM0"; + #port = "/dev/ttyACM0"; + port = "/dev/ttyUSB0"; # disable LED of CC2531 USB sniffer - disable_led = true; + #disable_led = true; }; # you own network key, @@ -54,6 +55,8 @@ in { advanced.network_key = import ; advanced.log_output = [ "console" ]; + advanced.pan_id = 1337; + # configure web ui frontend.port = 9666; frontend.host = "0.0.0.0"; diff --git a/modules/programs/taskwarrior.nix b/modules/programs/taskwarrior.nix index ec66f91..74708fa 100644 --- a/modules/programs/taskwarrior.nix +++ b/modules/programs/taskwarrior.nix @@ -21,15 +21,16 @@ let ${pkgs.taskwarrior}/bin/task "$@" ''; - vit = unstable.vit.overrideAttrs (old: rec { - name = "vit-${version}"; - version = "master"; - src = pkgs.fetchgit { - url = "https://github.com/scottkosty/vit.git"; - rev = "7200949214362139e8073b6ca1a58cc756b2ebd0"; - sha256 = "1s0rvqn8xjy3qiw9034wfzz2r7mwary70x32fqprz2w2h5r73j2m"; - }; - }); + #vit = unstable.vit.overrideAttrs (old: rec { + # name = "vit-${version}"; + # version = "master"; + # src = pkgs.fetchgit { + # url = "https://github.com/scottkosty/vit.git"; + # rev = "7200949214362139e8073b6ca1a58cc756b2ebd0"; + # sha256 = "1s0rvqn8xjy3qiw9034wfzz2r7mwary70x32fqprz2w2h5r73j2m"; + # }; + #}); + vit = pkgs.vit; in {