From ad3f4e81b7712d06876f6980cac73b79331ffa41 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Fri, 2 Dec 2022 04:53:42 +0000 Subject: [PATCH] Update .local/share/chezmoi/home/private_dot_config/shell/profile.sh, .local/share/chezmoi/home/private_dot_config/shell/motd.sh, .local/share/chezmoi/home/private_dot_config/shell/functions.sh, .local/share/chezmoi/home/private_dot_config/shell/private_private.sh, .local/share/chezmoi/home/private_dot_config/shell/aliases.sh.tmpl, .local/share/chezmoi/home/private_dot_config/shell/exports.sh.tmpl, .local/share/chezmoi/home/dot_zshrc, .local/share/chezmoi/home/dot_bashrc --- .local/share/chezmoi/home/dot_bashrc | 10 +-- .local/share/chezmoi/home/dot_zshrc | 76 +++++++++---------- .../shell/{aliases.tmpl => aliases.sh.tmpl} | 4 +- .../shell/{exports.tmpl => exports.sh.tmpl} | 0 .../shell/{functions => functions.sh} | 2 + .../shell/{motd => motd.sh} | 2 + ...private_dot_private => private_private.sh} | 2 +- .../shell/{profile => profile.sh} | 18 +++-- 8 files changed, 59 insertions(+), 55 deletions(-) rename .local/share/chezmoi/home/private_dot_config/shell/{aliases.tmpl => aliases.sh.tmpl} (98%) rename .local/share/chezmoi/home/private_dot_config/shell/{exports.tmpl => exports.sh.tmpl} (100%) rename .local/share/chezmoi/home/private_dot_config/shell/{functions => functions.sh} (99%) rename .local/share/chezmoi/home/private_dot_config/shell/{motd => motd.sh} (98%) rename .local/share/chezmoi/home/private_dot_config/shell/{private_dot_private => private_private.sh} (97%) rename .local/share/chezmoi/home/private_dot_config/shell/{profile => profile.sh} (91%) diff --git a/.local/share/chezmoi/home/dot_bashrc b/.local/share/chezmoi/home/dot_bashrc index 0a8f01be..b1483213 100644 --- a/.local/share/chezmoi/home/dot_bashrc +++ b/.local/share/chezmoi/home/dot_bashrc @@ -9,6 +9,11 @@ if [ "$0" = 'bash' ] || [ "$0" = '/bin/bash' ]; then export BASH_SUPPORT=true fi +### Import Common Settings +if [ -f "$HOME/.config/shell/profile.sh" ]; then + . "$HOME/.config/shell/profile.sh" +fi + ### Fig / LC_ALL if [ "$BASH_SUPPORT" = 'true' ]; then if [[ "$(hostname)" != *'-minimal' ]]; then @@ -19,11 +24,6 @@ if [ "$BASH_SUPPORT" = 'true' ]; then fi fi -### Import Common Settings -if [ -f "$HOME/.config/shell/profile" ]; then - . "$HOME/.config/shell/profile" -fi - ### Settings if command -v shopt > /dev/null; then shopt -s globstar diff --git a/.local/share/chezmoi/home/dot_zshrc b/.local/share/chezmoi/home/dot_zshrc index 2c494601..4e474935 100644 --- a/.local/share/chezmoi/home/dot_zshrc +++ b/.local/share/chezmoi/home/dot_zshrc @@ -9,8 +9,8 @@ export BASH_SUPPORT=true ### Import Common Settings export XDG_CONFIG_HOME="$HOME/.config" -if [ -f "$HOME/.config/shell/profile" ]; then - . "$XDG_CONFIG_HOME/shell/profile" +if [ -f "$HOME/.config/shell/profile.sh" ]; then + . "$XDG_CONFIG_HOME/shell/profile.sh" fi ### Misc. @@ -251,49 +251,45 @@ if [ -f "$HOME/.local/scripts/antigen.zsh" ]; then fi if command -v antigen > /dev/null; then antigen use oh-my-zsh - antigen bundle adb - antigen bundle colored-man-pages - antigen bundle command-not-found - antigen bundle copyfile - antigen bundle copybuffer - antigen bundle encode64 - antigen bundle fd - antigen bundle git-auto-fetch - antigen bundle gnu-utils - antigen bundle heroku + # antigen bundle adb + # antigen bundle colored-man-pages + # antigen bundle command-not-found + # antigen bundle copyfile + # antigen bundle copybuffer + # antigen bundle encode64 + # antigen bundle fd + # antigen bundle git-auto-fetch + # antigen bundle gnu-utils + # antigen bundle heroku # antigen bundle keychain - antigen bundle kubectx - antigen bundle macos - antigen bundle magic-enter - antigen bundle minikube - antigen bundle ng - antigen bundle nomad - antigen bundle npm - antigen bundle redis-cli - antigen bundle ripgrep + # antigen bundle kubectx + # antigen bundle macos + # antigen bundle magic-enter + # antigen bundle minikube + # antigen bundle ng + # antigen bundle nomad + # antigen bundle npm + # antigen bundle redis-cli + # antigen bundle ripgrep # antigen bundle rust - antigen bundle safe-paste - antigen bundle salt + # antigen bundle safe-paste + # antigen bundle salt # antigen bundle shell-proxy # antigen bundle ssh-agent - antigen bundle sudo - antigen bundle ufw + # antigen bundle sudo + # antigen bundle ufw # antigen bundle web-search - - ### Disable plugin alias - # alias alias=true - antigen bundle docker - antigen bundle docker-compose - antigen bundle gem - antigen bundle ionic - antigen bundle microk8s - antigen bundle multipass - antigen bundle pip - antigen bundle pm2 - antigen bundle terraform - antigen bundle vagrant - antigen bundle yarn - # unalias alias + # antigen bundle docker + # antigen bundle docker-compose + # antigen bundle gem + # antigen bundle ionic + # antigen bundle microk8s + # antigen bundle multipass + # antigen bundle pip + # antigen bundle pm2 + # antigen bundle terraform + # antigen bundle vagrant + # antigen bundle yarn # antigen bundle zsh-interactive-cd # antigen bundle zsh-navigation-tools diff --git a/.local/share/chezmoi/home/private_dot_config/shell/aliases.tmpl b/.local/share/chezmoi/home/private_dot_config/shell/aliases.sh.tmpl similarity index 98% rename from .local/share/chezmoi/home/private_dot_config/shell/aliases.tmpl rename to .local/share/chezmoi/home/private_dot_config/shell/aliases.sh.tmpl index 34d2a695..6a3659c1 100644 --- a/.local/share/chezmoi/home/private_dot_config/shell/aliases.tmpl +++ b/.local/share/chezmoi/home/private_dot_config/shell/aliases.sh.tmpl @@ -1,4 +1,6 @@ -{{- if eq .chezmoi.os "darwin" }} +#!/usr/bin/env sh + +{{ if eq .chezmoi.os "darwin" }} ### macOS Polyfills if command -v brew > /dev/null; then PATH="$(brew --prefix)/opt/coreutils/libexec/gnubin:$PATH" diff --git a/.local/share/chezmoi/home/private_dot_config/shell/exports.tmpl b/.local/share/chezmoi/home/private_dot_config/shell/exports.sh.tmpl similarity index 100% rename from .local/share/chezmoi/home/private_dot_config/shell/exports.tmpl rename to .local/share/chezmoi/home/private_dot_config/shell/exports.sh.tmpl diff --git a/.local/share/chezmoi/home/private_dot_config/shell/functions b/.local/share/chezmoi/home/private_dot_config/shell/functions.sh similarity index 99% rename from .local/share/chezmoi/home/private_dot_config/shell/functions rename to .local/share/chezmoi/home/private_dot_config/shell/functions.sh index cbcd3f24..0a7f4a69 100644 --- a/.local/share/chezmoi/home/private_dot_config/shell/functions +++ b/.local/share/chezmoi/home/private_dot_config/shell/functions.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env sh + # Install WebDriverAgent on iOS device appiumwebdriver() { # read -r "Enter the UDID of the device you wish to install WebDriverAgent on: " UDID_INPUT diff --git a/.local/share/chezmoi/home/private_dot_config/shell/motd b/.local/share/chezmoi/home/private_dot_config/shell/motd.sh similarity index 98% rename from .local/share/chezmoi/home/private_dot_config/shell/motd rename to .local/share/chezmoi/home/private_dot_config/shell/motd.sh index 5f45edcc..13b950e9 100644 --- a/.local/share/chezmoi/home/private_dot_config/shell/motd +++ b/.local/share/chezmoi/home/private_dot_config/shell/motd.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env sh + ### MOTD # Add file named .hushlogin in the user's home directory to disable the MOTD if [ "$BASH_SUPPORT" = 'true' ] && [ ! -f ~/.hushlogin ] && [ "$SHLVL" -eq 1 ]; then diff --git a/.local/share/chezmoi/home/private_dot_config/shell/private_dot_private b/.local/share/chezmoi/home/private_dot_config/shell/private_private.sh similarity index 97% rename from .local/share/chezmoi/home/private_dot_config/shell/private_dot_private rename to .local/share/chezmoi/home/private_dot_config/shell/private_private.sh index 3e87255b..583c972f 100644 --- a/.local/share/chezmoi/home/private_dot_config/shell/private_dot_private +++ b/.local/share/chezmoi/home/private_dot_config/shell/private_private.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh export LEXICON_CLOUDFLARE_USERNAME={{ .user.CLOUDFLARE_USERNAME }} diff --git a/.local/share/chezmoi/home/private_dot_config/shell/profile b/.local/share/chezmoi/home/private_dot_config/shell/profile.sh similarity index 91% rename from .local/share/chezmoi/home/private_dot_config/shell/profile rename to .local/share/chezmoi/home/private_dot_config/shell/profile.sh index 08073a94..fbf04043 100644 --- a/.local/share/chezmoi/home/private_dot_config/shell/profile +++ b/.local/share/chezmoi/home/private_dot_config/shell/profile.sh @@ -1,15 +1,17 @@ +#!/usr/bin/env sh + # shellcheck disable=SC1090,SC1091 # Aliases / Functions / Exports export XDG_CONFIG_HOME="$HOME/.config" -if [ -f "$XDG_CONFIG_HOME/shell/exports" ]; then - . "$XDG_CONFIG_HOME/shell/exports" +if [ -f "$XDG_CONFIG_HOME/shell/exports.sh" ]; then + . "$XDG_CONFIG_HOME/shell/exports.sh" fi -if [ -f "$XDG_CONFIG_HOME/shell/aliases" ]; then - . "$XDG_CONFIG_HOME/shell/aliases" +if [ -f "$XDG_CONFIG_HOME/shell/aliases.sh" ]; then + . "$XDG_CONFIG_HOME/shell/aliases.sh" fi -if [ -f "$XDG_CONFIG_HOME/shell/functions" ]; then - . "$XDG_CONFIG_HOME/shell/functions" +if [ -f "$XDG_CONFIG_HOME/shell/functions.sh" ]; then + . "$XDG_CONFIG_HOME/shell/functions.sh" fi ### Colorize @@ -115,8 +117,8 @@ if [ "$BASH_SUPPORT" = 'true' ]; then #fi ### MOTD - if [ -f "$XDG_CONFIG_HOME/shell/motd" ]; then - . "$XDG_CONFIG_HOME/shell/motd" + if [ -f "$XDG_CONFIG_HOME/shell/motd.sh" ]; then + . "$XDG_CONFIG_HOME/shell/motd.sh" fi fi