diff --git a/.editorconfig b/.editorconfig index cb70ad6..c8fc15a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -15,6 +15,10 @@ indent_size = 4 indent_style = tab indent_size = 1 +[*.plist] +indent_size = 1 +indent_style = tab + [local/bin/*] shell_variant = bash # --language-variant binary_next_line = true diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 6bd49b7..5f96927 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -20,4 +20,3 @@ jobs: id: output-changelog run: | echo "${{ steps.changelog.outputs.changes }}" - diff --git a/add-submodules.sh b/add-submodules.sh index 100ad71..a7ed16f 100755 --- a/add-submodules.sh +++ b/add-submodules.sh @@ -5,4 +5,3 @@ git submodule add --name dotbot-brew -f https://github.com/wren/dotbot-brew.git git submodule add --name dotbot-include -f https://gitlab.com/gnfzdz/dotbot-include.git tools/dotbot-include git submodule add --name cheat-community -f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community git submodule add --name tmux/tpm -f https://github.com/tmux-plugins/tpm.git config/tmux/plugins/tpm - diff --git a/config/exports-apps b/config/exports-apps index 8b6e9bc..6b1ecac 100755 --- a/config/exports-apps +++ b/config/exports-apps @@ -124,4 +124,3 @@ export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc" export TMUX_CONF="$DOTFILES/config/tmux/tmux.conf" export BAT_THEME="ansi" export CHEAT_USE_FZF=true - diff --git a/install b/install index fddb965..dbf11a7 100755 --- a/install +++ b/install @@ -33,4 +33,3 @@ if [ "${DOTBOT_HOST}" != "" ]; then -c "$DOTBOT_HOST_CONFIG" \ "${@}" fi - diff --git a/local/bin/dfm b/local/bin/dfm index 0d9c2e5..f5dee4d 100755 --- a/local/bin/dfm +++ b/local/bin/dfm @@ -131,9 +131,7 @@ function section_install bash "$DOTFILES/scripts/install-z.sh" \ && msg_yay "z has been installed!" ;; - *) - menu_usage "$USAGE_PREFIX" "${MENU[@]}" - ;; + *) menu_usage "$USAGE_PREFIX" "${MENU[@]}" ;; esac } @@ -238,9 +236,7 @@ function section_dotfiles --binary-next-line {} \; msg_yay "dotfiles have been shfmt formatted!" ;; - *) - menu_usage "$USAGE_PREFIX" "${MENU[@]}" - ;; + *) menu_usage "$USAGE_PREFIX" "${MENU[@]}" ;; esac } @@ -264,9 +260,7 @@ function section_check [[ "$2" = "" ]] && echo "$X_HOSTNAME" && exit 0 [[ $X_HOSTNAME = "$2" ]] && exit 0 || exit 1 ;; - *) - menu_usage "$USAGE_PREFIX" "${MENU[@]}" - ;; + *) menu_usage "$USAGE_PREFIX" "${MENU[@]}" ;; esac } @@ -296,9 +290,7 @@ function section_tests msg_yay "msg_yay" msg_yay_done "msg_yay_done" ;; - *) - menu_usage "$USAGE_PREFIX" "${MENU[@]}" - ;; + *) menu_usage "$USAGE_PREFIX" "${MENU[@]}" ;; esac } diff --git a/scripts/install-composer.sh b/scripts/install-composer.sh index ab6dcd9..ba5ce7f 100755 --- a/scripts/install-composer.sh +++ b/scripts/install-composer.sh @@ -4,7 +4,7 @@ # shellcheck source="shared.sh" source "$HOME/.dotfiles/scripts/shared.sh" -! have php && msg_err "PHP Not Available, cannot install composer" && exit 0; +! have php && msg_err "PHP Not Available, cannot install composer" && exit 0 EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')" php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" @@ -21,4 +21,3 @@ RESULT=$? rm composer-setup.php mv composer.phar ~/.local/bin/composer exit $RESULT - diff --git a/scripts/install-fzf.sh b/scripts/install-fzf.sh index f1ad24c..9683f53 100755 --- a/scripts/install-fzf.sh +++ b/scripts/install-fzf.sh @@ -14,4 +14,3 @@ if [ ! -d "$FZF_PATH" ]; then else msg_done "fzf ($FZF_PATH/) already installed" fi - diff --git a/scripts/install-gh-extensions.sh b/scripts/install-gh-extensions.sh index 3ef9625..4407c63 100755 --- a/scripts/install-gh-extensions.sh +++ b/scripts/install-gh-extensions.sh @@ -6,7 +6,7 @@ source "$HOME/.dotfiles/scripts/shared.sh" ! have gh \ && msg_err "gh (GitHub Client) could not be found, please install it first" \ - && exit 0; + && exit 0 extensions=( # GitHub CLI extension for generating a report on repository dependencies. @@ -42,4 +42,3 @@ for ext in "${extensions[@]}"; do done msg_ok "Done" - diff --git a/scripts/install-go-packages.sh b/scripts/install-go-packages.sh index d6347bc..494a112 100755 --- a/scripts/install-go-packages.sh +++ b/scripts/install-go-packages.sh @@ -4,7 +4,7 @@ # shellcheck source=shared.sh source "$HOME/.dotfiles/scripts/shared.sh" -! have go && msg "go hasn't been installed yet." && exit 0; +! have go && msg "go hasn't been installed yet." && exit 0 packages=( # sysadmin/scripting utilities, distributed as a single binary @@ -37,4 +37,3 @@ for pkg in "${packages[@]}"; do done msg_ok "Done" - diff --git a/scripts/install-ntfy.sh b/scripts/install-ntfy.sh index 3c4f248..ce40d0b 100755 --- a/scripts/install-ntfy.sh +++ b/scripts/install-ntfy.sh @@ -6,7 +6,7 @@ source "$HOME/.dotfiles/scripts/shared.sh" set -e -have ntfy && msg "ntfy already installed" && exit 0; +have ntfy && msg "ntfy already installed" && exit 0 case $(dfm check arch) in Linux) @@ -33,4 +33,3 @@ if [ ! -f "$HOME/.config/ntfy/client.yml" ]; then fi rm -rf "${NTFY_DEST}" "${NTFY_DEST}.tar.gz" -