Fix shellcheck issues

This commit is contained in:
Tobias Reisinger 2021-09-29 22:45:12 +02:00
parent 2ab76c75f7
commit 54ecc698f0
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
3 changed files with 35 additions and 43 deletions

View file

@ -8,31 +8,31 @@ bspc config focused_border_color "#ff79c6"
bspc config presel_feedback_color "#6272a4" bspc config presel_feedback_color "#6272a4"
host_name=$(cat /proc/sys/kernel/hostname) host_name=$(cat /proc/sys/kernel/hostname)
if [[ $host_name == "portalo" ]]; then if [ "$host_name" = "portalo" ]; then
xrandr --output $MONITOR_PRIMARY --mode 2560x1440 --refresh 144 xrandr --output "$MONITOR_PRIMARY" --mode 2560x1440 --refresh 144
xrandr --output $MONITOR_SECONDARY --left-of $MONITOR_PRIMARY xrandr --output "$MONITOR_SECONDARY" --left-of "$MONITOR_PRIMARY"
#primary="HDMI-A-0" #primary="HDMI-A-0"
#secondary="DVI-D-0" #secondary="DVI-D-0"
bspc monitor $MONITOR_PRIMARY -d web terminal 3 4 5 6 focus bspc monitor "$MONITOR_PRIMARY" -d web terminal 3 4 5 6 focus
bspc monitor $MONITOR_SECONDARY -d side-view voip messenger bspc monitor "$MONITOR_SECONDARY" -d side-view voip messenger
bspc wm -O $MONITOR_PRIMARY $MONITOR_SECONDARY bspc wm -O "$MONITOR_PRIMARY" "$MONITOR_SECONDARY"
sleep 1 sleep 1
bspc wm -O $MONITOR_PRIMARY $MONITOR_SECONDARY bspc wm -O "$MONITOR_PRIMARY" "$MONITOR_SECONDARY"
elif [[ $host_name == *"laptop"* ]]; then elif echo "$host_name" | grep -Eq "laptop"; then
xrandr --output $MONITOR_PRIMARY --auto xrandr --output "$MONITOR_PRIMARY" --auto
xrandr --output $MONITOR_SECONDARY --left-of $MONITOR_PRIMARY --auto xrandr --output "$MONITOR_SECONDARY" --left-of "$MONITOR_PRIMARY" --auto
#primary="eDP-1" #primary="eDP-1"
#secondary="HDMI-2" #secondary="HDMI-2"
bspc monitor $MONITOR_PRIMARY -d web terminal 3 4 5 6 focus messenger bspc monitor "$MONITOR_PRIMARY" -d web terminal 3 4 5 6 focus messenger
bspc monitor $MONITOR_SECONDARY -d side-view 10 bspc monitor "$MONITOR_SECONDARY" -d side-view 10
bspc wm -O $MONITOR_PRIMARY $MONITOR_SECONDARY bspc wm -O "$MONITOR_PRIMARY" "$MONITOR_SECONDARY"
sleep 1 sleep 1
bspc wm -O $MONITOR_PRIMARY $MONITOR_SECONDARY bspc wm -O "$MONITOR_PRIMARY" "$MONITOR_SECONDARY"
else else
bspc monitor primary -d web terminal 3 4 5 6 7 8 9 focus bspc monitor primary -d web terminal 3 4 5 6 7 8 9 focus
@ -84,7 +84,7 @@ bspc rule -a 'Xarchiver' state='floating'
bspc rule -a 'Signal' desktop='messenger' bspc rule -a 'Signal' desktop='messenger'
bspc rule -a 'Thunderbird:Mail' desktop='messenger' locked='true' bspc rule -a 'Thunderbird:Mail' desktop='messenger' locked='true'
$HOME/.config/polybar/launch.sh & "$HOME/.config/polybar/launch.sh" &
$HOME/.config/bspwm/swallow.py & "$HOME/.config/bspwm/swallow.py" &
$HOME/.config/bspwm/focus-voip.py & "$HOME/.config/bspwm/focus-voip.py" &

View file

@ -66,36 +66,28 @@ DISABLE_AUTO_UPDATE="false"
# Would you like to use another custom folder than $ZSH/custom? # Would you like to use another custom folder than $ZSH/custom?
ZSH_CUSTOM=$ZDOTDIR/custom ZSH_CUSTOM=$ZDOTDIR/custom
priv_plugin=sudo
if [ -x "$(command -v doas)" ]
then
priv_plugin=doas
fi
# Which plugins would you like to load? # Which plugins would you like to load?
# Standard plugins can be found in $ZSH/plugins/ # Standard plugins can be found in $ZSH/plugins/
# Custom plugins may be added to $ZSH_CUSTOM/plugins/ # Custom plugins may be added to $ZSH_CUSTOM/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse) # Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup. # Add wisely, as too many plugins slow down shell startup.
plugins=( plugins=(
colored-man-pages 'colored-man-pages'
copydir 'copydir'
copyfile 'copyfile'
cp 'cp'
docker 'docker'
docker-compose 'docker-compose'
encode64 'encode64'
extract 'extract'
git 'git'
git-auto-status 'git-auto-status'
httpie 'httpie'
jump 'jump'
kubectl 'laravel5'
laravel5 'safe-paste'
safe-paste 'sudo'
vi-mode 'vi-mode'
$priv_plugin
) )
source $ZSH/oh-my-zsh.sh source $ZSH/oh-my-zsh.sh

View file

@ -19,7 +19,7 @@ audio_wait_pid=1
wait_for_service() wait_for_service()
{ {
until systemctl is-active --quiet $1 until systemctl is-active --quiet "$1"
do do
sleep 0.5 sleep 0.5
done done
@ -56,7 +56,7 @@ _autostart_apps()
conky --daemonize --config="$HOME/.config/conky/clock.conf" conky --daemonize --config="$HOME/.config/conky/clock.conf"
conky --daemonize --config="$HOME/.config/conky/system.conf" conky --daemonize --config="$HOME/.config/conky/system.conf"
conky --daemonize --config="$HOME/.config/conky/archlinux-updates.conf" conky --daemonize --config="$HOME/.config/conky/archlinux-updates.conf"
feh --bg-fill $XDG_PICTURES_DIR/wallpaper/active_wallpaper feh --bg-fill "$XDG_PICTURES_DIR/wallpaper/active_wallpaper"
#actkbd --grab --config ~/.config/actkbd/actkbd.conf --device /dev/input/by-id/usb-Dell_Dell_USB_Keyboard-event-kbd & #actkbd --grab --config ~/.config/actkbd/actkbd.conf --device /dev/input/by-id/usb-Dell_Dell_USB_Keyboard-event-kbd &