diff --git a/zprofile b/zprofile index 0646044..122f2cb 100644 --- a/zprofile +++ b/zprofile @@ -1,11 +1,8 @@ #!/usr/bin/env zsh # Eryn Wells -shell-log 'Initializing Login Environment' - # Start SSH agent for password-less logins if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then - print_info -l 1 'Starting ssh-agent' eval `ssh-agent -s` trap "kill $SSH_AGENT_PID" 0 fi diff --git a/zsh/func/init_env b/zsh/func/init_env index c3d576f..3cadb17 100644 --- a/zsh/func/init_env +++ b/zsh/func/init_env @@ -4,8 +4,6 @@ function init_env { - shell-log '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 e7448b1..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 { - shell-log "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 cbbe945..f6a2cfd 100644 --- a/zsh/func/init_rc_aliases +++ b/zsh/func/init_rc_aliases @@ -5,8 +5,6 @@ autoload binary_exists function init_rc_aliases { - shell-log -l 'debug' "Setting up shell aliases" - alias j='jobs' alias h='history' alias df='df -h' @@ -31,7 +29,6 @@ function init_rc_aliases binary_exists ledger && alias l='ledger' binary_exists gpg2 && alias gpg='gpg2' - shell-log -l debug 'Setting up suffix aliases' alias -s c='vim' alias -s tex='vim' alias -s txt='vim' diff --git a/zsh/func/init_rc_configure_completion b/zsh/func/init_rc_configure_completion index c38f6fb..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 { - shell-log 'Initializing completion system' - autoload -U compinit compinit diff --git a/zsh/func/init_rc_configure_ls b/zsh/func/init_rc_configure_ls index 1d08c35..0f70d4d 100644 --- a/zsh/func/init_rc_configure_ls +++ b/zsh/func/init_rc_configure_ls @@ -19,7 +19,6 @@ function init_configure_ls ls_options='-G' fi - shell-log -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 +32,6 @@ function init_configure_ls dircolors="$HOME/.dircolors/default.cfg" fi - shell-log -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 14c411c..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 - shell-log -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 - shell-log "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 e535898..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 { - shell-log '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 { } - shell-log -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 bd29e3a..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 { - shell-log '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_zsh_functions b/zsh/func/init_zsh_functions index 60f90dc..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" - shell-log "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 - shell-log -l debug "Loading $functionName" autoload +X $functionName done diff --git a/zsh/func/init_zsh_history b/zsh/func/init_zsh_history index 63d22f0..ad07940 100644 --- a/zsh/func/init_zsh_history +++ b/zsh/func/init_zsh_history @@ -3,8 +3,6 @@ function init_zsh_history { - shell-log 'Setting up history' - setopt \ APPEND_HISTORY \ EXTENDED_HISTORY \ diff --git a/zsh/func/init_zsh_options b/zsh/func/init_zsh_options index dfc8aaf..127f842 100644 --- a/zsh/func/init_zsh_options +++ b/zsh/func/init_zsh_options @@ -3,8 +3,6 @@ function init_zsh_options { - shell-log 'Setting shell options' - # Report seconds since shell was invoked in milliseconds typeset -F SECONDS diff --git a/zsh/func/load_module b/zsh/func/load_module index 21e9bad..31aaa7b 100644 --- a/zsh/func/load_module +++ b/zsh/func/load_module @@ -19,9 +19,7 @@ function load_module fpath+=($modpath) - shell-log "Loading module: $mod" for func in `ls $modpath`; do - shell-log "Loading function: $func" autoload $func done diff --git a/zshrc b/zshrc index 4f536d9..600d0af 100644 --- a/zshrc +++ b/zshrc @@ -1,8 +1,6 @@ #!/usr/bin/env zsh # Eryn Wells -shell-log 'Initializing Interactive Environment' - autoload +X init_app_environments autoload +X init_rc_aliases autoload +X init_rc_configure_completion