From: Christian Heller Date: Mon, 24 Mar 2025 06:49:08 +0000 (+0100) Subject: Reorganize. X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/%22https:/validator.w3.org/calendar?a=commitdiff_plain;h=3039e12a72cd269c21d4d3d0ce667a2355cb8572;p=config Reorganize. --- diff --git a/testing/home/all/.bashrc b/testing/home/all/.bashrc index 115837e..636c408 100644 --- a/testing/home/all/.bashrc +++ b/testing/home/all/.bashrc @@ -25,5 +25,5 @@ PS3="${tput_color}select: ${tput_reset}" PS4="${tput_color}+ ${tput_reset}" # include others -. "${HOME}/.nonpath_bins/plomlib.file_dot_variants" +. "${HOME}/.plomlib.sh/file_dot_variants" file_dot_variants "${HOME}/\.bashrc" diff --git a/testing/home/all/.nonpath_bins/plomlib.file_dot_variants b/testing/home/all/.nonpath_bins/plomlib.file_dot_variants deleted file mode 100644 index 1c1bf69..0000000 --- a/testing/home/all/.nonpath_bins/plomlib.file_dot_variants +++ /dev/null @@ -1,7 +0,0 @@ -file_dot_variants() { - for FILE in ${1}\.*; do - if [ -f "${FILE}" ]; then - . "${FILE}" - fi - done -} diff --git a/testing/home/all/.plomlib.sh/file_dot_variants b/testing/home/all/.plomlib.sh/file_dot_variants new file mode 100644 index 0000000..1c1bf69 --- /dev/null +++ b/testing/home/all/.plomlib.sh/file_dot_variants @@ -0,0 +1,7 @@ +file_dot_variants() { + for FILE in ${1}\.*; do + if [ -f "${FILE}" ]; then + . "${FILE}" + fi + done +} diff --git a/testing/home/all/.profile b/testing/home/all/.profile index 02e3771..13fa422 100644 --- a/testing/home/all/.profile +++ b/testing/home/all/.profile @@ -16,5 +16,5 @@ PATH_LOCAL_BIN="${HOME}/.local/bin" export PATH # include others -. "${HOME}/.nonpath_bins/plomlib.file_dot_variants" +. "${HOME}/.plomlib.sh/file_dot_variants" file_dot_variants "${HOME}/\.profile" diff --git a/testing/home/desktop/.local/bin/borgplom b/testing/home/desktop/.local/bin/borgplom index d9511b4..477ecf6 100755 --- a/testing/home/desktop/.local/bin/borgplom +++ b/testing/home/desktop/.local/bin/borgplom @@ -1,7 +1,7 @@ #!/bin/sh set -e -. "${HOME}/.nonpath_bins/plomlib.get_passphrase" +. "${HOME}/.plomlib.sh/get_passphrase" PATH_BORGKEYS="${HOME}/.config/borg/keys" NAME_REPO=borg diff --git a/testing/home/desktop/.local/bin/vol b/testing/home/desktop/.local/bin/vol index cf49262..bae15e4 100755 --- a/testing/home/desktop/.local/bin/vol +++ b/testing/home/desktop/.local/bin/vol @@ -1,7 +1,7 @@ #!/bin/sh set -e -. "${HOME}/.nonpath_bins/plomlib.audio_dev_is_mute" +. "${HOME}/.plomlib.sh/audio_dev_is_mute" MAX_LOUDNESS=150 diff --git a/testing/home/desktop/.nonpath_bins/plomlib.audio_dev_is_mute b/testing/home/desktop/.nonpath_bins/plomlib.audio_dev_is_mute deleted file mode 100644 index e28da40..0000000 --- a/testing/home/desktop/.nonpath_bins/plomlib.audio_dev_is_mute +++ /dev/null @@ -1,3 +0,0 @@ -audio_dev_is_mute() { - [ "$(pactl get-sink-mute 0)" = "Mute: yes" ] -} diff --git a/testing/home/desktop/.nonpath_bins/plomlib.get_passphrase b/testing/home/desktop/.nonpath_bins/plomlib.get_passphrase deleted file mode 100644 index 6e3f0ff..0000000 --- a/testing/home/desktop/.nonpath_bins/plomlib.get_passphrase +++ /dev/null @@ -1,6 +0,0 @@ -get_passphrase() { - stty -echo - read PASSPHRASE - stty echo - printf "${PASSPHRASE}" -} diff --git a/testing/home/desktop/.plomlib.sh/audio_dev_is_mute b/testing/home/desktop/.plomlib.sh/audio_dev_is_mute new file mode 100644 index 0000000..e28da40 --- /dev/null +++ b/testing/home/desktop/.plomlib.sh/audio_dev_is_mute @@ -0,0 +1,3 @@ +audio_dev_is_mute() { + [ "$(pactl get-sink-mute 0)" = "Mute: yes" ] +} diff --git a/testing/home/desktop/.plomlib.sh/get_passphrase b/testing/home/desktop/.plomlib.sh/get_passphrase new file mode 100644 index 0000000..6e3f0ff --- /dev/null +++ b/testing/home/desktop/.plomlib.sh/get_passphrase @@ -0,0 +1,6 @@ +get_passphrase() { + stty -echo + read PASSPHRASE + stty echo + printf "${PASSPHRASE}" +} diff --git a/testing/home/t490s/.nonpath_bins/status.sh b/testing/home/t490s/.nonpath_bins/status.sh index 9794d2e..379ef4a 100755 --- a/testing/home/t490s/.nonpath_bins/status.sh +++ b/testing/home/t490s/.nonpath_bins/status.sh @@ -2,7 +2,7 @@ # see sway-bar(5) and swaybar-protocol(7) set -e -. "${HOME}/.nonpath_bins/plomlib.audio_dev_is_mute" +. "${HOME}/.plomlib.sh/audio_dev_is_mute" SYSCLASS_DIR=/sys/class diff --git a/testing/scripts/setup_secrets.sh b/testing/scripts/setup_secrets.sh index 6135927..224ac7e 100755 --- a/testing/scripts/setup_secrets.sh +++ b/testing/scripts/setup_secrets.sh @@ -14,7 +14,7 @@ cd $(dirname "$0") # - PATH_USER_HOME # - USERNAME -. "${PATH_USER_HOME}/.nonpath_bins/plomlib.get_passphrase" +. "${PATH_USER_HOME}/.plomlib.sh/get_passphrase" PATH_REL_SECRETS=to_usb export PATH_SECRETS="${PATH_USER_HOME}/${PATH_REL_SECRETS}"