diff options
| author | makefu <github@syntax-fehler.de> | 2020-02-05 17:34:44 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2020-02-05 17:34:44 +0100 |
| commit | d31fbfe31ee26b70f13c93d910f5ce0d3ce1d8c2 (patch) | |
| tree | 9ea97bb39e60eda600d195ec80a672700742a0fa /makefu/1systems/omo | |
| parent | 89032b3ac2aff2373377ef442804e90db9694c91 (diff) | |
ma 2/homeautomation -> 2/ham
avoid overlapping autocomplete with home-manager
Diffstat (limited to 'makefu/1systems/omo')
| -rw-r--r-- | makefu/1systems/omo/config.nix | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix index 9b9b91a6f..d00d61fdc 100644 --- a/makefu/1systems/omo/config.nix +++ b/makefu/1systems/omo/config.nix @@ -57,7 +57,7 @@ in { <stockholm/makefu/2configs/stats/telegraf> # <stockholm/makefu/2configs/stats/telegraf/europastats.nix> <stockholm/makefu/2configs/stats/telegraf/hamstats.nix> - <stockholm/makefu/2configs/stats/arafetch.nix> + # <stockholm/makefu/2configs/stats/arafetch.nix> # services { @@ -71,14 +71,9 @@ in { <stockholm/makefu/2configs/virtualisation/docker.nix> <stockholm/makefu/2configs/bluetooth-mpd.nix> - { - # Risikoübernahme - nixpkgs.config.permittedInsecurePackages = [ - "homeassistant-0.77.2" - ]; - } - <stockholm/makefu/2configs/homeautomation> - <stockholm/makefu/2configs/homeautomation/google-muell.nix> + <stockholm/makefu/2configs/ham> + <stockholm/makefu/2configs/ham/google-muell.nix> + <stockholm/makefu/2configs/ham/zigbee2mqtt> { makefu.ps3netsrv = { enable = true; @@ -120,7 +115,7 @@ in { gid = (import <stockholm/lib>).genid "share"; members = [ "makefu" "misa" ]; }; - networking.firewall.trustedInterfaces = [ primaryInterface ]; + networking.firewall.trustedInterfaces = [ primaryInterface "docker0" ]; @@ -141,18 +136,18 @@ in { sed-plugin random-emoji ]; }; - krebs.Reaktor.reaktor-bgt = { - nickname = "Reaktor|bgt"; - workdir = "/var/lib/Reaktor/bgt"; - channels = [ "#binaergewitter" ]; - plugins = with pkgs.ReaktorPlugins; - [ titlebot - # stockholm-issue - nixos-version - shack-correct - sed-plugin - random-emoji ]; - }; + #krebs.Reaktor.reaktor-bgt = { + # nickname = "Reaktor|bgt"; + # workdir = "/var/lib/Reaktor/bgt"; + # channels = [ "#binaergewitter" ]; + # plugins = with pkgs.ReaktorPlugins; + # [ titlebot + # # stockholm-issue + # nixos-version + # shack-correct + # sed-plugin + # random-emoji ]; + #}; krebs.build.host = config.krebs.hosts.omo; } |