kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-21 04:11:07 +01:00
Code Releases Activity

chore: make 20.09 work

Browse Source
This commit is contained in:
Kierán Meinhardt
2020-10-28 11:36:46 +01:00
parent 3741304284
commit 3508575ebe
5 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configs/nextcloud.nix
View File

@@ -28,7 +28,6 @@ in
hostName = localAddresses.toum; hostName = localAddresses.toum;
nginx.enable = true;
# https = true; # https = true;
config = { config = {
# overwriteProtocol = "https"; # overwriteProtocol = "https";

5
systems/toum/hass/default.nix
View File

@@ -4,14 +4,9 @@ let
inherit (import <niveum/lib>) localAddresses; inherit (import <niveum/lib>) localAddresses;
in in
{ {
disabledModules = [
"services/misc/home-assistant.nix"
];
imports = [ imports = [
./zigbee.nix ./zigbee.nix
./frontend.nix ./frontend.nix
<nixpkgs-unstable/nixos/modules/services/misc/home-assistant.nix>
]; ];
services.home-assistant = { services.home-assistant = {

9
systems/toum/hass/frontend.nix
View File

@@ -2,15 +2,6 @@ let
inherit (import ./lib.nix) triggers; inherit (import ./lib.nix) triggers;
in in
{ {
disabledModules = [
"services/misc/home-assistant.nix"
];
imports = [
<nixpkgs-unstable/nixos/modules/services/misc/home-assistant.nix>
];
services.home-assistant.config = { services.home-assistant.config = {
frontend = { frontend = {
themes = { themes = {

22
systems/toum/hass/zigbee.nix
View File

@@ -1,6 +1,5 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
inherit (import <stockholm/lib>) genid;
inherit (import <niveum/lib>) localAddresses; inherit (import <niveum/lib>) localAddresses;
zigbee2mqttDevice = "/dev/ttyACM0"; zigbee2mqttDevice = "/dev/ttyACM0";
@@ -14,7 +13,7 @@ let
mqtt = { mqtt = {
discovery = true; discovery = true;
base_topic = "zigbee"; base_topic = "zigbee";
server = "mqtt://${localAddresses.toum}"; # Rasperry local IP server = "mqtt://${localAddresses.toum}";
user = "albrecht"; user = "albrecht";
password = lib.strings.fileContents <system-secrets/mosquitto>; password = lib.strings.fileContents <system-secrets/mosquitto>;
}; };
@@ -22,28 +21,14 @@ let
zigbee2mqtt_cfg = pkgs.writeText "zigbee2mqtt.json" (builtins.toJSON zigbee2mqttConfig); zigbee2mqtt_cfg = pkgs.writeText "zigbee2mqtt.json" (builtins.toJSON zigbee2mqttConfig);
in in
{ {
disabledModules = [
"services/misc/home-assistant.nix"
];
imports = [
<nixpkgs-unstable/nixos/modules/services/misc/home-assistant.nix>
<nixpkgs-unstable/nixos/modules/services/misc/zigbee2mqtt.nix>
];
/*
ids = {
uids.zigbee2mqtt = genid "zigbee2mqtt";
gids.zigbee2mqtt = genid "zigbee2mqtt";
};
services.zigbee2mqtt = { services.zigbee2mqtt = {
enable = true; enable = true;
config = zigbee2mqttConfig; config = zigbee2mqttConfig;
package = pkgs.unstable.zigbee2mqtt; package = pkgs.zigbee2mqtt;
}; };
*/
/*
system.activationScripts.installZigbee = '' system.activationScripts.installZigbee = ''
install -d /var/lib/zigbee2mqtt install -d /var/lib/zigbee2mqtt
install ${zigbee2mqtt_cfg} /var/lib/zigbee2mqtt/configuration.yaml install ${zigbee2mqtt_cfg} /var/lib/zigbee2mqtt/configuration.yaml
@@ -59,6 +44,7 @@ in
]; ];
volumes = ["/var/lib/zigbee2mqtt:/app/data"]; volumes = ["/var/lib/zigbee2mqtt:/app/data"];
}; };
*/
services.mosquitto = { services.mosquitto = {
enable = true; enable = true;

4
systems/toum/telegram-bots/autorenkalender.nix
View File

@@ -3,8 +3,8 @@ let
autorenkalender-package = pkgs.fetchFromGitHub { autorenkalender-package = pkgs.fetchFromGitHub {
owner = "kmein"; owner = "kmein";
repo = "autorenkalender"; repo = "autorenkalender";
rev = "1971f082ec6e14d392a0dc3ac62e0b1e4187409b"; rev = "cf49a7b057301332d980eb47042a626add93db66";
sha256 = "0hipj616vcsa3f62s83jvlx8zx4bmbgl5h2n4w8ba5ngp40lkmb3"; sha256 = "1pa7sjg33vdnjianrqldv445jdzzv3mn231ljk1j58hs0cd505gs";
}; };
autorenkalender = autorenkalender =
pkgs.python3Packages.callPackage autorenkalender-package { }; pkgs.python3Packages.callPackage autorenkalender-package { };