diff --git a/de/home/.config/eww/modules/bar/workspaces.yuck b/de/home/.config/eww/modules/bar/workspaces.yuck index 55890cb..0299852 100644 --- a/de/home/.config/eww/modules/bar/workspaces.yuck +++ b/de/home/.config/eww/modules/bar/workspaces.yuck @@ -1,5 +1,5 @@ (deflisten workspacesArray :initial "${[{"name": "placeholder","focused":true}]}" - 'scripts/bar/getworkspaces') + 'scripts/bar/workspaces') (defwidget workspaces [array] (box :class "workspaces" diff --git a/de/home/.config/eww/modules/home/rat.yuck b/de/home/.config/eww/modules/home/rat.yuck index 9bf4abc..31bf25d 100644 --- a/de/home/.config/eww/modules/home/rat.yuck +++ b/de/home/.config/eww/modules/home/rat.yuck @@ -1,5 +1,5 @@ (defpoll rat_image :interval "60s" - 'scripts/widgets/randomrat') + 'scripts/home/randomrat') (defwidget rat [] (box :class "rat" diff --git a/de/home/.config/eww/modules/home/weather.yuck b/de/home/.config/eww/modules/home/weather.yuck index d131251..d3eb7c2 100644 --- a/de/home/.config/eww/modules/home/weather.yuck +++ b/de/home/.config/eww/modules/home/weather.yuck @@ -1,6 +1,6 @@ -(defpoll weather_status :initial "{}" +(defpoll weather_status :initial "{'condition':'loading...','current_temp':'--','feels_temp':'--','min_temp':'--','max_temp':'--','humidity':'--','icon':' ','updated':'loading...'}" :interval "3600s" - 'scripts/widgets/weather') + 'scripts/home/weather') (defwidget weather [json] (box :class "weather" diff --git a/de/home/.config/eww/scripts/bar/bt-devices b/de/home/.config/eww/scripts/bar/bt-devices deleted file mode 100755 index 3c6ef49..0000000 --- a/de/home/.config/eww/scripts/bar/bt-devices +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -device_mac_list=$(bluetoothctl devices Paired | awk '{print $2}') -device_json_array=() - -for m in ${device_mac_list};do - device_name="$(bluetoothctl info ${m} | grep 'Name: ' | sed 's/.*Name: //')" - device_connected="$(bluetoothctl info ${m} | grep 'Connected: ' | sed 's/.*Connected: //')" - device_icon="$(bluetoothctl info ${m} | grep 'Icon: ' | sed 's/.*Icon: //')" - case "${device_icon}" in - "input-mouse") - device_icon="🖯" - ;; - "phone") - device_icon="" - ;; - "input-keyboard") - device_icon="" - ;; - "input-gaming") - device_icon="" - ;; - "audio-headphones") - device_icon="" - ;; - "audio-headset") - device_icon="" - ;; - "computer") - device_icon="" - ;; - esac - device_json=$( jq -n --arg name "${device_name}" --arg connected "${device_connected}" --arg icon "${device_icon}" --arg address "${m}" '{name: $name, connected: $connected, icon: $icon, address: $address}') - device_json_array+=("${device_json}") - -done -#printf '%s\n' "${device_json_array[@]}" -#printf '%s\n' "${device_json_array[@]}" | jq -s . -devices_json=$(printf '%s\n' "${device_json_array[@]}" | jq -s .) -#devices=$(echo "${device_json_array[@]}" | jq '.') -#(echo '[{"name":"mouse"},{"name":"headphones"}]' | jq '.') -echo ${devices_json} diff --git a/de/home/.config/eww/scripts/bar/bt-status b/de/home/.config/eww/scripts/bar/bt-status deleted file mode 100755 index 3851ec4..0000000 --- a/de/home/.config/eww/scripts/bar/bt-status +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -connected_devices="$(bluetoothctl devices Connected)" - -if [ "${#connected_devices}" -gt "0" ];then - bt_status='true' -else - bt_status='false' -fi - -printf '%s' "${bt_status}" diff --git a/de/home/.config/eww/scripts/bar/inhibit-status b/de/home/.config/eww/scripts/bar/inhibit-status deleted file mode 100755 index cfe3b12..0000000 --- a/de/home/.config/eww/scripts/bar/inhibit-status +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -inhibit_active='false' -if ps aux | grep eww-idle-inhibit | grep -qv grep;then - inhibit_active='true' -fi - -printf '%s' "${inhibit_active}" diff --git a/de/home/.config/eww/scripts/bar/network-status b/de/home/.config/eww/scripts/bar/network-status deleted file mode 100755 index 21d0ab7..0000000 --- a/de/home/.config/eww/scripts/bar/network-status +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -network_status='false' - -if nmcli -g TYPE connection show --active | grep -q "${1}";then - network_status='true' -fi - -printf '%s' "${network_status}" diff --git a/de/home/.config/eww/scripts/bar/getworkspaces b/de/home/.config/eww/scripts/bar/workspaces similarity index 100% rename from de/home/.config/eww/scripts/bar/getworkspaces rename to de/home/.config/eww/scripts/bar/workspaces diff --git a/de/home/.config/eww/scripts/widgets/randomrat b/de/home/.config/eww/scripts/home/randomrat similarity index 100% rename from de/home/.config/eww/scripts/widgets/randomrat rename to de/home/.config/eww/scripts/home/randomrat diff --git a/de/home/.config/eww/scripts/widgets/weather b/de/home/.config/eww/scripts/home/weather similarity index 100% rename from de/home/.config/eww/scripts/widgets/weather rename to de/home/.config/eww/scripts/home/weather diff --git a/de/home/.config/eww/scripts/widgets/weather-icon b/de/home/.config/eww/scripts/home/weather-icon similarity index 100% rename from de/home/.config/eww/scripts/widgets/weather-icon rename to de/home/.config/eww/scripts/home/weather-icon diff --git a/de/home/.config/katerc b/de/home/.config/katerc index 57e5b1a..a4683a9 100644 --- a/de/home/.config/katerc +++ b/de/home/.config/katerc @@ -169,8 +169,8 @@ SetEditor=false 1920x1200 screen: Width=1890 2 screens: Height=1118 2 screens: Width=555 -3 screens: Height=248 -3 screens: Width=1578 +3 screens: Height=669 +3 screens: Width=837 [filetree] editShade=183,220,246