From 71b9ace58a46f85da4d78c48942b030c5b600300 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 20 Apr 2020 10:38:19 -0500 Subject: [PATCH] Shellcheck --- apps/de/bspwm/config | 9 ++++--- apps/de/bspwm/wallpapers | 16 ++---------- apps/de/x/profile | 2 +- apps/htop/rc | 3 +-- apps/mutt/rc | 47 +++------------------------------- apps/neovim/plugins.vim | 1 + apps/shell/bash/aliases.bash | 1 + apps/shell/fish/aliases.fish | 1 + bin/N | 3 +-- bin/b | 6 ++--- bin/cdp | 2 +- bin/check-port | 6 ++--- bin/check_domain | 13 ++++++---- bin/countdown | 10 ++++---- bin/dns | 2 +- bin/editscrot | 7 ++--- bin/email-via-mailgun-smtp | 8 +++--- bin/field | 3 ++- bin/fzfemoji | 7 ++--- bin/fzfp | 6 ++--- bin/grb | 4 +-- bin/has_command | 1 + bin/k8s-yaml-sort | 2 +- bin/linewise | 6 ++--- bin/maybe_source_env_file | 5 ++-- bin/n | 3 +-- bin/nd | 3 +-- bin/optimize-image-for-web | 2 +- bin/pipeline | 4 ++- bin/pr-for-commit | 6 ++--- bin/prelude | 1 + bin/scn | 4 +-- bin/source_if_exists | 7 +++-- bin/sw | 2 +- bin/tmux-save-buffer | 2 -- bin/tmux-session-list | 8 +++--- bin/unarchive | 6 ++--- bin/upload | 1 + bin/vdiff | 8 +++--- bin/vman | 4 +-- env/desktop/sway/config.d/main | 4 +-- env/desktop/x/resources | 3 ++- 42 files changed, 100 insertions(+), 139 deletions(-) diff --git a/apps/de/bspwm/config b/apps/de/bspwm/config index bb94ef4..e6a54a9 100755 --- a/apps/de/bspwm/config +++ b/apps/de/bspwm/config @@ -1,11 +1,11 @@ #!/usr/bin/env sh -NUM_DESKTOPS="$(xrq bspwm.num_desktops)" +NUM_DESKTOPS="$(xrq bspwm.num_desktops || echo '10')" REVERSE_DESKTOP_ORDERING="$(xrq bspwm.reverse_desktop_ordering)" REVERSE_MONITOR_DESKTOPS="$(xrq bspwm.reverse_monitor_desktops)" BSPWM_MONITORS=$(bspc query -M) MONITOR_COUNT=$(echo "$BSPWM_MONITORS" | wc -w | awk '{ printf $1 }') -PER_MONITOR=$((NUM_DESKTOPS / MONITOR_COUNT)) +PER_MONITOR="$(xrq bspwm.num_desktops_per_monitor || echo $((NUM_DESKTOPS / MONITOR_COUNT)))" DESKTOPS=$(seq "$NUM_DESKTOPS") [ "$REVERSE_MONITOR_DESKTOPS" -eq 1 ] && BSPWM_MONITORS=$(echo "$BSPWM_MONITORS" | tac) @@ -26,11 +26,14 @@ bspc config remove_disabled_monitors true bspc rule -a "*" split_dir=right i=1 +total_screens=0 for mon in $BSPWM_MONITORS; do max=$((i + PER_MONITOR - 1)) screens="" for j in $(seq $i $max); do - screens="${screens}${j} " + [[ "$total_screens" -ge "$NUM_DESKTOPS" ]] || screens="${screens}${j} " + total_screens=$((total_screens+1)) + echo $NUM_DESKTOPS $total_screens $screens done bspc monitor "$mon" -d $screens i=$((max + 1)) diff --git a/apps/de/bspwm/wallpapers b/apps/de/bspwm/wallpapers index bce8405..317cac8 100755 --- a/apps/de/bspwm/wallpapers +++ b/apps/de/bspwm/wallpapers @@ -1,14 +1,2 @@ -#!/usr/bin/env bash - -feh --no-fehbg --bg-fill \ - "${HOME}/.wallpaper" \ - "${HOME}/.wallpaper2" \ - "${HOME}/.wallpaper3" \ - "${HOME}/.wallpaper4" \ - "${HOME}/.wallpaper5" \ - "${HOME}/.wallpaper6" \ - "${HOME}/.wallpaper7" \ - "${HOME}/.wallpaper8" \ - "${HOME}/.wallpaper9" \ - "${HOME}/.wallpaper_last" \ - 2>/dev/null +#!/bin/sh +feh --no-fehbg --bg-scale '/home/daniel/.home/.wallpaper' diff --git a/apps/de/x/profile b/apps/de/x/profile index 2dfe1de..5de6379 100755 --- a/apps/de/x/profile +++ b/apps/de/x/profile @@ -9,7 +9,7 @@ [ -f "$HOME/.xmodmap" ] && xmodmap "$HOME/.xmodmap" has_command libinput-gestures-setup && libinput-gestures-setup start has_command autorandr && autorandr -c -has_command redshift && redshift -r -l 39.1:-94.6 -t 6500K:3000K & +# has_command redshift && redshift -r -l 39.1:-94.6 -t 6500K:3000K & has_command kdeconnect-indicator && kdeconnect-indicator & has_command gnome-keyring-daemon && eval "$(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)" diff --git a/apps/htop/rc b/apps/htop/rc index adcbee7..9429934 100644 --- a/apps/htop/rc +++ b/apps/htop/rc @@ -8,7 +8,7 @@ hide_kernel_threads=1 hide_userland_threads=1 shadow_other_users=0 show_thread_names=0 -show_program_path=1 +show_program_path=0 highlight_base_name=1 highlight_megabytes=1 highlight_threads=1 @@ -24,4 +24,3 @@ left_meters=LeftCPUs2 Memory Swap left_meter_modes=1 1 1 right_meters=RightCPUs2 Tasks LoadAverage Uptime right_meter_modes=1 2 2 2 -vim_mode=1 diff --git a/apps/mutt/rc b/apps/mutt/rc index 3cd885a..a6adf8b 100644 --- a/apps/mutt/rc +++ b/apps/mutt/rc @@ -1,33 +1,15 @@ -# set imap_user = "wraithx2@gmail.com" -# set imap_pass = "`pass google | head -n 1`" set realname = "Daniel Flanagan" -set from = "daniel@lytedev.io" +set from = "Daniel Flanagan " set use_from = yes set envelope_from = yes +set edit_headers = yes +set folder="~/../mail" +set sendmail="/usr/bin/esmtp" set sidebar_visible set sidebar_format = "%B%?F? [%F]?%* %?N?%N/?%S" set mail_check_stats -set smtp_url = 'smtps://wraithx2@gmail.com@smtp.gmail.com:465/' -set smtp_pass = `pass google-app-password | head -n 1` -set imap_user = 'wraithx2@gmail.com' -set imap_pass = `pass google-app-password | head -n 1` - -set mbox="imaps://imap.gmail.com/[Gmail]/All Mail" - -set ssl_force_tls = yes -set folder = imaps://imap.gmail.com/ -set spoolfile = +INBOX -# set record = "+[Gmail]/Sent Mail" -set postponed = "+[Gmail]/Drafts" -set editor = "nvim" -set timeout = 30 - -mailboxes =INBOX "=[Gmail]/All Mail" =[Gmail]/Sent\ Mail =[Gmail]/Drafts =[Gmail]/Spam =[Gmail]/Trash - -set sort=reverse-date - bind index,pager \CD sync-mailbox bind index,pager \CP sidebar-prev bind index,pager \CN sidebar-next @@ -37,8 +19,6 @@ bind index,pager \CB sidebar-toggle-visible bind pager g top bind pager G bottom -# bind pager j top -# bind pager j top bind pager \Cu half-up bind pager \Cd half-down bind pager k half-up @@ -51,25 +31,6 @@ bind attach,index G last-entry set header_cache = "~/.cache/mutt/headers" set message_cachedir = "~/.cache/mutt/bodies" - macro index,pager A s>y - -# C-R to get mail bind index \CR imap-fetch-mail - -# bind index g noop -# macro index ga "=[Gmail]/All Mail" "Go to all mail" -# macro index gd "=[Gmail]/Drafts" "Go to drafts" -# macro index gi "=INBOX" "Go to inbox" -# macro index gs "=[Gmail]/Starred" "Go to starred messages" -# macro index gt "=[Gmail]/Trash" "Go to trash" -# macro index,pager d "=[Gmail]/Trash" "Trash" -# macro index,pager y "=[Gmail]/All Mail" "Archive" - set record="" - -# bulk operations -# T - tag messages matching... [type in regex] -# ; - perform command on tagged messages -# - A to archive! - diff --git a/apps/neovim/plugins.vim b/apps/neovim/plugins.vim index 624fab8..8548f09 100644 --- a/apps/neovim/plugins.vim +++ b/apps/neovim/plugins.vim @@ -95,4 +95,5 @@ Plug 'google/vim-jsonnet', {'for': ['jsonnet', 'libsonnet']} " jsonnet Plug 'sirtaj/vim-openscad', {'for': ['scad']} " openscad Plug 'jjo/vim-cue' Plug 'chrisbra/csv.vim' +Plug 'calviken/vim-gdscript3', {'for': ['gdscript']} " godot scripts " Plug 'ssh://git@git.lyte.dev:2222/lytedev/vim-lytlang.git' diff --git a/apps/shell/bash/aliases.bash b/apps/shell/bash/aliases.bash index 0ad56b3..5a98b69 100644 --- a/apps/shell/bash/aliases.bash +++ b/apps/shell/bash/aliases.bash @@ -126,6 +126,7 @@ alias pbcopy="clip" alias pt="htop -t" # experimental htop tree-view-by-default alias resrc="source \$HOME/.bashrc" alias redshift="redshift -r -l 39.0997:-94.5786 -t 6500K:2500K" +alias noredshift="killall redshift; redshift -P -O 5700" alias gpmdpe="electron --app=/usr/share/gpmdp/resources/app.asar" alias t="task" alias sc="sc-im" diff --git a/apps/shell/fish/aliases.fish b/apps/shell/fish/aliases.fish index a28cb63..7fb6188 100755 --- a/apps/shell/fish/aliases.fish +++ b/apps/shell/fish/aliases.fish @@ -154,6 +154,7 @@ alias pbcopy "clip" alias pt "htop -t" # experimental htop tree-view-by-default alias resrc "source $XDG_CONFIG_HOME/fish/config.fish" alias redshift "redshift -r -l 39.0997:-94.5786 -t 6500K:2500K" +alias noredshift "killall redshift; redshift -P -O 5700" alias gpmdpe "electron --app=/usr/share/gpmdp/resources/app.asar" alias t "task" alias sc "sc-im" diff --git a/bin/N b/bin/N index ab1499f..5b3285c 100755 --- a/bin/N +++ b/bin/N @@ -1,4 +1,3 @@ #!/usr/bin/env bash -fn="${1}"; shift -nf "${fn}.md" $* +fn="${1}"; shift; nf "${fn}.md" "$@" diff --git a/bin/b b/bin/b index e919ecc..55a680d 100755 --- a/bin/b +++ b/bin/b @@ -4,11 +4,11 @@ bbin="bible" # npm i -g bible pbin="less" # bible args -bargs="" +bargs=("") # pager args pargs="-R" -[ "$1" = "s" ] && bargs="$bargs --search" && shift +[[ $1 = s ]] && { bargs+=("--search"); shift; } -"${bbin}" $bargs "$*" | "${pbin}" $pargs +"${bbin}" "${bargs[@]}" "$*" | "${pbin}" $pargs diff --git a/bin/cdp b/bin/cdp index dd354d0..b621ffe 100755 --- a/bin/cdp +++ b/bin/cdp @@ -1,4 +1,4 @@ #!/usr/bin/env bash # TODO: needs fixing...? -cd "$(dirname "$(fzf)")" +cd "$(dirname "$(fzf)")" || exit 1 diff --git a/bin/check-port b/bin/check-port index 5601c5f..7578a82 100755 --- a/bin/check-port +++ b/bin/check-port @@ -2,7 +2,7 @@ if [[ $1 = t ]] || [[ $1 = tcp ]] || \ [[ $1 = T ]] || [[ $1 = TCP ]]; then - echo "TCP is the default. You don't need to specify it." + echo "TCP is the default. You don't need to specify it." >&2 exit 1 fi @@ -10,8 +10,8 @@ if [[ $1 = u ]] || [[ $1 = udp ]] || \ [[ $1 = U ]] || [[ $1 = UDP ]]; then shift set -x - sudo nmap -sU $1 -p $2 + sudo nmap -sU "$1" -p "$2" else set -x - nmap $1 -p $2 + nmap "$1" -p "$2" fi diff --git a/bin/check_domain b/bin/check_domain index 4a4300e..151f2df 100755 --- a/bin/check_domain +++ b/bin/check_domain @@ -49,23 +49,26 @@ fi # main function check_domain() { + local tmp + local domain + if [ "$#" == "0" ]; then echo "No domain specified." return fi - local domain="$1" + domain="$1" # create a unique temporary file - local tmp=$(mktemp "${domain}_XXX") + tmp=$(mktemp "${domain}_XXX") # dump whois output into temp file whois "$domain" > "$tmp" 2>&1 # check contents and output appropriately - if egrep -q "$AVAIL_REGEX" "$tmp" > /dev/null 2>&1; then + if grep -E -q "$AVAIL_REGEX" "$tmp" > /dev/null 2>&1; then echo -e "$COLOR_GREEN$domain / probably available$COLOR_RESET" - elif egrep -q "$TIMEOUT_REGEX" "$tmp" > /dev/null 2>&1; then + elif grep -E -q "$TIMEOUT_REGEX" "$tmp" > /dev/null 2>&1; then echo -e "$COLOR_YELLOW$domain / timed out$COLOR_RESET" else echo -e "$COLOR_RED$domain / unavailable$COLOR_RESET" @@ -79,7 +82,7 @@ check_domain() { # concurrently elements=${#DOMAINS[@]} while (( "$#" )); do - for (( i=0;i<${elements};i++ )); do + for (( i=0;i&2 echo "${errpre}ERROR: $@${errpost}"; usage; exit 1 + >&2 echo "${errpre}ERROR: $*${errpost}"; usage; exit 1 } warn() { @@ -18,12 +18,12 @@ warn() { post="" if test -t 1; then ncolors=$(tput colors) - if test -n "$ncolors" && test $ncolors -ge 8; then + if test -n "$ncolors" && test "$ncolors" -ge 8; then pre="$(tput setaf 3)" post="$(tput setaf 7)" fi fi - >&2 echo "${pre}WARNING: $@${post}" + >&2 echo "${pre}WARNING: $*${post}" } usage() { >&2 cat </dev/null -cd ~/.password-store || ( echo "Could not cd to ~/.password-store" && exit 1 ) r="$(< "$HOME/.emoji.txt" fzf --height 40%)" -echo "Selected $r (it's in your clipboard)" -<<< $r awk '$0=$1' | tr -d '\n' | clip -cd - || return 1 +echo "$r" | awk '$0=$1' | tr -d '\n' | clip +echo "Copied $r emoji to your clipboard" diff --git a/bin/fzfp b/bin/fzfp index 4d6a34f..0a62049 100755 --- a/bin/fzfp +++ b/bin/fzfp @@ -1,8 +1,8 @@ #!/usr/bin/env sh -op="${1:--c}"; shift &>/dev/null -cd ~/.password-store || ( echo "Could not cd to ~/.password-store" && exit 1 ) +op="${1:--c}"; shift >&2 2>/dev/null +cd ~/.password-store || { echo "Could not cd to ~/.password-store"; exit 1; } pp="$(fd gpg | sd ".gpg" "" | fzf --height 40%)" -echo pass $op $pp +echo "pass $op $pp" pass "$op" "$@" "$pp" cd - || return 1 diff --git a/bin/grb b/bin/grb index 2434386..868024f 100755 --- a/bin/grb +++ b/bin/grb @@ -2,10 +2,10 @@ MAIN_BRANCH="master" CUR_BRANCH="$(git branch | grep '\*' | cut -d ' ' -f2-)" -if [[ ! -z ${2+x} ]]; then +if [[ -n ${2+x} ]]; then MAIN_BRANCH="$2" CUR_BRANCH="$1" -elif [[ ! -z ${1+x} ]]; then +elif [[ -n ${1+x} ]]; then MAIN_BRANCH="$1" fi diff --git a/bin/has_command b/bin/has_command index 99beb7c..48bb2d6 100755 --- a/bin/has_command +++ b/bin/has_command @@ -1,3 +1,4 @@ #!/usr/bin/env sh +[ "$#" -lt 1 ] && { echo "No arguments provided" >&2 ; exit 1; } command -v "$1" >/dev/null 2>&1 diff --git a/bin/k8s-yaml-sort b/bin/k8s-yaml-sort index ee738a5..9766ba9 100755 --- a/bin/k8s-yaml-sort +++ b/bin/k8s-yaml-sort @@ -1,7 +1,7 @@ #!/usr/bin/env bash [ "$#" -lt 1 ] && echo "Need a filename." && exit 1 -cat "$1" | yq -s . | jq -S ' +< "$1" yq -s . | jq -S ' sort_by(.metadata.name) | sort_by(.kind) | .[] | .spec.template.spec.containers |= diff --git a/bin/linewise b/bin/linewise index 2b337f7..4780293 100755 --- a/bin/linewise +++ b/bin/linewise @@ -1,8 +1,8 @@ #!/usr/bin/env bash -if [[ ! -z "${1+x}" ]]; then - while read r; do - <<< "${r}" "$@" +if [[ -n "${1+x}" ]]; then + while read -r line; do + <<< "${line}" "$@" done else echo "No reader program provided." diff --git a/bin/maybe_source_env_file b/bin/maybe_source_env_file index 1096607..647bbc1 100755 --- a/bin/maybe_source_env_file +++ b/bin/maybe_source_env_file @@ -1,4 +1,3 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash -f="$1"; shift -. source_if_exists "$ENV_PATH/$f" "$@" +f="$1"; shift; . source_if_exists "$ENV_PATH/$f" "$@" diff --git a/bin/n b/bin/n index a219661..c52ecf0 100755 --- a/bin/n +++ b/bin/n @@ -1,4 +1,3 @@ #!/usr/bin/env sh -fn="${1}"; shift -N "$(date +%Y-%m-%d)_${fn}" $* +fn="${1}"; shift; N "$(date +%Y-%m-%d)_${fn}" "$@" diff --git a/bin/nd b/bin/nd index 342cac6..3c73c80 100755 --- a/bin/nd +++ b/bin/nd @@ -1,4 +1,3 @@ #!/usr/bin/env bash -fn="${1}"; shift -N "$(date +%Y-%m-%d)_${fn}" $* +fn="${1}"; shift; N "$(date +%Y-%m-%d)_${fn}" "$@" diff --git a/bin/optimize-image-for-web b/bin/optimize-image-for-web index 3cc43d9..dfd05d7 100755 --- a/bin/optimize-image-for-web +++ b/bin/optimize-image-for-web @@ -15,4 +15,4 @@ mogrify \ -define png:exclude-chunk=all \ -interlace none \ -colorspace sRGB \ - $1 + "$1" diff --git a/bin/pipeline b/bin/pipeline index 1908407..d685599 100755 --- a/bin/pipeline +++ b/bin/pipeline @@ -8,6 +8,7 @@ if [ -n "${1+x}" ]; then mkdir -p "$pdir" if [ -z ${1+x} ]; then td="$(mktemp -p "$pdir" -d "tmp_pipeline.XXXXXXXX")" + # shellcheck disable=SC2064 trap "rm -rf '$td'" EXIT else td="$pdir/$1"; shift @@ -17,6 +18,7 @@ if [ -n "${1+x}" ]; then else td="$(mktemp --tmpdir -d pipeline.XXXXXXXX)" transform="$td/transform" + # shellcheck disable=SC2064 trap "rm -rf '$td'" EXIT fi @@ -36,4 +38,4 @@ chmod +x "$transform" # TODO: saved inputs? echo "Hello World" > "$in" -env PIPELINE_IN="$id" PIPELINE_TRANSFORM="$transform" PIPELINE_OUT="$out" nvim --cmd "source $DOTFILES_PATH/apps/neovim/scripts/pipeline.vim" +env PIPELINE_IN="$in" PIPELINE_TRANSFORM="$transform" PIPELINE_OUT="$out" nvim --cmd "source $DOTFILES_PATH/apps/neovim/scripts/pipeline.vim" diff --git a/bin/pr-for-commit b/bin/pr-for-commit index d830241..685c41c 100755 --- a/bin/pr-for-commit +++ b/bin/pr-for-commit @@ -1,10 +1,10 @@ #!/usr/bin/env sh -export GITHUB_UPSTREAM="$(git remote -vv | awk '{$0=$2}')" +GITHUB_UPSTREAM="$(git remote -vv | awk '{$0=$2}')" -git log --merges --ancestry-path --oneline $1..master \ +git log --merges --ancestry-path --oneline "$1"..master \ | grep -i 'pull request' \ | tail -n1 \ | awk '{$0=$5}' \ | cut -c2- \ - | xargs -I % open https://github.com/$GITHUB_UPSTREAM/${PWD##*/}/pull/% + | xargs -I % open https://github.com/"$GITHUB_UPSTREAM"/"${PWD##*/}"/pull/% diff --git a/bin/prelude b/bin/prelude index b00a70a..62352ca 100755 --- a/bin/prelude +++ b/bin/prelude @@ -16,4 +16,5 @@ NICE_HOME="$HOME" [ -e "${ENV_PATH}/.nice_home" ] && NICE_HOME="$(cat "${ENV_PATH}/.nice_home")" export NICE_HOME +# shellcheck disable=SC1090 . "$DOTFILES_PATH/bin/paths" diff --git a/bin/scn b/bin/scn index a4f1b8f..418774d 100755 --- a/bin/scn +++ b/bin/scn @@ -1,3 +1,3 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh -EDITOR="sc-im" nf $* +EDITOR="sc-im" nf "$@" diff --git a/bin/source_if_exists b/bin/source_if_exists index 9b4f71c..8f3fd38 100755 --- a/bin/source_if_exists +++ b/bin/source_if_exists @@ -1,4 +1,7 @@ #!/usr/bin/env sh -f="$1"; shift -[ -f "$f" ] && . "$f" "$@" +[ "$#" -lt 1 ] && { echo "No arguments provided" >&2 ; exit 1; } +[ "$#" -gt 1 ] && { echo "Too many arguments provided" >&2 ; exit 2; } + +# shellcheck disable=SC1090 +{ [ -f "$1" ] && . "$1"; } || { echo "$1 does not exist" >&2 ; exit 3; } diff --git a/bin/sw b/bin/sw index dcf713f..46fb6a9 100755 --- a/bin/sw +++ b/bin/sw @@ -4,7 +4,7 @@ d="$(date +%s)" echo "Stopwatch started $(date)" while true; do - _dt=$((`date +%s` - d)) + _dt=$(($(date +%s) - d)) days=$((_dt / 86400)) echo -ne "\r${days}d $(date -u --date @$((_dt)) +%H:%M:%S) " sleep 0.1 diff --git a/bin/tmux-save-buffer b/bin/tmux-save-buffer index 49d2253..6a71863 100755 --- a/bin/tmux-save-buffer +++ b/bin/tmux-save-buffer @@ -1,7 +1,5 @@ #!/usr/bin/env sh -. ~/.config/dotfiles/bin/prelude - echo "${USER_LOGS_PATH}" sess="$1"; shift diff --git a/bin/tmux-session-list b/bin/tmux-session-list index 204b09b..46e499b 100755 --- a/bin/tmux-session-list +++ b/bin/tmux-session-list @@ -1,11 +1,12 @@ #!/usr/bin/env bash ANY_SESSION_PREFIX="#[bg=colour18]#[fg=colour7]" -CUR_SESSION_PREFIX="#[bg=colour4]#[fg=colour0]" -URG_SESSION_PREFIX="#[bg=colour1]#[fg=colour0]" ANY_SESSION_SUFFIX="#[bg=default]#[fg=default] " -URG_SESSION_SUFFIX="${ANY_SESSION_SUFFIX}" +CUR_SESSION_PREFIX="#[bg=colour4]#[fg=colour0]" CUR_SESSION_SUFFIX="${ANY_SESSION_SUFFIX}" +# TODO: implement urgent session highlighting +# URG_SESSION_SUFFIX="${ANY_SESSION_SUFFIX}" +# URG_SESSION_PREFIX="#[bg=colour1]#[fg=colour0]" CUR_TMUX_SESSION="$1" if [ -z "$1" ]; then @@ -26,4 +27,5 @@ if(s==curSesh){ s=aspre" "s" "assuf }printf s}')" +# shellcheck disable=SC2001 echo "${TMUX_SESSION_LIST//\s*$/}" | sed -e 's/\s*$//' diff --git a/bin/unarchive b/bin/unarchive index 65b9901..b02272e 100755 --- a/bin/unarchive +++ b/bin/unarchive @@ -1,9 +1,9 @@ #!/usr/bin/env bash archive_name="${1}"; shift -to_dir="$(basename $archive_name)" +to_dir="$(basename "$archive_name")" mkdir -p "${to_dir}" -pushd "${to_dir}" +pushd "${to_dir}" || ( echo "${to_dir} does not exist" ; exit 1 ) tar --zstd -xvf "${archive_name}" echo "Unarchived to: ${to_dir}" -popd +popd || exit 2 diff --git a/bin/upload b/bin/upload index c6ec490..1cc7063 100755 --- a/bin/upload +++ b/bin/upload @@ -21,6 +21,7 @@ fi ssh ld mkdir -p "${internal_dir}" rsync --progress --no-owner --no-group --no-perms --stats --ignore-existing "${f}" "${HOST}:${internal_dir}/${fname}" | tee "${HOME}/.upload.log" code="$?" +# shellcheck disable=SC2029 ssh ld chmod a+r "${internal_dir}/${fname}" echo "Uploaded to: ${url}" diff --git a/bin/vdiff b/bin/vdiff index 5801fae..14c24ca 100755 --- a/bin/vdiff +++ b/bin/vdiff @@ -5,8 +5,8 @@ if ! pushd "$repo_root" &> /dev/null; then echo "Repo doesn't exist!" exit 2 fi -td="$(mktemp -p "$pdir" -d "vdiff.XXXXXXXX")" -trap "rm -rf \"$td\"" EXIT +td="$(mktemp -d "vdiff.XXXXXXXX")" +trap 'rm -rf '"$td" EXIT files="$(git diff --name-only "$@")" args=() @@ -23,8 +23,8 @@ for f in $files; do echo "" > "$d/$fn" cp "$f" "$d/$cfn" 2>/dev/null || echo "" > "$d/$cfn" - if [ -z "$args" ]; then - args+=($d/$fn -c) + if [ -z "${args[0]}" ]; then + args+=("$d/$fn -c") vcmd="vert diffsplit $d/$cfn" else vcmd="$vcmd | tabnew | e $d/$fn | vert diffsplit $d/$cfn" diff --git a/bin/vman b/bin/vman index 627f01a..0e608fa 100755 --- a/bin/vman +++ b/bin/vman @@ -4,5 +4,5 @@ # `asmanviewer` variable, so launch vim that way when using vim as our man # page viewer -"$EDITOR" --cmd "let asmanviewer=1" -c "SuperMan $*" -[ "$?" != "0" ] && echo "No manual entry for $*" && exit 1 +"$EDITOR" --cmd "let asmanviewer=1" -c "SuperMan $*" || \ + ( echo "No manual entry for $*" && exit 1 ) diff --git a/env/desktop/sway/config.d/main b/env/desktop/sway/config.d/main index 555685e..4db1d9a 100644 --- a/env/desktop/sway/config.d/main +++ b/env/desktop/sway/config.d/main @@ -1,3 +1,3 @@ -output HDMI-A-1 res 2560x1440@60Hz pos 0 0 +output DP-1 res 3440x1440@100Hz pos 0 0 +output HDMI-A-1 res 2560x1440@60Hz pos 3440 -720 output HDMI-A-1 transform 270 -output DP-1 res 3440x1440@100Hz pos 1440 1120 diff --git a/env/desktop/x/resources b/env/desktop/x/resources index d7d71a9..f184c9f 100755 --- a/env/desktop/x/resources +++ b/env/desktop/x/resources @@ -1,7 +1,8 @@ #define bar_font_size 12 # TODO: this needs fixing polybar.primary_font: iosevka\-lyte:pixelsize=bar_font_size;1 +bspwm.num_desktops_per_monitor: 8 bspwm.reverse_desktop_ordering: 0 -bspwm.reverse_monitor_desktops: 1 +bspwm.reverse_monitor_desktops: 0 polybar.display_monitor: DisplayPort-0 polybar.height: 40