Merge remote-tracking branch 'gum/master'

This commit is contained in:
lassulus 2023-04-18 12:49:31 +02:00
commit 45f61cffe9
3 changed files with 13 additions and 5 deletions

View File

@ -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 = {

View File

@ -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;
};

View File

@ -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"
'';
}