Merge remote-tracking branch 'gum/master'

This commit is contained in:
lassulus 2022-12-25 01:24:17 +01:00
commit 6e13334579
8 changed files with 54 additions and 19 deletions

View File

@ -9,7 +9,7 @@
# also ensure that the webcam always comes up under the same name
services.udev.extraRules = ''
SUBSYSTEM=="vchiq",GROUP="video",MODE="0660"
SUBSYSTEM=="video4linux", ATTR{name}=="UVC Camera (046d:0825)",SYMLINK+="web_cam", MODE="0666", GROUP="video"
KERNEL=="video*",ATTRS{vendor}=="0x046d", ATTRS{device}=="0x0825", GROUP="video", SYMLINK+="web_cam"
'';
systemd.services.octoprint = {
path = [ pkgs.libraspberrypi ];

View File

@ -0,0 +1,32 @@
{
services.home-assistant.config.script = {
find_felix_phone.sequence = [
{
service = "notify.mobile_app_pixel_3a";
data = {
title= "Finde Mich!";
message= "Such Such Such";
data = {
ttl = 0;
priority = "high";
channel = "alarm_stream";
};
};
}
];
find_tablet.sequence = [
{
service = "notify.mobile_app_nova3";
data = {
title = "Finde Mich!";
message = "Such Such Such";
data = {
ttl = 0;
priority = "high";
channel = "alarm_stream";
};
};
}
];
};
}

View File

@ -11,18 +11,6 @@ let
weihnachtslicht = "light.wohnzimmer_fenster_lichterkette_licht";
fernsehlicht = "light.wled";
all_lights = [
schranklicht weihnachtslicht fernsehlicht
# extra lights to also turn off
# wohnzimmer
"light.wohnzimmer_komode_osram"
"light.wohnzimmer_stehlampe_osram"
# arbeitszimmer
"light.wled_4"
"light.arbeitszimmer_schrank_dimmer"
"light.arbeitszimmer_pflanzenlicht"
];
final_off = "00:37";
turn_on = entity_id: offset:

View File

@ -44,9 +44,10 @@ in {
./automation/wohnzimmer_rf_fernbedienung.nix
# ./automation/ladestecker_timer.nix
./automation/flurlicht.nix
./automation/giesskanne.nix
./automation/pflanzen_giessen_erinnerung.nix
# ./automation/urlaub.nix
# ./automation/giesskanne.nix
# ./automation/pflanzen_giessen_erinnerung.nix
./automation/find_phone.nix
./automation/urlaub.nix
./automation/moodlight.nix
./automation/shutdown_button.nix
./automation/project_tracker.nix

View File

@ -63,6 +63,12 @@ in
(remote_action "b9" [ { service = "rest_command.good_song"; } ])
(remote_action "b10" [ { service = "rest_command.bad_song"; } ])
(remote_action "b11" [
{
service = "script.turn_on";
target.entity_id = "script.find_felix_phone";
}
])
(remote_action "3"
((say "Starte Lass") ++ [

View File

@ -9,7 +9,8 @@ in
MusicFolder = "/media/cryptX/music/kinder";
Address = "0.0.0.0";
};
systemd.services.navidrome.after = [ "media-cryptX.mount" ];
systemd.services.navidrome.after = [ "media-cryptX.mount" "cryptsetup.target"
"local-fs.target" "remote-fs.target" ];
state = [ "/var/lib/navidrome" ];
# networking.firewall.allowedTCPPorts = [ 4040 ];
@ -27,4 +28,11 @@ in
locations."/".proxyWebsockets = true;
};
networking.firewall.allowedTCPPorts = [ port ];
# also configure dlna
services.minidlna.enable = true;
services.minidlna.settings = {
inotify = "yes";
friendly_name = "omo";
media_dir = [ "A,/media/cryptX/music" ];
};
}

View File

@ -1,6 +1,6 @@
{
imports = [
./android-pentest.nix
# ./android-pentest.nix
./consoles.nix
./core-gui.nix
./core.nix

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
owner = "hippie68";
repo = "pkgrename";
rev = "c7c95f0ea49324433db4a7df8db8b0905198e62e";
sha256 = "0cphxdpj04h1i0qf5mji3xqdsbyilvd5b4gwp4vx914r6k5f0xf3";
sha256 = "komFm9VRdH4DPxcnHzbm/sGVEWMbfcvFPLEFdbU/K5g=";
};
buildInputs = [ curl.dev ];