diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/systemd/user/timers.target.wants/update-conky.timer b/.linux_items/include_x/airootfs/etc/skel/.config/systemd/user/timers.target.wants/update-conky.timer new file mode 120000 index 00000000..dc3ece34 --- /dev/null +++ b/.linux_items/include_x/airootfs/etc/skel/.config/systemd/user/timers.target.wants/update-conky.timer @@ -0,0 +1 @@ +../update-conky.timer \ No newline at end of file diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.service b/.linux_items/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.service new file mode 100644 index 00000000..d2048e93 --- /dev/null +++ b/.linux_items/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.service @@ -0,0 +1,6 @@ +[Unit] +Description=Conky config update service + +[Service] +Type=oneshot +ExecStart=%h/.update_conky diff --git a/.linux_items/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.timer b/.linux_items/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.timer new file mode 100644 index 00000000..c742a10a --- /dev/null +++ b/.linux_items/include_x/airootfs/etc/skel/.config/systemd/user/update-conky.timer @@ -0,0 +1,10 @@ +[Unit] +Description=Conky config update timer + +[Timer] +OnBootSec=5s +OnUnitActiveSec=30s +Unit=update-conky.service + +[Install] +WantedBy=timers.target diff --git a/.linux_items/include_x/airootfs/etc/skel/.conkyrc b/.linux_items/include_x/airootfs/etc/skel/.conkyrc_base similarity index 100% rename from .linux_items/include_x/airootfs/etc/skel/.conkyrc rename to .linux_items/include_x/airootfs/etc/skel/.conkyrc_base diff --git a/.linux_items/include_x/airootfs/etc/skel/.update_conky b/.linux_items/include_x/airootfs/etc/skel/.update_conky index 79801d8b..0e45e13d 100755 --- a/.linux_items/include_x/airootfs/etc/skel/.update_conky +++ b/.linux_items/include_x/airootfs/etc/skel/.update_conky @@ -1,18 +1,24 @@ #!/bin/bash -IF_LIST=($(ip l | egrep '^[0-9]+:\s+(eth|en|wl)' | sed -r 's/^[0-9]+:\s+(\w+):.*/\1/' | sort)) +IF_LIST=($(ip l \ + | egrep '^[0-9]+:\s+(eth|en|wl)' \ + | sed -r 's/^[0-9]+:\s+(\w+):.*/\1/' \ + | sort)) + +# Reset conkyrc to default +rm "${HOME}/.conkyrc" +cp "${HOME}/.conkyrc_base" "${HOME}/.conkyrc" # Add interfaces to conkyrc -if fgrep '#Network' $HOME/.conkyrc; then - for i in "${IF_LIST[@]}"; do - if [[ "${i:0:1}" == "e" ]]; then - sed -i -r "s/#Network/Wired:\${alignr}\${addr $i}\n#Network/" $HOME/.conkyrc - else - sed -i -r "s/#Network/Wireless:\${alignr}\${addr $i}\n#Network/" $HOME/.conkyrc - fi - done +for i in "${IF_LIST[@]}"; do + if [[ "${i:0:1}" == "e" ]]; then + sed -i -r "s/#Network/Wired:\${alignr}\${addr $i}\n#Network/" $HOME/.conkyrc + else + sed -i -r "s/#Network/Wireless:\${alignr}\${addr $i}\n#Network/" $HOME/.conkyrc + fi +done - # Remove '#Network' line to prevent duplicating lines if this script is re-run - sed -i -r "s/#Network//" $HOME/.conkyrc -fi +# Remove '#Network' line to prevent duplicating lines if this script is re-run +sed -i -r "s/#Network//" $HOME/.conkyrc +# vim: sts=2 sw=2 ts=2