diff options
| author | lassulus <git@lassul.us> | 2023-04-18 12:49:31 +0200 |
|---|---|---|
| committer | lassulus <git@lassul.us> | 2023-04-18 12:49:31 +0200 |
| commit | 45f61cffe9acfcf0b269d3cdbad96573b8f3c0d5 (patch) | |
| tree | 0e5019b26129503c256637a26eb67d0bf6165c45 | |
| parent | 6ae9b8d8ed3440ffc634e468491b0da5d777379d (diff) | |
| parent | caa8f83e79f7373bf234874b8614117c3f7a0710 (diff) | |
Merge remote-tracking branch 'gum/master'
| -rw-r--r-- | makefu/1systems/wbob/config.nix | 4 | ||||
| -rw-r--r-- | makefu/2configs/bureautomation/zigbee2mqtt/default.nix | 5 | ||||
| -rw-r--r-- | makefu/2configs/hw/slaesh.nix | 9 |
3 files changed, 13 insertions, 5 deletions
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 { # <stockholm/makefu/2configs/virtualisation/virtualbox.nix> <stockholm/makefu/2configs/tinc/retiolum.nix> <stockholm/makefu/2configs/gui/wbob-kiosk.nix> - { environment.systemPackages = [ pkgs.kodi pkgs.nano ]; } + { environment.systemPackages = [ pkgs.nano ]; } # <stockholm/makefu/2configs/gui/studio-virtual.nix> # <stockholm/makefu/2configs/audio/jack-on-pulse.nix> @@ -47,6 +47,7 @@ in { <stockholm/makefu/2configs/stats/external/aralast.nix> <stockholm/makefu/2configs/stats/arafetch.nix> # <stockholm/makefu/2configs/hw/mceusb.nix> + <stockholm/makefu/2configs/hw/slaesh.nix> # <stockholm/makefu/2configs/stats/telegraf/bamstats.nix> { environment.systemPackages = [ pkgs.vlc ]; } @@ -99,6 +100,7 @@ in { <stockholm/makefu/2configs/backup/state.nix> # temporary # <stockholm/makefu/2configs/temp/rst-issue.nix> + { 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" + ''; +} |