diff --git a/apps/default_commands.sh b/apps/default_commands.sh index 36fd28a..87b9b8c 100644 --- a/apps/default_commands.sh +++ b/apps/default_commands.sh @@ -15,18 +15,13 @@ all(){ sleep .2 xdotool key Left ;; - "split_up") + "split_up" | "split_down") debug "no op" ;; - "split_down") - echo "downstairs lights off" - source "$ROOT/.env" - curl -X POST -d '' $DOWNSTAIRS_LIGHTS_OFF - ;; "back") - echo "downstairs lights off" + echo "toggling livingroom lights" source "$ROOT/.env" - curl -X POST -d '' $DOWNSTAIRS_LIGHTS_OFF + curl -X POST -d '' $LIVINGROOM_LIGHTS_ENDPOINT ;; "forward") echo "toggling kitchen lights" @@ -34,15 +29,10 @@ all(){ curl -X POST -d '' $KITCHEN_LIGHTS_ENDPOINT ;; "split_right") - echo "toggling kitchen lights" - source "$ROOT/.env" - curl -X POST -d '' $KITCHEN_LIGHTS_ENDPOINT + bluetoothctl disconnect 4C:B9:9B:11:4B:31 ;; "split_left") - #toggle_res - echo "toggling livingroom lights" - source "$ROOT/.env" - curl -X POST -d '' $LIVINGROOM_LIGHTS_ENDPOINT + toggle_res ;; ### top buttons diff --git a/apps/firefox.sh b/apps/firefox.sh index d96385b..01bfc04 100644 --- a/apps/firefox.sh +++ b/apps/firefox.sh @@ -15,6 +15,10 @@ firefox_youtube(){ sleep .2 xdotool key k } + # kiosk + split_right(){ + xdotool key F11 + } # go to yt.com in shared container desktop(){ helpers @@ -36,13 +40,14 @@ firefox_youtube(){ } firefox_pbs(){ + firefox_init split_up(){ - xdotool mousemove 900 900 + xdotool mousemove 500 300 xdotool click 1 click 1 } play(){ - xdotool mousemove 900 900 + xdotool mousemove 500 300 xdotool click 1 } desktop(){ diff --git a/cec.sh b/cec.sh index 7876c00..e265e17 100755 --- a/cec.sh +++ b/cec.sh @@ -1,18 +1,15 @@ #!/bin/bash tv_on() { - echo "on 0" > /run/cec.fifo + cec-ctl --to 0 --image-view-on echo "on">~/scripts/PJ/tv_state - curl -X POST -d '' $REPORT_TV_ON } tv_off() { - echo "standby 0" > /run/cec.fifo + cec-ctl --to 0 --standby echo "off">~/scripts/PJ/tv_state - curl -X POST -d '' $REPORT_TV_OFF } -ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -source "$ROOT/.env" + if [[ -z "$1" ]]; then if grep -q off ~/scripts/PJ/tv_state; then tv_on diff --git a/nix/cec.nix b/nix/cec.nix deleted file mode 100644 index 6251fa5..0000000 --- a/nix/cec.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ pkgs, ... }: -{ - boot.kernelModules = [ "cec" ]; - - environment.systemPackages = with pkgs; [ - libcec - ]; - - services.udev.extraRules = '' - # Pulse-Eight CEC adapter - SUBSYSTEM=="tty" ACTION=="add" ATTRS{manufacturer}=="Pulse-Eight" ATTRS{product}=="CEC Adapter" GROUP="video" MODE="0660" - ''; - - systemd.sockets."cec-client" = { - wantedBy = [ "sockets.target" ]; - socketConfig = { - ListenFIFO = "/run/cec.fifo"; - SocketGroup = "video"; - SocketMode = "0660"; - }; - }; - - systemd.services."cec-client" = { - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = ''${pkgs.libcec}/bin/cec-client -d 1 -o /dev/ttyACM0''; - ExecStop = ''/bin/sh -c "echo q > /run/cec.fifo"''; - StandardInput = "socket"; - StandardOutput = "journal"; - Restart = "on-failure"; - }; - }; -}