diff options
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/2configs/home/3dprint.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/home/ham/automation/find_phone.nix | 32 | ||||
| -rw-r--r-- | makefu/2configs/home/ham/automation/urlaub.nix | 12 | ||||
| -rw-r--r-- | makefu/2configs/home/ham/default.nix | 7 | ||||
| -rw-r--r-- | makefu/2configs/home/ham/media/arbeitszimmer_matrix.nix | 6 | ||||
| -rw-r--r-- | makefu/2configs/home/music.nix | 10 | ||||
| -rw-r--r-- | makefu/2configs/tools/all.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/tools/init-host/default.nix | 1 | ||||
| -rw-r--r-- | makefu/5pkgs/pkgrename/default.nix | 2 |
9 files changed, 54 insertions, 20 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/find_phone.nix b/makefu/2configs/home/ham/automation/find_phone.nix new file mode 100644 index 000000000..d94942c9f --- /dev/null +++ b/makefu/2configs/home/ham/automation/find_phone.nix @@ -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"; + }; + }; + } + ]; + }; +} 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/default.nix b/makefu/2configs/home/ham/default.nix index 861ec27aa..ca5fcd17c 100644 --- a/makefu/2configs/home/ham/default.nix +++ b/makefu/2configs/home/ham/default.nix @@ -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 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" ]; + }; } diff --git a/makefu/2configs/tools/all.nix b/makefu/2configs/tools/all.nix index 37673768a..3086a0bb2 100644 --- a/makefu/2configs/tools/all.nix +++ b/makefu/2configs/tools/all.nix @@ -1,6 +1,6 @@ { imports = [ - ./android-pentest.nix + # ./android-pentest.nix ./consoles.nix ./core-gui.nix ./core.nix diff --git a/makefu/2configs/tools/init-host/default.nix b/makefu/2configs/tools/init-host/default.nix index d1d3f7195..84f8e7730 100644 --- a/makefu/2configs/tools/init-host/default.nix +++ b/makefu/2configs/tools/init-host/default.nix @@ -23,7 +23,6 @@ pkgs.writeDashBin "generate-secrets" '' cat <<EOF $HOSTNAME = { - cores = 1; owner = config.krebs.users.makefu; nets = { retiolum = { diff --git a/makefu/5pkgs/pkgrename/default.nix b/makefu/5pkgs/pkgrename/default.nix index c0944b03c..1b5ecc486 100644 --- a/makefu/5pkgs/pkgrename/default.nix +++ b/makefu/5pkgs/pkgrename/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "hippie68"; repo = "pkgrename"; rev = "c7c95f0ea49324433db4a7df8db8b0905198e62e"; - sha256 = "0cphxdpj04h1i0qf5mji3xqdsbyilvd5b4gwp4vx914r6k5f0xf3"; + sha256 = "komFm9VRdH4DPxcnHzbm/sGVEWMbfcvFPLEFdbU/K5g="; }; buildInputs = [ curl.dev ]; |