From 923fba39f444b157805bc7948fc2c6a7cd10c7a3 Mon Sep 17 00:00:00 2001 From: tiyn Date: Sun, 17 Mar 2024 22:52:40 +0100 Subject: [PATCH] local: changed and updated scripts --- .config/sxhkd/sxhkdrc | 16 ++-- .config/sxiv/exec/key-handler | 2 +- .local/bin/etc/{dmenupass => pw_menu} | 0 .local/bin/etc/sxhkd/audio/lmc | 79 ++++++++++++++----- .local/bin/etc/sxhkd/audio/mic_toggle | 10 --- .local/bin/etc/sxhkd/audio/sound_toggle | 10 --- .../change_keymap => etc/sxhkd/keymap_toggle} | 0 .../bin/{tools => etc/sxhkd}/monitor_toggle | 2 +- .../dmenumount => sxhkd/mounting/mount_menu} | 0 .../mounting/umount_menu} | 0 .../sxhkd/{screenshotmenu => screenshot_menu} | 0 .../bin/{tools => etc/sxhkd}/touchpad_toggle | 0 .local/bin/tools/{setbg => background_set} | 0 .local/bin/tools/{setlock => lock_set} | 0 .local/bin/tools/{sshmenu => ssh_menu} | 0 .../bin/tools/{samedir => terminal_parallel} | 0 .../bin/tools/{dmenuunicode => unicode_menu} | 0 .local/bin/tools/{vpnmenu => vpn_menu} | 0 .profile | 2 +- .xinitrc | 2 +- 20 files changed, 70 insertions(+), 53 deletions(-) rename .local/bin/etc/{dmenupass => pw_menu} (100%) delete mode 100755 .local/bin/etc/sxhkd/audio/mic_toggle delete mode 100755 .local/bin/etc/sxhkd/audio/sound_toggle rename .local/bin/{tools/change_keymap => etc/sxhkd/keymap_toggle} (100%) rename .local/bin/{tools => etc/sxhkd}/monitor_toggle (96%) rename .local/bin/etc/{dwm/dmenumount => sxhkd/mounting/mount_menu} (100%) rename .local/bin/etc/{dwm/dmenuumount => sxhkd/mounting/umount_menu} (100%) rename .local/bin/etc/sxhkd/{screenshotmenu => screenshot_menu} (100%) rename .local/bin/{tools => etc/sxhkd}/touchpad_toggle (100%) rename .local/bin/tools/{setbg => background_set} (100%) rename .local/bin/tools/{setlock => lock_set} (100%) rename .local/bin/tools/{sshmenu => ssh_menu} (100%) rename .local/bin/tools/{samedir => terminal_parallel} (100%) rename .local/bin/tools/{dmenuunicode => unicode_menu} (100%) rename .local/bin/tools/{vpnmenu => vpn_menu} (100%) diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index f88429c..844e6e6 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -29,12 +29,12 @@ super + m thunderbird super + bracketright - mic_toggle + lmc mute_toggle super + backslash - sound_toggle + lmc deaf_toggle super + shift + l - change_keymap + keymap_toggle super + shift + r pkill -usr1 -x sxhkd ; notify-send -u low 'SXHKD' 'Reloaded config' @@ -43,7 +43,7 @@ super + Return $TERMINAL Print - screenshotmenu + screenshot_menu super + shift + space dunstctl close-all @@ -53,9 +53,9 @@ super + F5 super + F6 touchpad_toggle super + F7 - dmenumount + mount_menu super + F8 - dmenuumount + umount_menu super + F9 sudo -A systemctl restart NetworkManager ; notify-send -u low 'Network' 'Restartet NM' super + F10 @@ -66,9 +66,9 @@ super + F12 prompt "Reboot computer?" "sudo -A reboot now" XF86AudioMute - sound_toggle + lmc deaf_toggle XF86AudioMicMute - mic_toggle + lmc mute_toggle XF86AudioLowerVolume lmc down XF86AudioRaiseVolume diff --git a/.config/sxiv/exec/key-handler b/.config/sxiv/exec/key-handler index 11050ea..67ba67e 100755 --- a/.config/sxiv/exec/key-handler +++ b/.config/sxiv/exec/key-handler @@ -2,7 +2,7 @@ while read file do case "$1" in - "w") setbg "$file" & ;; + "w") background_set "$file" & ;; "c") [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" ~/.config/bmdirs | awk '{print $2}' | dmenu -l 20 -i -p "Copy file(s) to where?" | sed "s|~|$HOME|g")" [ -z "$destdir" ] && exit diff --git a/.local/bin/etc/dmenupass b/.local/bin/etc/pw_menu similarity index 100% rename from .local/bin/etc/dmenupass rename to .local/bin/etc/pw_menu diff --git a/.local/bin/etc/sxhkd/audio/lmc b/.local/bin/etc/sxhkd/audio/lmc index 3b578ee..6bc2895 100755 --- a/.local/bin/etc/sxhkd/audio/lmc +++ b/.local/bin/etc/sxhkd/audio/lmc @@ -2,38 +2,75 @@ # A general audio interface for LARBS. # Based on a script by lukesmithxyz, checkout github.com/lukesmithxyz/voidrice +# Heavily extended and updated to a pipewire system [ -z "$2" ] && num="5" || num="$2" case "$1" in - up) wpctl set-volume @DEFAULT_AUDIO_SINK@ "$num"%+ ;; - down) wpctl set-volume @DEFAULT_AUDIO_SINK@ "$num"%- ;; - deaf) wpctl set-mute @DEFAULT_SINK@ 1;; - undeaf) wpctl set-mute @DEFAULT_SINK@ 0;; - mute) wpctl set-mute @DEFAULT_AUDIO_SOURCE@ 1;; - unmute) wpctl set-mute @DEFAULT_AUDIO_SOURCE@ 0;; - previous) playerctl previous;; - playpause) playerctl play-pause;; - next) playerctl next;; - shuffle) playerctl shuffle toggle;; - loop) playerctl loop none;; - *) cat << EOF + up) wpctl set-volume @DEFAULT_AUDIO_SINK@ "$num"%+ + pkill -RTMIN+4 $STATUSBAR ;; + down) wpctl set-volume @DEFAULT_AUDIO_SINK@ "$num"%- + pkill -RTMIN+4 $STATUSBAR ;; + deaf) wpctl set-mute @DEFAULT_SINK@ 1 + pkill -RTMIN+4 $STATUSBAR ;; + undeaf) wpctl set-mute @DEFAULT_SINK@ 0 + pkill -RTMIN+4 $STATUSBAR ;; + mute) wpctl set-mute @DEFAULT_AUDIO_SOURCE@ 1 + pkill -RTMIN+4 $STATUSBAR ;; + unmute) wpctl set-mute @DEFAULT_AUDIO_SOURCE@ 0 + pkill -RTMIN+4 $STATUSBAR ;; + deaf_toggle) + if amixer get Master | tail -2 | grep -q '\[on\]'; then + notify-send -u low 'sxhkd' 'Sound muted\nMicrophone muted' + lmc mute + lmc deaf + else + lmc mute + lmc undeaf + paplay ~/.local/bin/etc/sxhkd/audio/sound_resumed.wav + fi ;; + mute_toggle) + if amixer get Capture | tail -2 | grep -q '\[on\]'; then + lmc mute + lmc undeaf + paplay ~/.local/bin/etc/sxhkd/audio/mic_muted.wav + else + lmc unmute + lmc undeaf + paplay ~/.local/bin/etc/sxhkd/audio/mic_activated.wav + fi ;; + previous) playerctl previous + sleep 1 + pkill -RTMIN+9 $STATUSBAR ;; + playpause) playerctl play-pause + sleep 1 + pkill -RTMIN+9 $STATUSBAR ;; + next) playerctl next + sleep 1 + pkill -RTMIN+9 $STATUSBAR ;; + shuffle) playerctl shuffle toggle + sleep 1 + pkill -RTMIN+9 $STATUSBAR ;; + loop) playerctl loop none + sleep 1 + pkill -RTMIN+9 $STATUSBAR ;; + *) cat << EOF lmc: cli music interface for pulse for those with divine intellect too grand to remember the pamixer commands. Allowed options: up NUM Increase volume (5% default) down NUM Decrease volume (5% default) - mute mute microphone - unmute unmute microphone - deaf deaf sound - undeaf undeaf sound - previous play previous song in player - playpause toggle play or pause in player - next play next song in player + mute Mute microphone + unmute Unmute microphone + deaf Deaf sound + undeaf Undeaf sound + deaf_toggle Toggle between deaf and undeaf + mute_toggle Toggle between mute and unmute + previous Play previous song in player + playpause Toggle play or pause in player + next Play next song in player all else Print this message EOF esac -pkill -RTMIN+4 $STATUSBAR -sleep 1 && pkill -RTMIN+9 $STATUSBAR diff --git a/.local/bin/etc/sxhkd/audio/mic_toggle b/.local/bin/etc/sxhkd/audio/mic_toggle deleted file mode 100755 index 7c21fac..0000000 --- a/.local/bin/etc/sxhkd/audio/mic_toggle +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -if amixer get Capture | tail -2 | grep -q '\[on\]'; then - lmc mute - lmc undeaf - paplay ~/.local/bin/etc/sxhkd/audio/mic_muted.wav -else - lmc unmute - lmc undeaf - paplay ~/.local/bin/etc/sxhkd/audio/mic_activated.wav -fi diff --git a/.local/bin/etc/sxhkd/audio/sound_toggle b/.local/bin/etc/sxhkd/audio/sound_toggle deleted file mode 100755 index 7b8c057..0000000 --- a/.local/bin/etc/sxhkd/audio/sound_toggle +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -if amixer get Master | tail -2 | grep -q '\[on\]'; then - notify-send -u low 'sxhkd' 'Sound muted\nMicrophone muted' - lmc mute - lmc deaf -else - lmc mute - lmc undeaf - paplay ~/.local/bin/etc/sxhkd/audio/sound_resumed.wav -fi diff --git a/.local/bin/tools/change_keymap b/.local/bin/etc/sxhkd/keymap_toggle similarity index 100% rename from .local/bin/tools/change_keymap rename to .local/bin/etc/sxhkd/keymap_toggle diff --git a/.local/bin/tools/monitor_toggle b/.local/bin/etc/sxhkd/monitor_toggle similarity index 96% rename from .local/bin/tools/monitor_toggle rename to .local/bin/etc/sxhkd/monitor_toggle index 767dd3f..bb8601f 100755 --- a/.local/bin/tools/monitor_toggle +++ b/.local/bin/etc/sxhkd/monitor_toggle @@ -8,4 +8,4 @@ extern=HDMI2 (xrandr | grep "$extern disconnected") (xrandr --listactivemonitors | grep $extern) || ((xrandr --output $extern --right-of $intern --auto && setbg) & exit) (xrandr --listactivemonitors | grep $extern) && xrandr --output $extern --off -setbg +background_set diff --git a/.local/bin/etc/dwm/dmenumount b/.local/bin/etc/sxhkd/mounting/mount_menu similarity index 100% rename from .local/bin/etc/dwm/dmenumount rename to .local/bin/etc/sxhkd/mounting/mount_menu diff --git a/.local/bin/etc/dwm/dmenuumount b/.local/bin/etc/sxhkd/mounting/umount_menu similarity index 100% rename from .local/bin/etc/dwm/dmenuumount rename to .local/bin/etc/sxhkd/mounting/umount_menu diff --git a/.local/bin/etc/sxhkd/screenshotmenu b/.local/bin/etc/sxhkd/screenshot_menu similarity index 100% rename from .local/bin/etc/sxhkd/screenshotmenu rename to .local/bin/etc/sxhkd/screenshot_menu diff --git a/.local/bin/tools/touchpad_toggle b/.local/bin/etc/sxhkd/touchpad_toggle similarity index 100% rename from .local/bin/tools/touchpad_toggle rename to .local/bin/etc/sxhkd/touchpad_toggle diff --git a/.local/bin/tools/setbg b/.local/bin/tools/background_set similarity index 100% rename from .local/bin/tools/setbg rename to .local/bin/tools/background_set diff --git a/.local/bin/tools/setlock b/.local/bin/tools/lock_set similarity index 100% rename from .local/bin/tools/setlock rename to .local/bin/tools/lock_set diff --git a/.local/bin/tools/sshmenu b/.local/bin/tools/ssh_menu similarity index 100% rename from .local/bin/tools/sshmenu rename to .local/bin/tools/ssh_menu diff --git a/.local/bin/tools/samedir b/.local/bin/tools/terminal_parallel similarity index 100% rename from .local/bin/tools/samedir rename to .local/bin/tools/terminal_parallel diff --git a/.local/bin/tools/dmenuunicode b/.local/bin/tools/unicode_menu similarity index 100% rename from .local/bin/tools/dmenuunicode rename to .local/bin/tools/unicode_menu diff --git a/.local/bin/tools/vpnmenu b/.local/bin/tools/vpn_menu similarity index 100% rename from .local/bin/tools/vpnmenu rename to .local/bin/tools/vpn_menu diff --git a/.profile b/.profile index 164a63b..2687ddd 100644 --- a/.profile +++ b/.profile @@ -36,7 +36,7 @@ export NOTMUCH_CONFIG="${XDG_CONFIG_HOME}/notmuch-config" export NPM_CONFIG_USERCONFIG="${XDG_CONFIG_HOME}/npm/npmrc" export NUGET_PACKAGES="${XDG_CACHE_HOME}/nugetpackages" export PASSWORD_STORE_DIR="${XDG_DATA_HOME}/pass" -export SUDO_ASKPASS="${HOME}/.local/bin/tools/dmenupass" +export SUDO_ASKPASS="${HOME}/.local/bin/tools/pw_menu" export TMUX_TMPDIR="${XDG_CACHE_HOME}/tmux" export WGETRC="${XDG_CONFIG_HOME}/wgetrc" export ZDOTDIR="${XDG_CONFIG_HOME}/zsh" diff --git a/.xinitrc b/.xinitrc index c370b59..39a5360 100644 --- a/.xinitrc +++ b/.xinitrc @@ -7,7 +7,7 @@ xrandr --auto [ -f "$HOME/.config/xorg/xdefaults" ] && xrdb -merge "$HOME/.config/xorg/xdefaults" # global resources [ -f "$HOME/.config/xorg/xpcspec" ] && xrdb -merge "$HOME/.config/xorg/xpcspec" # local resources -setbg +background_set csum="" new_csum=$(sha1sum $(which dwm))