From 8b4c488bff6b61e2e3ed7c75d96b161a66f5a8c4 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 27 Feb 2023 13:37:35 +0100 Subject: ma wbob.r: use new zigbee stick --- makefu/1systems/wbob/config.nix | 4 +++- makefu/2configs/bureautomation/zigbee2mqtt/default.nix | 5 +---- makefu/2configs/hw/slaesh.nix | 9 +++++++++ 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 makefu/2configs/hw/slaesh.nix diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix index 5cf5eb5c8..b12a6397d 100644 --- a/makefu/1systems/wbob/config.nix +++ b/makefu/1systems/wbob/config.nix @@ -22,7 +22,7 @@ in { # - { environment.systemPackages = [ pkgs.kodi pkgs.nano ]; } + { environment.systemPackages = [ pkgs.nano ]; } # # @@ -47,6 +47,7 @@ in { # + # { environment.systemPackages = [ pkgs.vlc ]; } @@ -99,6 +100,7 @@ in { # temporary # + { services.jellyfin.enable = true; } ]; krebs = { diff --git a/makefu/2configs/bureautomation/zigbee2mqtt/default.nix b/makefu/2configs/bureautomation/zigbee2mqtt/default.nix index d42abd790..9bf587d56 100644 --- a/makefu/2configs/bureautomation/zigbee2mqtt/default.nix +++ b/makefu/2configs/bureautomation/zigbee2mqtt/default.nix @@ -5,16 +5,13 @@ let in { # symlink the zigbee controller - services.udev.extraRules = '' - SUBSYSTEM=="tty", ATTRS{idVendor}=="0451", ATTRS{idProduct}=="16a8", SYMLINK+="cc2531", MODE="0660", GROUP="dialout" - ''; services.zigbee2mqtt = { enable = true; inherit dataDir; settings = { permit_join = true; - serial.port = "/dev/cc2531"; + serial.port = "/dev/zigbee"; homeassistant = true; frontend.port = 8521; }; diff --git a/makefu/2configs/hw/slaesh.nix b/makefu/2configs/hw/slaesh.nix new file mode 100644 index 000000000..1a7d053b9 --- /dev/null +++ b/makefu/2configs/hw/slaesh.nix @@ -0,0 +1,9 @@ +{ config, lib, pkgs, ... }: + +{ + + users.users.${config.krebs.build.user.name}.extraGroups = [ "dialout" ]; + services.udev.extraRules = '' + SUBSYSTEM=="tty", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", SYMLINK+="zigbee", MODE="0660", GROUP="dailout" + ''; +} -- cgit v1.2.3