summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2022-12-24 23:58:59 +0100
committermakefu <github@syntax-fehler.de>2022-12-24 23:58:59 +0100
commited1690d79318d61b10a8ea881989a4d2708c9b42 (patch)
treed6f7fb35927b08fe82a4418fd1830384183de65b /makefu/2configs
parent2f14e6f8426c2b817aa1bcafd4a21e2b977cd64f (diff)
ma home: enable minidlna for testing, cleanup
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/home/3dprint.nix2
-rw-r--r--makefu/2configs/home/ham/automation/urlaub.nix12
-rw-r--r--makefu/2configs/home/ham/media/arbeitszimmer_matrix.nix6
-rw-r--r--makefu/2configs/home/music.nix10
4 files changed, 16 insertions, 14 deletions
diff --git a/makefu/2configs/home/3dprint.nix b/makefu/2configs/home/3dprint.nix
index 859a18840..09f2ce6fd 100644
--- a/makefu/2configs/home/3dprint.nix
+++ b/makefu/2configs/home/3dprint.nix
@@ -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 ];
diff --git a/makefu/2configs/home/ham/automation/urlaub.nix b/makefu/2configs/home/ham/automation/urlaub.nix
index 7f47c9da5..019e65d25 100644
--- a/makefu/2configs/home/ham/automation/urlaub.nix
+++ b/makefu/2configs/home/ham/automation/urlaub.nix
@@ -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:
diff --git a/makefu/2configs/home/ham/media/arbeitszimmer_matrix.nix b/makefu/2configs/home/ham/media/arbeitszimmer_matrix.nix
index 26fec370f..11d13886e 100644
--- a/makefu/2configs/home/ham/media/arbeitszimmer_matrix.nix
+++ b/makefu/2configs/home/ham/media/arbeitszimmer_matrix.nix
@@ -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") ++ [
diff --git a/makefu/2configs/home/music.nix b/makefu/2configs/home/music.nix
index 205b47fec..f3b9f50f1 100644
--- a/makefu/2configs/home/music.nix
+++ b/makefu/2configs/home/music.nix
@@ -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" ];
+ };
}