style: make shell scripts follow shfmt

This commit is contained in:
Swarsel 2024-12-10 18:19:28 +01:00
parent 2a4740b6c9
commit 437bc79968
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
11 changed files with 167 additions and 139 deletions

View file

@ -1535,11 +1535,13 @@ This app allows me, in conjunction with my Yubikey, to quickly enter passwords w
typeit=0 typeit=0
while :; do while :; do
case ${1:-} in case ${1:-} in
-t|--type) typeit=1 -t | --type)
typeit=1
;; ;;
-o|--otp) otp=1 -o | --otp)
otp=1
;; ;;
,*) break ,*) break ;;
esac esac
shift shift
done done
@ -1561,13 +1563,19 @@ This app allows me, in conjunction with my Yubikey, to quickly enter passwords w
if [[ $typeit -eq 0 ]]; then if [[ $typeit -eq 0 ]]; then
pass show -c "$password" &> /tmp/pass-fuzzel pass show -c "$password" &> /tmp/pass-fuzzel
else else
pass show "$password" | { IFS= read -r pass; printf %s "$pass"; } | wtype - pass show "$password" | {
IFS= read -r pass
printf %s "$pass"
} | wtype -
fi fi
else else
if [[ $typeit -eq 0 ]]; then if [[ $typeit -eq 0 ]]; then
pass otp -c "$password" &> /tmp/pass-fuzzel pass otp -c "$password" &> /tmp/pass-fuzzel
else else
pass otp "$password" | { IFS= read -r pass; printf %s "$pass"; } | wtype - pass otp "$password" | {
IFS= read -r pass
printf %s "$pass"
} | wtype -
fi fi
fi fi
notify-send -u critical -a pass -t 1000 "Copied/Typed Password" notify-send -u critical -a pass -t 1000 "Copied/Typed Password"
@ -1719,9 +1727,10 @@ This is a shorthand for calling emacsclient mostly. Also, it hides the kittyterm
wait=0 wait=0
while :; do while :; do
case ${1:-} in case ${1:-} in
-w|--wait) wait=1 -w | --wait)
wait=1
;; ;;
,*) break ,*) break ;;
esac esac
shift shift
done done
@ -1783,6 +1792,7 @@ The normal =command-not-found.sh= uses the outdated =nix-shell= commands as sugg
ATTR=${ATTR%.out} ATTR=${ATTR%.out}
>&2 echo " $(@tput@ setaf 12)nixpkgs#$(@tput@ setaf 4)$ATTR$(@tput@ sgr0)" >&2 echo " $(@tput@ setaf 12)nixpkgs#$(@tput@ setaf 4)$ATTR$(@tput@ sgr0)"
done <<< "$ATTRS" done <<< "$ATTRS"
;;
esac esac
return 127 return 127
@ -1808,15 +1818,19 @@ This app checks for different apps that I keep around in the scratchpad for quic
spotifyplayer=0 spotifyplayer=0
while :; do while :; do
case ${1:-} in case ${1:-} in
-k|--kitty) kitty=1 -k | --kitty)
kitty=1
;; ;;
-e|--element) element=1 -e | --element)
element=1
;; ;;
-d|--vesktop) vesktop=1 -d | --vesktop)
vesktop=1
;; ;;
-s|--spotifyplayer) spotifyplayer=1 -s | --spotifyplayer)
spotifyplayer=1
;; ;;
*) break ,*) break ;;
esac esac
shift shift
done done
@ -1825,7 +1839,8 @@ This app checks for different apps that I keep around in the scratchpad for quic
STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep kittyterm || true) STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep kittyterm || true)
CHECK=$(swaymsg -t get_tree | grep kittyterm || true) CHECK=$(swaymsg -t get_tree | grep kittyterm || true)
if [ "$CHECK" == "" ]; then if [ "$CHECK" == "" ]; then
exec kitty -T kittyterm & sleep 1 exec kitty -T kittyterm &
sleep 1
fi fi
if [ "$STR" == "" ]; then if [ "$STR" == "" ]; then
exec swaymsg '[title="kittyterm"]' scratchpad show exec swaymsg '[title="kittyterm"]' scratchpad show
@ -1850,7 +1865,8 @@ This app checks for different apps that I keep around in the scratchpad for quic
STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep spotifytui || true) STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep spotifytui || true)
CHECK=$(swaymsg -t get_tree | grep spotifytui || true) CHECK=$(swaymsg -t get_tree | grep spotifytui || true)
if [ "$CHECK" == "" ]; then if [ "$CHECK" == "" ]; then
exec kitty -T spotifytui -o confirm_os_window_close=0 spotify_player & sleep 1 exec kitty -T spotifytui -o confirm_os_window_close=0 spotify_player &
sleep 1
fi fi
if [ "$STR" == "" ]; then if [ "$STR" == "" ]; then
exec swaymsg '[title="spotifytui"]' scratchpad show exec swaymsg '[title="spotifytui"]' scratchpad show
@ -1903,7 +1919,6 @@ This scripts checks if there are uncommited changes in either my dotfile repo, m
OUT="$CFG_STR""$CSE_STR""$PASS_STR" OUT="$CFG_STR""$CSE_STR""$PASS_STR"
echo "$OUT" echo "$OUT"
#+end_src #+end_src
#+begin_src nix :tangle pkgs/waybarupdate/default.nix #+begin_src nix :tangle pkgs/waybarupdate/default.nix
@ -1989,7 +2004,6 @@ done
This utility checks if there are updated packages in nixpkgs-unstable. It does so by fully building the most recent configuration, which I do not love, but it has its merits once I am willing to switch to the newer version. This utility checks if there are updated packages in nixpkgs-unstable. It does so by fully building the most recent configuration, which I do not love, but it has its merits once I am willing to switch to the newer version.
#+begin_src shell :tangle scripts/update-checker.sh #+begin_src shell :tangle scripts/update-checker.sh
updates="$({ cd /home/swarsel/.dotfiles && nix flake lock --update-input nixpkgs && nix build .#nixosConfigurations."$(eval hostname)".config.system.build.toplevel && nvd diff /run/current-system ./result | grep -c '\[U'; } || true)" updates="$({ cd /home/swarsel/.dotfiles && nix flake lock --update-input nixpkgs && nix build .#nixosConfigurations."$(eval hostname)".config.system.build.toplevel && nvd diff /run/current-system ./result | grep -c '\[U'; } || true)"
alt="has-updates" alt="has-updates"
@ -2004,8 +2018,6 @@ This utility checks if there are updated packages in nixpkgs-unstable. It does s
else else
echo "{ \"text\":\"\", \"alt\":\"$alt\", \"tooltip\":\"\" }" echo "{ \"text\":\"\", \"alt\":\"$alt\", \"tooltip\":\"\" }"
fi fi
#+end_src #+end_src
#+begin_src nix :tangle pkgs/update-checker/default.nix #+begin_src nix :tangle pkgs/update-checker/default.nix
@ -2046,14 +2058,14 @@ This utility checks if there are updated packages in nixpkgs-unstable. It does s
#+begin_src shell :tangle scripts/screenshare.sh #+begin_src shell :tangle scripts/screenshare.sh
SHARESCREEN="$(nix eval --raw ~/.dotfiles#nixosConfigurations."$(hostname)".config.home-manager.users."$(whoami)".swarselsystems.sharescreen)" SHARESCREEN="$(nix eval --raw ~/.dotfiles#nixosConfigurations."$(hostname)".config.home-manager.users."$(whoami)".swarselsystems.sharescreen)"
touch /tmp/screenshare.state touch /tmp/screenshare.state
STATE=$(< /tmp/screenshare.state) STATE=$(< /tmp/screenshare.state)
if [[ "$STATE" != "1" ]]; then if [[ $STATE != "1" ]]; then
wl-mirror "$SHARESCREEN" & sleep 0.1 wl-mirror "$SHARESCREEN" &
sleep 0.1
swaymsg output "$SHARESCREEN" mode "$SWARSEL_LO_RES" swaymsg output "$SHARESCREEN" mode "$SWARSEL_LO_RES"
echo 1 > /tmp/screenshare.state echo 1 > /tmp/screenshare.state
swaymsg '[app_id=at.yrlf.wl_mirror] move to workspace 12:S' swaymsg '[app_id=at.yrlf.wl_mirror] move to workspace 12:S'
@ -2063,7 +2075,6 @@ This utility checks if there are updated packages in nixpkgs-unstable. It does s
echo 0 > /tmp/screenshare.state echo 0 > /tmp/screenshare.state
swaymsg '[app_id=at.yrlf.wl_mirror] kill' swaymsg '[app_id=at.yrlf.wl_mirror] kill'
fi fi
#+end_src #+end_src

View file

@ -21,6 +21,7 @@ command_not_found_handle () {
ATTR=${ATTR%.out} ATTR=${ATTR%.out}
>&2 echo " $(@tput@ setaf 12)nixpkgs#$(@tput@ setaf 4)$ATTR$(@tput@ sgr0)" >&2 echo " $(@tput@ setaf 12)nixpkgs#$(@tput@ setaf 4)$ATTR$(@tput@ sgr0)"
done <<< "$ATTRS" done <<< "$ATTRS"
;;
esac esac
return 127 return 127

View file

@ -1,9 +1,10 @@
wait=0 wait=0
while :; do while :; do
case ${1:-} in case ${1:-} in
-w|--wait) wait=1 -w | --wait)
wait=1
;; ;;
*) break *) break ;;
esac esac
shift shift
done done

View file

@ -5,11 +5,13 @@ otp=0
typeit=0 typeit=0
while :; do while :; do
case ${1:-} in case ${1:-} in
-t|--type) typeit=1 -t | --type)
typeit=1
;; ;;
-o|--otp) otp=1 -o | --otp)
otp=1
;; ;;
*) break *) break ;;
esac esac
shift shift
done done
@ -31,13 +33,19 @@ if [[ $otp -eq 0 ]]; then
if [[ $typeit -eq 0 ]]; then if [[ $typeit -eq 0 ]]; then
pass show -c "$password" &> /tmp/pass-fuzzel pass show -c "$password" &> /tmp/pass-fuzzel
else else
pass show "$password" | { IFS= read -r pass; printf %s "$pass"; } | wtype - pass show "$password" | {
IFS= read -r pass
printf %s "$pass"
} | wtype -
fi fi
else else
if [[ $typeit -eq 0 ]]; then if [[ $typeit -eq 0 ]]; then
pass otp -c "$password" &> /tmp/pass-fuzzel pass otp -c "$password" &> /tmp/pass-fuzzel
else else
pass otp "$password" | { IFS= read -r pass; printf %s "$pass"; } | wtype - pass otp "$password" | {
IFS= read -r pass
printf %s "$pass"
} | wtype -
fi fi
fi fi
notify-send -u critical -a pass -t 1000 "Copied/Typed Password" notify-send -u critical -a pass -t 1000 "Copied/Typed Password"

View file

@ -3,8 +3,9 @@ SHARESCREEN="$(nix eval --raw ~/.dotfiles#nixosConfigurations."$(hostname)".conf
touch /tmp/screenshare.state touch /tmp/screenshare.state
STATE=$(< /tmp/screenshare.state) STATE=$(< /tmp/screenshare.state)
if [[ "$STATE" != "1" ]]; then if [[ $STATE != "1" ]]; then
wl-mirror "$SHARESCREEN" & sleep 0.1 wl-mirror "$SHARESCREEN" &
sleep 0.1
swaymsg output "$SHARESCREEN" mode "$SWARSEL_LO_RES" swaymsg output "$SHARESCREEN" mode "$SWARSEL_LO_RES"
echo 1 > /tmp/screenshare.state echo 1 > /tmp/screenshare.state
swaymsg '[app_id=at.yrlf.wl_mirror] move to workspace 12:S' swaymsg '[app_id=at.yrlf.wl_mirror] move to workspace 12:S'

20
scripts/swarselcheck.sh Executable file → Normal file
View file

@ -4,15 +4,19 @@ vesktop=0
spotifyplayer=0 spotifyplayer=0
while :; do while :; do
case ${1:-} in case ${1:-} in
-k|--kitty) kitty=1 -k | --kitty)
kitty=1
;; ;;
-e|--element) element=1 -e | --element)
element=1
;; ;;
-d|--vesktop) vesktop=1 -d | --vesktop)
vesktop=1
;; ;;
-s|--spotifyplayer) spotifyplayer=1 -s | --spotifyplayer)
spotifyplayer=1
;; ;;
*) break *) break ;;
esac esac
shift shift
done done
@ -21,7 +25,8 @@ if [[ $kitty -eq 1 ]]; then
STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep kittyterm || true) STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep kittyterm || true)
CHECK=$(swaymsg -t get_tree | grep kittyterm || true) CHECK=$(swaymsg -t get_tree | grep kittyterm || true)
if [ "$CHECK" == "" ]; then if [ "$CHECK" == "" ]; then
exec kitty -T kittyterm & sleep 1 exec kitty -T kittyterm &
sleep 1
fi fi
if [ "$STR" == "" ]; then if [ "$STR" == "" ]; then
exec swaymsg '[title="kittyterm"]' scratchpad show exec swaymsg '[title="kittyterm"]' scratchpad show
@ -46,7 +51,8 @@ elif [[ $spotifyplayer -eq 1 ]]; then
STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep spotifytui || true) STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep spotifytui || true)
CHECK=$(swaymsg -t get_tree | grep spotifytui || true) CHECK=$(swaymsg -t get_tree | grep spotifytui || true)
if [ "$CHECK" == "" ]; then if [ "$CHECK" == "" ]; then
exec kitty -T spotifytui -o confirm_os_window_close=0 spotify_player & sleep 1 exec kitty -T spotifytui -o confirm_os_window_close=0 spotify_player &
sleep 1
fi fi
if [ "$STR" == "" ]; then if [ "$STR" == "" ]; then
exec swaymsg '[title="spotifytui"]' scratchpad show exec swaymsg '[title="spotifytui"]' scratchpad show

0
scripts/update-checker.sh Executable file → Normal file
View file