Merge remote-tracking branch 'prism/master'

This commit is contained in:
tv 2021-05-20 11:08:58 +02:00
commit 5460255668
33 changed files with 592 additions and 133 deletions

View File

@ -5,9 +5,9 @@
6667 6669 6667 6669
]; ];
systemd.services.charybdis.serviceConfig.LimitNOFILE = 16384; systemd.services.solanum.serviceConfig.LimitNOFILE = 16384;
krebs.charybdis = { krebs.solanum = {
enable = true; enable = true;
motd = '' motd = ''
hello hello

View File

@ -17,7 +17,6 @@ let
./buildbot/slave.nix ./buildbot/slave.nix
./build.nix ./build.nix
./cachecache.nix ./cachecache.nix
./charybdis.nix
./ci.nix ./ci.nix
./current.nix ./current.nix
./dns.nix ./dns.nix
@ -52,6 +51,7 @@ let
./secret.nix ./secret.nix
./setuid.nix ./setuid.nix
./shadow.nix ./shadow.nix
./solanum.nix
./sync-containers.nix ./sync-containers.nix
./tinc.nix ./tinc.nix
./tinc_graphs.nix ./tinc_graphs.nix

View File

@ -2,10 +2,10 @@
let let
inherit (lib) mkEnableOption mkIf mkOption singleton types; inherit (lib) mkEnableOption mkIf mkOption singleton types;
inherit (pkgs) coreutils charybdis; inherit (pkgs) coreutils solanum;
cfg = config.krebs.charybdis; cfg = config.krebs.solanum;
configFile = pkgs.writeText "charybdis.conf" '' configFile = pkgs.writeText "solanum.conf" ''
${cfg.config} ${cfg.config}
''; '';
in in
@ -16,22 +16,22 @@ in
options = { options = {
krebs.charybdis = { krebs.solanum = {
enable = mkEnableOption "Charybdis IRC daemon"; enable = mkEnableOption "Solanum IRC daemon";
config = mkOption { config = mkOption {
type = types.str; type = types.str;
description = '' description = ''
Charybdis IRC daemon configuration file. Solanum IRC daemon configuration file.
''; '';
}; };
statedir = mkOption { statedir = mkOption {
type = types.str; type = types.path;
default = "/var/lib/charybdis"; default = "/var/lib/solanum";
description = '' description = ''
Location of the state directory of charybdis. Location of the state directory of solanum.
''; '';
}; };
@ -39,7 +39,7 @@ in
type = types.str; type = types.str;
default = "ircd"; default = "ircd";
description = '' description = ''
Charybdis IRC daemon user. Solanum IRC daemon user.
''; '';
}; };
@ -47,7 +47,7 @@ in
type = types.str; type = types.str;
default = "ircd"; default = "ircd";
description = '' description = ''
Charybdis IRC daemon group. Solanum IRC daemon group.
''; '';
}; };
@ -55,9 +55,9 @@ in
type = types.nullOr types.lines; type = types.nullOr types.lines;
default = null; default = null;
description = '' description = ''
Charybdis MOTD text. Solanum MOTD text.
Charybdis will read its MOTD from /etc/charybdis/ircd.motd . Solanum will read its MOTD from /etc/solanum/ircd.motd .
If set, the value of this option will be written to this path. If set, the value of this option will be written to this path.
''; '';
}; };
@ -72,38 +72,36 @@ in
config = mkIf cfg.enable (lib.mkMerge [ config = mkIf cfg.enable (lib.mkMerge [
{ {
users.users.${cfg.user} = { users.users.${cfg.user} = {
description = "Charybdis IRC daemon user"; description = "Solanum IRC daemon user";
uid = config.ids.uids.ircd; uid = config.ids.uids.ircd;
group = cfg.group; group = cfg.group;
}; };
users.groups.${cfg.group} = { users.groups.${cfg.group} = {
name = cfg.group;
gid = config.ids.gids.ircd; gid = config.ids.gids.ircd;
}; };
systemd.services.charybdis = { systemd.tmpfiles.rules = [
description = "Charybdis IRC daemon"; "d ${cfg.statedir} - ${cfg.user} ${cfg.group} - -"
];
systemd.services.solanum = {
description = "Solanum IRC daemon";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
environment = { environment = {
BANDB_DBPATH = "${cfg.statedir}/ban.db"; BANDB_DBPATH = "${cfg.statedir}/ban.db";
}; };
serviceConfig = { serviceConfig = {
ExecStart = "${charybdis}/bin/charybdis -foreground -logfile /dev/stdout -configfile ${configFile}"; ExecStart = "${solanum}/bin/solanum -foreground -logfile /dev/stdout -configfile ${configFile} -pidfile ${cfg.statedir}/ircd.pid";
Group = cfg.group; Group = cfg.group;
User = cfg.user; User = cfg.user;
PermissionsStartOnly = true; # preStart needs to run with root permissions
}; };
preStart = ''
${coreutils}/bin/mkdir -p ${cfg.statedir}
${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.statedir}
'';
}; };
} }
(mkIf (cfg.motd != null) { (mkIf (cfg.motd != null) {
environment.etc."charybdis/ircd.motd".text = cfg.motd; environment.etc."solanum/ircd.motd".text = cfg.motd;
}) })
]); ]);
} }

View File

@ -0,0 +1,12 @@
diff --git a/ircd/bandbi.c b/ircd/bandbi.c
index 29a3bfa2..16a40f17 100644
--- a/ircd/bandbi.c
+++ b/ircd/bandbi.c
@@ -83,7 +83,6 @@ start_bandb(void)
const char *suffix = "";
#endif
- rb_setenv("BANDB_DBPATH", ircd_paths[IRCD_PATH_BANDB], 1);
if(bandb_path == NULL)
{
snprintf(fullpath, sizeof(fullpath), "%s%cbandb%s", ircd_paths[IRCD_PATH_LIBEXEC], RB_PATH_SEPARATOR, suffix);

View File

@ -0,0 +1,63 @@
{ lib, stdenv
, fetchFromGitHub
, autoreconfHook
, pkg-config
, bison
, flex
, openssl
, sqlite
, lksctp-tools
}:
stdenv.mkDerivation rec {
pname = "solanum";
version = "unstable-2021-04-27";
src = fetchFromGitHub {
owner = "solanum-ircd";
repo = pname;
rev = "3ff5a12e75662e9a642f2a4364797bd361eb0925";
sha256 = "14ywmfdv8cncbyg08y2qdis00kwg8lvhkcgj185is67smh0qf88f";
};
patches = [
./dont-create-logdir.patch
./bandb.patch # https://github.com/solanum-ircd/solanum/issues/156
];
configureFlags = [
"--enable-epoll"
"--enable-ipv6"
"--enable-openssl=${openssl.dev}"
"--with-program-prefix=solanum-"
"--localstatedir=/var/lib"
"--with-rundir=/run"
"--with-logdir=/var/log"
] ++ lib.optionals (stdenv.isLinux) [
"--enable-sctp=${lksctp-tools.out}/lib"
];
nativeBuildInputs = [
autoreconfHook
bison
flex
pkg-config
];
buildInputs = [
openssl
sqlite
];
doCheck = !stdenv.isDarwin;
enableParallelBuilding = true;
meta = with lib; {
description = "An IRCd for unified networks";
homepage = "https://github.com/solanum-ircd/solanum";
license = licenses.gpl2Only;
maintainers = with maintainers; [ hexa ];
platforms = platforms.unix;
};
}

View File

@ -0,0 +1,14 @@
diff --git a/Makefile.am b/Makefile.am
index 19e7b396..21093521 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,9 +35,6 @@ include/serno.h:
echo '#define DATECODE 0UL' >>include/serno.h; \
fi
-install-data-hook:
- test -d ${DESTDIR}${logdir} || mkdir -p ${DESTDIR}${logdir}
-
install-exec-hook:
rm -f ${DESTDIR}${libdir}/*.la
rm -f ${DESTDIR}${moduledir}/*.la

View File

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/NixOS/nixpkgs", "url": "https://github.com/NixOS/nixpkgs",
"rev": "39e6bf76474ce742eb027a88c4da6331f0a1526f", "rev": "7a1fbc38a4b538450ac0d42aec8a3e513b4d723e",
"date": "2021-05-04T23:07:42+02:00", "date": "2021-05-16T12:16:31+02:00",
"path": "/nix/store/9zbih9x2pfi782vv73v0vjxscmzyf4da-nixpkgs", "path": "/nix/store/iq2sy65gmwad2prm8lcdh6k5f7ywxci5-nixpkgs",
"sha256": "1pxigbywdq4yf7smas6zq4vhakbkvm1vhj443qjikh77fc8hy17b", "sha256": "0jg8dilsw0gr4jfshkk3wd50gddd11hvd836fxkw43m6m47885p7",
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,
"leaveDotGit": false "leaveDotGit": false

View File

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/NixOS/nixpkgs", "url": "https://github.com/NixOS/nixpkgs",
"rev": "d90df566caff6ef84f7bfccc2a2c95496f221d62", "rev": "33824cdf8e4fec30c5b9ddc91b18991c3c375227",
"date": "2021-05-04T18:59:22-04:00", "date": "2021-05-18T19:08:44-04:00",
"path": "/nix/store/3jr3hwykb05r9m5g3phpx6f7k2956ny3-nixpkgs", "path": "/nix/store/s3f1q2a5hn60jdnz8h66z7yahrmzifin-nixpkgs",
"sha256": "0f1im9c83kyc465k5lsqyhb5saki3dgh5bb1gyyh7gmqlhyvqcax", "sha256": "1sad0x998k3iid2vp57kv4skvf90yh4gbs61dv3p45c2qi3sql46",
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,
"leaveDotGit": false "leaveDotGit": false

View File

@ -0,0 +1,6 @@
{
number = "+1dotdotdot";
home = "group.ABCDE";
felix = "group.ABCDE";
}

View File

@ -160,7 +160,7 @@ in {
<stockholm/makefu/2configs/bgt/download.binaergewitter.de.nix> <stockholm/makefu/2configs/bgt/download.binaergewitter.de.nix>
<stockholm/makefu/2configs/bgt/hidden_service.nix> <stockholm/makefu/2configs/bgt/hidden_service.nix>
<stockholm/makefu/2configs/bgt/backup.nix> <stockholm/makefu/2configs/bgt/backup.nix>
<stockholm/makefu/2configs/bgt/social-to-irc.nix> # <stockholm/makefu/2configs/bgt/social-to-irc.nix>
# <stockholm/makefu/2configs/logging/client.nix> # <stockholm/makefu/2configs/logging/client.nix>

View File

@ -30,8 +30,12 @@ in {
proxy_read_timeout 1799s; proxy_read_timeout 1799s;
''; '';
}; };
docker-containers."etherpad-lite" = { state = [ "/var/lib/docker/volumes/etherpad_data/_data/" ];
image = "makefoo/bgt-etherpad:2020-05-02.6"; virtualisation.oci-containers.containers."etherpad-lite" = {
image = "makefoo/bgt-etherpad:2021-04-16.3"; # --build-arg ETHERPAD_PLUGINS="ep_markdown"
# ep_codepad does not work anymore
#image = "etherpad/etherpad:1.8.13";
ports = [ "127.0.0.1:${toString port}:9001" ]; ports = [ "127.0.0.1:${toString port}:9001" ];
volumes = [ volumes = [
"/var/src/secrets/etherpad/apikey:/opt/etherpad-lite/APIKEY.txt" "/var/src/secrets/etherpad/apikey:/opt/etherpad-lite/APIKEY.txt"
@ -46,7 +50,10 @@ in {
#DB_PASS=mypassword #DB_PASS=mypassword
environment = { environment = {
# ADMIN_PASSWORD = "auf jeden fall nicht das echte admin passwort"; # ADMIN_PASSWORD = "auf jeden fall nicht das echte admin passwort";
# LOGLEVEL = "DEBUG";
SUPPRESS_ERRORS_IN_PAD_TEXT = "true"; SUPPRESS_ERRORS_IN_PAD_TEXT = "true";
TRUST_PROXY = "true";
TITLE = "Binärgewitter Etherpad"; TITLE = "Binärgewitter Etherpad";
SKIN_NAME = "no-skin"; SKIN_NAME = "no-skin";
DEFAULT_PAD_TEXT = builtins.replaceStrings ["\n"] ["\\n"] (builtins.readFile ./template.md); DEFAULT_PAD_TEXT = builtins.replaceStrings ["\n"] ["\\n"] (builtins.readFile ./template.md);

View File

@ -1,10 +1,17 @@
{ pkgs, ... }:
{ {
# systemd.services.brockman.environment."BROCKMAN_LOG_LEVEL" = "DEBUG"; systemd.services.brockman.environment."BROCKMAN_LOG_LEVEL" = "DEBUG";
systemd.services.restart-brockman = {
after = [ "brockman.service" ];
wantedBy = [ "multi-user.target" ];
startAt = "daily";
script = "${pkgs.systemd}/bin/systemctl try-restart brockman.service";
};
krebs.brockman = { krebs.brockman = {
enable = true; enable = true;
config = { config = {
channel = "#binaergewitter"; channel = "#binaergewitter";
notifyErrors = false; notifyErrors = false;
irc = { irc = {
host = "irc.freenode.net"; host = "irc.freenode.net";
port = 6667; port = 6667;

View File

@ -21,6 +21,7 @@
## Vorschläge ## Vorschläge
### Backlog von Picks und Lesefoo aus der letzten Woche ### Backlog von Picks und Lesefoo aus der letzten Woche
die Nachfolgenden 3 Striche sind sehr wichtig, bitte nicht löschen
--- ---
## Blast from the Past ## Blast from the Past

View File

@ -59,7 +59,7 @@ in {
extraPackages = p: [ extraPackages = p: [
# TODO: put somewhere else # TODO: put somewhere else
(p.callPackage <stockholm/makefu/2configs/home/ham/deps/dwdwfsapi.nix> {}) (p.callPackage <stockholm/makefu/2configs/home/ham/deps/dwdwfsapi.nix> {})
(p.callPackage <stockholm/makefu/2configs/home/ham/deps/pykodi.nix> {}) # (p.callPackage <stockholm/makefu/2configs/home/ham/deps/pykodi.nix> {})
p.APScheduler ]; p.APScheduler ];
}; };
autoExtraComponents = true; autoExtraComponents = true;
@ -147,7 +147,7 @@ in {
frontend = { }; frontend = { };
http = { http = {
# TODO: https://github.com/home-assistant/home-assistant/issues/16149 # TODO: https://github.com/home-assistant/home-assistant/issues/16149
base_url = "http://192.168.8.11:8123"; # base_url = "http://192.168.8.11:8123";
}; };
conversation = {}; conversation = {};
history = {}; history = {};

View File

@ -1,3 +1,8 @@
{ lib, ... }:
#uses:
# notify.signal
# binary_sensor.badezimmer_fenster_contact
# binary_sensor.dusche_fenster_contact
let let
min = 20; min = 20;
fenster_offen = name: entity: fenster_offen = name: entity:
@ -13,21 +18,57 @@ let
action = action =
[ [
{ {
service = "notify.firetv_wohnzimmer"; service = "notify.signal_home";
data = { data = {
title = "${name} seit ${toString min} Minuten offen"; message= "${name} seit ${toString min} Minuten offen\nBitte einmal checken ob das ok ist :)";
message = "Bitte einmal checken ob das ok ist :)";
data = {
interrupt = 1;
duration = 300;
};
}; };
} }
{
service = "input_boolean.turn_on";
target.entity_id = "input_boolean.${lib.toLower name}_lang_offen";
}
];
};
fenster_geschlossen_lang = name: entity:
{ alias = "${name} wieder geschlossen";
trigger = [
{
platform = "state";
entity_id = entity;
to = "off";
}
];
condition = [
{ condition = "state";
entity_id = "input_boolean.${lib.toLower name}_lang_offen";
state = "on";
}
];
action =
[
{
service = "notify.signal_home";
data = {
message= "${name} ist wieder geschlossen, Danke!";
};
}
{
service = "input_boolean.turn_off";
target.entity_id = "input_boolean.${lib.toLower name}_lang_offen";
}
]; ];
}; };
in { in {
services.home-assistant.config.automation = [ services.home-assistant.config = {
(fenster_offen "Badezimmerfenster" "binary_sensor.badezimmer_fenster_contact") input_boolean = {
(fenster_offen "Duschfenster" "binary_sensor.dusche_fenster_contact") badezimmerfinester_lang_offen.name = "Badezimmer lange offen";
]; duschfenster_lang_offen.name = "Duschfenster lange offen";
};
automation = [
(fenster_geschlossen_lang "Badezimmerfenster" "binary_sensor.badezimmer_fenster_contact")
(fenster_geschlossen_lang "Duschfenster" "binary_sensor.badezimmer_fenster_contact")
(fenster_offen "Badezimmerfenster" "binary_sensor.badezimmer_fenster_contact")
(fenster_offen "Duschfenster" "binary_sensor.dusche_fenster_contact")
];
};
} }

View File

@ -5,9 +5,9 @@ let
name = "chilicam"; name = "chilicam";
camera = "camera.espcam_02"; camera = "camera.espcam_02";
light = "light.espcam_02_light"; light = "light.espcam_02_light";
seconds = 60; # default shutoff to protect the LED from burning out seconds = 90; # default shutoff to protect the LED from burning out
}; };
seconds = 60; seconds = 70; # time for giesskanne
pump = "switch.arbeitszimmer_giesskanne_relay"; pump = "switch.arbeitszimmer_giesskanne_relay";
# sensor = "sensor.statistics_for_sensor_crafting_brotbox_soil_moisture"; # sensor = "sensor.statistics_for_sensor_crafting_brotbox_soil_moisture";
in in

View File

@ -0,0 +1,135 @@
# This module maps the RF433 Remote Control to zigbee and wifi lights
let
rf_turn_off = code: light:
{
alias = "Turn off ${light} via rf code ${code}";
trigger = {
platform = "event";
event_type = "esphome.rf_code_received";
event_data.code = code;
};
action = {
service = "light.turn_off";
data.entity_id = light;
};
};
rf_turn_on = code: light:
{
alias = "Turn on ${light} via rf code ${code}";
trigger = {
platform = "event";
event_type = "esphome.rf_code_received";
event_data.code = code;
};
action = {
service = "light.turn_on";
data.entity_id = light;
};
};
rf_state = code: light: halfbright:
let
maxbright = 255;
transition = 0.2; # seconds
in
# this function implements a simple state machine based on the state and brightness of the light (light must support brightness
{
alias = "Cycle through states of ${light} via rf code ${code}";
trigger = {
platform = "event";
event_type = "esphome.rf_code_received";
event_data.code = code;
};
action = {
choose = [
{
# state 0: off to half
conditions = {
condition = "template";
value_template = ''{{ states("${light}") == "off" }}'';
};
sequence = [
{
service = "light.turn_on";
data = {
entity_id = light;
brightness = halfbright;
};
}
];
}
{
# state 1: half to full
conditions = {
condition = "template";
value_template = ''{{ states('${light}') == 'on' and ( ${toString (halfbright - 1)} <= state_attr("${light}","brightness") <= ${toString (halfbright + 1)})}}'';
};
sequence = [
{
service = "light.turn_on";
data = {
entity_id = light;
brightness = maxbright;
};
}
];
}
{
# state 2: full to off
conditions = {
condition = "template";
# TODO: it seems like the devices respond with brightness-1 , maybe off-by-one somewhere?
value_template = ''{{ states("${light}") == "on" and state_attr("${light}","brightness") >= ${toString (maxbright - 1)}}}'';
};
sequence = [
{
service = "light.turn_off";
data = {
entity_id = light;
};
}
];
}
];
# default: on to off
# this works because state 0 checks for "state == off"
default = [{
service = "light.turn_off";
data = {
entity_id = light;
};
}];
};
}
;
rf_toggle = code: light:
{
alias = "Toggle ${light} via rf code ${code}";
trigger = {
platform = "event";
event_type = "esphome.rf_code_received";
event_data.code = code;
};
action = {
service = "light.toggle";
data.entity_id = light;
};
};
in
{
services.home-assistant.config.automation = [
(rf_toggle "400551" "light.wohnzimmer_fernseher_led_strip") # A
(rf_state "401151" "light.wohnzimmer_stehlampe_osram" 128) # B
(rf_state "401451" "light.wohnzimmer_komode_osram" 128) # C
(rf_state "401511" "light.wohnzimmer_schrank_osram" 128) # D
# OFF Lane
(rf_turn_off "400554" "all") # A
(rf_toggle "401154" "light.wohnzimmer_fenster_lichterkette_licht") # B
(rf_toggle "401454" "light.wohnzimmer_fernsehwand_led") # C
# (rf_toggle "401514" "") # D
];
# "400554" # A OFF
# "401154" # B OFF
# "401454" # C OFF
# "401514" # D OFF
}

View File

@ -1,22 +1,77 @@
# light.wohnzimmerbeleuchtung
# light.wohnzimmer_deko
# light.arbeitszimmerbeleuchtung
# light.arbeitszimmer_deko
# light.schlafzimmerbeleuchtung
let let
toggle = light: btn: btn_state = light: btn: halfbright:
let
maxbright = 255;
transition = 0.2; # seconds
in
# this function implements a simple state machine based on the state and brightness of the light (light must support brightness
{ {
alias = "Toggle Light ${light} via ${btn}"; alias = "Cycle through states of ${light} via button ${btn}";
trigger = { trigger = {
platform = "state"; platform = "state";
entity_id = "sensor.${btn}_click"; entity_id = "sensor.${btn}_click";
to = "single"; to = "single";
}; };
action = { action = {
service = "light.toggle"; choose = [
data.entity_id = light; {
data.transition = 0; # state 0: off to half
conditions = {
condition = "template";
value_template = ''{{ states("${light}") == "off" }}'';
};
sequence = [
{
service = "light.turn_on";
data = {
entity_id = light;
brightness = halfbright;
};
}
];
}
{
# state 1: half to full
conditions = {
condition = "template";
value_template = ''{{ states('${light}') == 'on' and ( ${toString (halfbright - 1)} <= state_attr("${light}","brightness") <= ${toString (halfbright + 1)})}}'';
};
sequence = [
{
service = "light.turn_on";
data = {
entity_id = light;
brightness = maxbright;
};
}
];
}
{
# state 2: full to off
conditions = {
condition = "template";
# TODO: it seems like the devices respond with brightness-1 , maybe off-by-one somewhere?
value_template = ''{{ states("${light}") == "on" and state_attr("${light}","brightness") >= ${toString (maxbright - 1)}}}'';
};
sequence = [
{
service = "light.turn_off";
data = {
entity_id = light;
};
}
];
}
];
# default: on to off
# this works because state 0 checks for "state == off"
default = [{
service = "light.turn_off";
data = {
entity_id = light;
};
}];
}; };
}; };
turn_off_all = btn: turn_off_all = btn:
@ -34,11 +89,9 @@ let
}; };
in { in {
services.home-assistant.config.automation = [ services.home-assistant.config.automation = [
(toggle "light.arbeitszimmerbeleuchtung" "arbeitszimmer_btn1") # (btn_state "light.arbeitszimmerbeleuchtung" "arbeitszimmer_btn1")
(toggle "light.schlafzimmerbeleuchtung" "schlafzimmer_btn2") (btn_state "light.schlafzimmer_komode_osram" "schlafzimmer_btn2" 128)
(toggle "light.wohnzimmerbeleuchtung" "wohnzimmer_btn3") # (btn_state "light.wohnzimmerbeleuchtung" "wohnzimmer_btn3")
(turn_off_all "arbeitszimmer_btn1")
(turn_off_all "schlafzimmer_btn2") (turn_off_all "schlafzimmer_btn2")
(turn_off_all "wohnzimmer_btn3")
]; ];
} }

View File

@ -0,0 +1,39 @@
let
notify_felix = message: {
service = "notify.signal_felix";
data.message = message;
};
notify_home = message: {
service = "notify.signal_home";
data.message = message;
};
in
{
services.home-assistant.config.automation =
[
{
alias = "Pflanzen Giessen Erinnerung Daily";
trigger = {
platform = "time";
at = "12:15:00";
};
action = [
(notify_felix "Es ist Mittagszeit und du kannst ruhig einmal alle Blumen im Zimmer giessen")
];
}
{
alias = "Pflanzen Giessen Erinnerung Weekly";
trigger = {
platform = "time";
at = "12:15:00";
};
condition = {
condition = "time";
weekday = [ "sat" ];
};
action = [
(notify_home "Es ist Wochenende und die Pflanzen würden sich über ein bisschen Wasser freuen.")
];
}
];
}

View File

@ -8,6 +8,36 @@ in
platform = "caldav"; platform = "caldav";
inherit (cred) username password; inherit (cred) username password;
url = "https://o.euer.krebsco.de/remote.php/dav"; url = "https://o.euer.krebsco.de/remote.php/dav";
# make calendars "all-day" before uploading:
# sed -i -e 's/^\(DTSTART;.*\)T......\r$/\1\r/' -e # 's/^\(DTEND;.*\)T......\r$/\1\r/' abfall.ical
custom_calendars = [
{
name = "Gelbersack";
calendar = "Abfall";
search = "Gelber Sack.*";
}
{
name = "Biomuell";
calendar = "Abfall";
search = "Bio.*";
}
{
name = "Restmuell";
calendar = "Abfall";
search = "Rest.*";
}
{
name = "Papiermuell";
calendar = "Abfall";
search = "Altpapier.*";
}
{
name = "Kehrwoche";
calendar = "Kehrwoche";
search = ".*";
}
];
} }
]; ];
} }

View File

@ -33,7 +33,8 @@ in {
./automation/firetv_restart.nix ./automation/firetv_restart.nix
./automation/light_buttons.nix ./automation/light_buttons.nix
./automation/wohnzimmer_rf_fernbedienung.nix ./automation/wohnzimmer_rf_fernbedienung.nix
./automation/giesskanne.nix #./automation/giesskanne.nix
./automation/pflanzen_giessen_erinnerung.nix
#./automation/urlaub.nix #./automation/urlaub.nix
./automation/moodlight.nix ./automation/moodlight.nix
@ -48,7 +49,9 @@ in {
})).override { })).override {
extraPackages = p: [ extraPackages = p: [
(p.callPackage ./deps/dwdwfsapi.nix {}) (p.callPackage ./deps/dwdwfsapi.nix {})
(p.callPackage ./deps/pykodi.nix {}) ]; (p.callPackage ./signal-rest/pkg.nix {})
#(p.callPackage ./deps/pykodi.nix {})
];
}; };
config = { config = {
@ -103,11 +106,11 @@ in {
# (builtins.readFile <secrets/hass/telegram-bot.json>)) # (builtins.readFile <secrets/hass/telegram-bot.json>))
#]; #];
notify = [ notify = [
{ #{
platform = "kodi"; # platform = "kodi";
name = "Kodi Wohnzimmer"; # name = "Kodi Wohnzimmer";
host = firetv_stick; # host = firetv_stick;
} #}
{ {
platform = "nfandroidtv"; platform = "nfandroidtv";
name = "FireTV Wohnzimmer"; name = "FireTV Wohnzimmer";
@ -166,8 +169,10 @@ in {
}; };
#binary_sensor = #binary_sensor =
# flurlicht.binary_sensor; # flurlicht.binary_sensor;
sensor = [ sensor = [
{ platform = "speedtest"; { platform = "speedtestdotnet";
scan_interval.hours = 6;
monitored_conditions = [ "ping" "download" "upload" ]; monitored_conditions = [ "ping" "download" "upload" ];
} }
# https://www.home-assistant.io/cookbook/automation_for_rainy_days/ # https://www.home-assistant.io/cookbook/automation_for_rainy_days/

View File

@ -5,9 +5,10 @@
# Needs: # Needs:
# sensor.zigbee_btn1_click # sensor.zigbee_btn1_click
# notify.telegrambot # notify.signal_home
let let
button = "sensor.zigbee_btn2_click"; button = "sensor.zigbee_btn2_click";
notify = "notify.signal_home";
in in
{ {
services.home-assistant.config = { services.home-assistant.config = {
@ -56,7 +57,7 @@ in
data.duration = "00:05:00"; data.duration = "00:05:00";
} }
{ {
service = "notify.telegrambot"; service = notify;
data.message = "Timer gestartet {{state_attr('timer.kurzzeitwecker', 'remaining') }}, verbleibend "; data.message = "Timer gestartet {{state_attr('timer.kurzzeitwecker', 'remaining') }}, verbleibend ";
} }
]; ];
@ -79,7 +80,7 @@ in
entity_id = "script.add_5_minutes_to_kurzzeitwecker"; entity_id = "script.add_5_minutes_to_kurzzeitwecker";
} }
{ {
service = "notify.telegrambot"; service = notify;
data.message = ''Timer um 5 minuten verlängert, {{ state_attr('timer.kurzzeitwecker', 'remaining') | truncate(9,True," ") }} verbleibend ''; data.message = ''Timer um 5 minuten verlängert, {{ state_attr('timer.kurzzeitwecker', 'remaining') | truncate(9,True," ") }} verbleibend '';
} }
]; ];
@ -111,7 +112,7 @@ in
entity_id = "timer.kurzzeitwecker"; entity_id = "timer.kurzzeitwecker";
} }
{ {
service = "notify.telegrambot"; service = notify;
data.message = "Timer gestoppt, abgebrochen"; data.message = "Timer gestoppt, abgebrochen";
} }
]; ];
@ -125,7 +126,7 @@ in
}; };
action = [ action = [
{ {
service = "notify.telegrambot"; service = notify;
data.message = "Timer beendet"; data.message = "Timer beendet";
} }
]; ];

View File

@ -1,18 +1,6 @@
{
let imports = [
port = 8631; ./service.nix
image = "bbernhard/signal-cli-rest-api:latest"; ./hass.nix
config = "/var/lib/signal-cli-config";
in {
systemd.tmpfiles.rules = [
"d ${config} docker docker - -"
]; ];
state = [ config ];
virtualisation.oci-containers.containers.signal-rest = {
image = image;
ports = [ "127.0.0.1:${toString port}:8080" ];
volumes = [
"${config}:/home/.local/share/signal-cli"
];
};
} }

View File

@ -0,0 +1,20 @@
let
inherit (import <secrets/signal/messenger.nix>) number home felix;
in {
services.home-assistant.config.notify = [
{
name = "signal_home";
platform = "signal_messenger";
url = "http://127.0.0.1:8631";
inherit number ;
recipients = [ home ];
}
{
name = "signal_felix";
platform = "signal_messenger";
url = "http://127.0.0.1:8631";
inherit number;
recipients = [ felix ];
}
];
}

View File

@ -0,0 +1,25 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "pysignalclirestapi";
version = "0.3.14";
# disabled = ; # requires python version >=2.7
src = fetchPypi {
inherit pname version;
sha256 = "6f3626b594a53c4161dfc67ea7a3b23d62c8fe8cb404a909496118aeefa79cd0";
};
doCheck = false;
meta = with lib; {
description = "Small python library for the Signal Cli REST API";
homepage = https://github.com/bbernhard/pysignalclirestapi;
#license = licenses.;
# maintainers = [ maintainers. ];
};
}

View File

@ -0,0 +1,18 @@
let
port = 8631;
image = "bbernhard/signal-cli-rest-api:latest";
config = "/var/lib/signal-cli-config";
in {
systemd.tmpfiles.rules = [
"d ${config} docker docker - -"
];
state = [ config ];
virtualisation.oci-containers.containers.signal-rest = {
image = image;
ports = [ "127.0.0.1:${toString port}:8080" ];
volumes = [
"${config}:/home/.local/share/signal-cli"
];
};
}

View File

@ -40,7 +40,6 @@ in
log_output = [ "console" ]; log_output = [ "console" ];
last_seen = "ISO_8601"; last_seen = "ISO_8601";
elapsed = true; elapsed = true;
reporting = true; # TODO test if it is better with groups
pan_id = 6755; pan_id = 6755;
inherit (sec.zigbee) network_key; inherit (sec.zigbee) network_key;
}; };

View File

@ -21,20 +21,26 @@ in {
hardware.sane = { hardware.sane = {
enable = true; enable = true;
extraBackends = [ ]; extraBackends = [ ];
netConf = extraConfig.xerox_mfp = ''
# drucker.lan SCX-3205W usb 0x04e8 0x3441
'' '';
192.168.111.16'' #netConf =
# uhrenkind.shack magicolor 1690mf # # drucker.lan SCX-3205W
+ '' # ''
10.42.20.30''; # 192.168.111.16''
# # uhrenkind.shack magicolor 1690mf
#+ ''
# 10.42.20.30'';
# $ scanimage -p --format=jpg --mode=Gray --source="Automatic Document Feeder" -v --batch="lol%d.jpg" --resolution=150 ## $ scanimage -p --format=jpg --mode=Gray --source="Automatic Document Feeder" -v --batch="lol%d.jpg" --resolution=150
# requires 'sane-extra', scan via: ## requires 'sane-extra', scan via:
extraConfig."magicolor" = '' #extraConfig."magicolor" = ''
net 10.42.20.30 0x2098 # net 10.42.20.30 0x2098
''; # 10.42.20.30: uhrenkind.shack magicolor 1690mf #''; # 10.42.20.30: uhrenkind.shack magicolor 1690mf
}; };
state = [ "/var/lib/cups" ]; state = [ "/var/lib/cups" ];
services.udev.extraRules = ''
ATTRS{idVendor}=="04e8", ATTRS{idProduct}=="3441", ENV{libsane_matched}="yes"
'';
} }

View File

@ -1,5 +1,11 @@
{ { pkgs, ... }: {
systemd.services.brockman.environment."BROCKMAN_LOG_LEVEL" = "DEBUG"; systemd.services.brockman.environment."BROCKMAN_LOG_LEVEL" = "DEBUG";
systemd.services.restart-brockman = {
after = [ "brockman.service" ];
wantedBy = [ "multi-user.target" ];
startAt = "daily";
script = "${pkgs.systemd}/bin/systemctl try-restart brockman.service";
};
krebs.brockman = { krebs.brockman = {
enable = true; enable = true;
config = { config = {

View File

@ -17,5 +17,6 @@
gitAndTools.gitFull gitAndTools.gitFull
signal-desktop signal-desktop
# rambox # rambox
vscode
]; ];
} }

View File

@ -16,7 +16,6 @@
full = lib.makeOverridable pkgs.substituteAll { full = lib.makeOverridable pkgs.substituteAll {
name = "awesome_full_config"; name = "awesome_full_config";
inherit alsaUtils locker xbacklight modkey networkmanagerapplet blueman clipit flameshot ; inherit alsaUtils locker xbacklight modkey networkmanagerapplet blueman clipit flameshot ;
chaptermarker = chapter-marker;
isExecutable = false; isExecutable = false;
src = ./full.cfg; src = ./full.cfg;
}; };

View File

@ -303,16 +303,6 @@ globalkeys = awful.util.table.join(
awful.key({ modkey, }, "Right", awful.tag.viewnext ), awful.key({ modkey, }, "Right", awful.tag.viewnext ),
awful.key({ modkey, }, "Escape", awful.tag.history.restore), awful.key({ modkey, }, "Escape", awful.tag.history.restore),
awful.key({ modkey, }, "j",
function ()
awful.client.focus.byidx( 1)
if client.focus then client.focus:raise() end
end),
awful.key({ modkey, }, "k",
function ()
awful.client.focus.byidx(-1)
if client.focus then client.focus:raise() end
end),
awful.key({ modkey, }, "w", function () mymainmenu:show() end), awful.key({ modkey, }, "w", function () mymainmenu:show() end),
-- Layout manipulation -- Layout manipulation
@ -376,12 +366,6 @@ globalkeys = awful.util.table.join(
awful.key({ }, "XF86AudioMute", function () awful.key({ }, "XF86AudioMute", function ()
awful.util.spawn("@alsaUtils@/bin/amixer -q -D default sset Master toggle", false) end), awful.util.spawn("@alsaUtils@/bin/amixer -q -D default sset Master toggle", false) end),
-- chapter-marker
awful.key({ "Control" }, "u", function () awful.spawn("@chaptermarker@/bin/chapter-start") end,
{description = "start the chapter marker",}),
awful.key({ "Control" }, "j", function () awful.spawn("@chaptermarker@/bin/chapter-mark") end,
{description = "create a chapter mark",}),
-- Prompt -- Prompt
awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end, awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end,
{description = "run prompt", group = "launcher"}), {description = "run prompt", group = "launcher"}),
@ -485,12 +469,13 @@ root.keys(globalkeys)
-- {{{ Rules -- {{{ Rules
awful.rules.rules = { awful.rules.rules = {
-- All clients will match this rule. -- -- All clients will match this rule.
{ rule = { }, { rule = { },
properties = { border_width = beautiful.border_width, properties = { border_width = beautiful.border_width,
border_color = beautiful.border_normal, border_color = beautiful.border_normal,
focus = awful.client.focus.filter, focus = awful.client.focus.filter,
keys = clientkeys, keys = clientkeys,
screen = awful.screen.focused,
buttons = clientbuttons } }, buttons = clientbuttons } },
--{ rule = { class = "MPlayer" }, --{ rule = { class = "MPlayer" },
-- properties = { floating = true } }, -- properties = { floating = true } },

View File

@ -11,11 +11,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "studio-link-${version}"; name = "studio-link-${version}";
version = "20.05.5"; version = "21.03.2";
src = fetchurl { src = fetchurl {
url = "https://download.studio.link/releases/v${version}-stable/linux/studio-link-standalone-v${version}.tar.gz"; url = "https://download.studio.link/releases/v${version}-stable/linux/studio-link-standalone-v${version}.tar.gz";
sha256 = "0wmcvihyxf4xvgrspvy3qhhabczv86hdfcfq61jv51hfrzibc2q1"; sha256 = "0szaym9lrkbnwxaffab9snlsij6kkwlin70d36bm3vi2la8iayc6";
}; };
nativeBuildInputs = [ nativeBuildInputs = [