diff --git a/zprofile b/zprofile index ac38f72..122f2cb 100644 --- a/zprofile +++ b/zprofile @@ -1,11 +1,8 @@ #!/usr/bin/env zsh # Eryn Wells -ShellLog 'Initializing Login Environment' - # Start SSH agent for password-less logins if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then - ShellLog 'Starting ssh-agent' eval `ssh-agent -s` trap "kill $SSH_AGENT_PID" 0 fi diff --git a/zsh/func/darwin_configure_screenshots_directory b/zsh/func/darwin_configure_screenshots_directory index 84b93f7..cd93c0f 100644 --- a/zsh/func/darwin_configure_screenshots_directory +++ b/zsh/func/darwin_configure_screenshots_directory @@ -7,14 +7,12 @@ function darwin_configure_screenshots_directory { icloud=`darwin_icloud_drive_path` if [[ ! -d "$icloud" ]]; then - ShellLog -l error "iCloud directory doesn't exist: $icloud" return 1 fi # Put screenshots in iCloud Drive, in a directory according to hostname local name=`hostname -s | tr A-Z a-z` local screenshots_dir="$icloud/Screenshots/$name" - ShellLog "Setting screenshot directory: $screenshots_dir" mkdir -p "$screenshots_dir" defaults write com.apple.screencapture screenshots_diration "$screenshots_dir" diff --git a/zsh/func/darwin_init_once b/zsh/func/darwin_init_once index be3a868..3829569 100644 --- a/zsh/func/darwin_init_once +++ b/zsh/func/darwin_init_once @@ -7,14 +7,12 @@ autoload darwin_configure_screenshots_directory function darwin_init_once { # Dim dock icons of apps that have been hidden. - ShellLog "Auto-hiding Dock" defaults write com.apple.Dock showhidden -boolean yes killall Dock darwin_configure_screenshots_directory # See https://techstuffer.com/this-app-is-damaged-error-macos-sierra/ - ShellLog "Disabling overly restrictive Gatekeeper" sudo spctl --master-disable } diff --git a/zsh/func/init_env b/zsh/func/init_env index e4b1dba..3cadb17 100644 --- a/zsh/func/init_env +++ b/zsh/func/init_env @@ -4,8 +4,6 @@ function init_env { - ShellLog 'Initializing basic environment' - export PAGER="less" export MANPAGER=$PAGER export EDITOR="vim" diff --git a/zsh/func/init_env_darwin b/zsh/func/init_env_darwin index 7fbe6bc..296aac6 100644 --- a/zsh/func/init_env_darwin +++ b/zsh/func/init_env_darwin @@ -7,8 +7,6 @@ autoload prepend_to_path function init_env_darwin { - ShellLog "Initializing Darwin environment" - export OSBUILD=`sysctl -n kern.osversion` export OSVERSION=`sysctl -n kern.osproductversion` export HWMODEL=`sysctl -n hw.model` diff --git a/zsh/func/init_rc_aliases b/zsh/func/init_rc_aliases index c07686f..9870d74 100644 --- a/zsh/func/init_rc_aliases +++ b/zsh/func/init_rc_aliases @@ -5,8 +5,6 @@ autoload binary_exists function init_rc_aliases { - ShellLog -l 'debug' "Setting up shell aliases" - alias j='jobs' alias h='history' alias df='df -h' @@ -28,13 +26,11 @@ function init_rc_aliases binary_exists ledger && alias l='ledger' binary_exists gpg2 && alias gpg='gpg2' - ShellLog -l debug 'Setting up suffix aliases' alias -s c='vim' alias -s tex='vim' alias -s txt='vim' alias -s xml='vim' alias -s jar='java -jar' - } init_rc_aliases "$@" diff --git a/zsh/func/init_rc_configure_completion b/zsh/func/init_rc_configure_completion index a58376f..d967133 100644 --- a/zsh/func/init_rc_configure_completion +++ b/zsh/func/init_rc_configure_completion @@ -3,8 +3,6 @@ function init_rc_configure_completion { - ShellLog 'Initializing completion system' - autoload -U compinit compinit diff --git a/zsh/func/init_rc_configure_ls b/zsh/func/init_rc_configure_ls index 72f42eb..d560669 100644 --- a/zsh/func/init_rc_configure_ls +++ b/zsh/func/init_rc_configure_ls @@ -7,7 +7,6 @@ function init_configure_ls local ls_options if [[ ! -e "$1" ]]; then - ShellLog -l error 'Missing required path to ls binary' return fi @@ -19,7 +18,6 @@ function init_configure_ls ls_options='-G' fi - ShellLog -l debug "Setting up aliases for $1" alias ls="$1 $ls_options" alias la="$1 -A $ls_options" alias ll="$1 -l $ls_options" @@ -33,7 +31,6 @@ function init_configure_ls dircolors="$HOME/.dircolors/default.cfg" fi - ShellLog -l debug "Setting up dircolors: `basename $dircolors`" eval `$dircolors_bin $dircolors` fi } diff --git a/zsh/func/init_rc_configure_prompt b/zsh/func/init_rc_configure_prompt index 18d3e61..b96eb41 100644 --- a/zsh/func/init_rc_configure_prompt +++ b/zsh/func/init_rc_configure_prompt @@ -8,8 +8,6 @@ function init_rc_configure_prompt theme=loquacious fi - ShellLog -l debug 'Configuring vcs_info' - autoload -U add-zsh-hook autoload -Uz vcs_info @@ -28,7 +26,6 @@ function init_rc_configure_prompt add-zsh-hook precmd export_gitbranch - ShellLog "Configuring prompt with '$theme' theme" autoload -U promptinit promptinit prompt $theme diff --git a/zsh/func/init_rc_configure_zle b/zsh/func/init_rc_configure_zle index fb946a6..c40ff37 100644 --- a/zsh/func/init_rc_configure_zle +++ b/zsh/func/init_rc_configure_zle @@ -3,8 +3,6 @@ function init_rc_configure_zle { - ShellLog 'Configuring ZLE' - local mode=$1 if [[ -z "$mode" ]]; then mode=emacs @@ -13,7 +11,6 @@ function init_rc_configure_zle function configure_zle_emacs { } function configure_zle_vim { } - ShellLog -l debug "Using $mode command line editing mode" if [[ $mode == 'vim' ]]; then bindkey -v configure_zle_vim diff --git a/zsh/func/init_rc_darwin b/zsh/func/init_rc_darwin index 54440f7..06a7177 100644 --- a/zsh/func/init_rc_darwin +++ b/zsh/func/init_rc_darwin @@ -5,8 +5,6 @@ autoload binary_exists function init_rc_darwin { - ShellLog 'Initializing Interactive Environment for macOS' - alias acls='command ls -le' # These things might have been installed by Homebrew, and I like the GNU diff --git a/zsh/func/init_rc_linux b/zsh/func/init_rc_linux index a22b42b..d756389 100644 --- a/zsh/func/init_rc_linux +++ b/zsh/func/init_rc_linux @@ -3,8 +3,6 @@ function init_rc_linux { - ShellLog 'Initializing Interactive Environment for Linux' - alias iptls='sudo iptables --line-numbers -nv -L' alias ip6tls='sudo ip6tables --line-numbers -nv -L' alias rlx="xrdb $HOME/.Xdefaults" diff --git a/zsh/func/init_zsh_functions b/zsh/func/init_zsh_functions index e2402a8..9e0486f 100644 --- a/zsh/func/init_zsh_functions +++ b/zsh/func/init_zsh_functions @@ -7,7 +7,6 @@ function init_zsh_functions { local myfpath="$HOME/.zsh/func" - ShellLog "Loading functions in $myfpath" for func in $myfpath/*; do [[ ! -e "$func" || -d "$func" ]] && continue @@ -15,7 +14,6 @@ function init_zsh_functions [[ "$functionName" =~ "prompt_*" ]] && continue [[ "$functionName" =~ "init_*" ]] && continue - ShellLog -l debug "Loading $functionName" autoload +X $functionName done diff --git a/zsh/func/init_zsh_history b/zsh/func/init_zsh_history index ca9223b..ad07940 100644 --- a/zsh/func/init_zsh_history +++ b/zsh/func/init_zsh_history @@ -3,8 +3,6 @@ function init_zsh_history { - ShellLog 'Setting up history' - setopt \ APPEND_HISTORY \ EXTENDED_HISTORY \ diff --git a/zsh/func/init_zsh_options b/zsh/func/init_zsh_options index 3a41d59..127f842 100644 --- a/zsh/func/init_zsh_options +++ b/zsh/func/init_zsh_options @@ -3,8 +3,6 @@ function init_zsh_options { - ShellLog 'Setting shell options' - # Report seconds since shell was invoked in milliseconds typeset -F SECONDS diff --git a/zshrc b/zshrc index 4cbc401..600d0af 100644 --- a/zshrc +++ b/zshrc @@ -1,8 +1,6 @@ #!/usr/bin/env zsh # Eryn Wells -ShellLog 'Initializing Interactive Environment' - autoload +X init_app_environments autoload +X init_rc_aliases autoload +X init_rc_configure_completion