@@ -8,7 +8,7 @@

 # echo "begin zshrc"

-interactive_echo "shell session started for $USER on $TTY at `date`" | tee /dev/stderr | logger

+interactive_echo "shell session started for $USER on $TTY at `date`" | logger

 source $HOME/.localzshrc.sh

@@ -150,3 +150,4 @@ export CPATH=$CPATH:$HOME/include

 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/lib

 export VIMCLOJURE_SERVER_JAR="$HOME/lib/vimclojure/server-2.3.6.jar"

 export CLON_THEME=el

+

@@ -2,6 +2,11 @@

 autoload -U regexp-replace

 GIT_DEBUG=0

+

+git-bump() {

+  git commit -m "${SITE_PREFIX:-}(bump)" --allow-empty

+}

+

 git-update-repos() {

   find . -name .git | (

     while read -r repo; do

@@ -6,3 +6,4 @@ if [[ -d "$HOME/.zsh_help" ]]; then

 fi

 alias run-help >/dev/null && unalias run-help

 bindkey -v '^_' run-help

+

@@ -16,7 +16,6 @@

 # The following lines were added by compinstall

-

 # zstyle ':completion:*' completer _expand _complete #_match _prefix

 zstyle ':completion:*' completer _list _oldlist _expand _complete _match _prefix #_correct _prefix

 zstyle ':completion:*' keep-prefix true

@@ -41,8 +40,17 @@ zstyle :compinstall filename '/Users/elangley/.zsh.d/99-completion.zsh'

 source $HOME/.zsh.d/nix-zsh-completions/nix.plugin.zsh

 fpath=($HOME/.zsh.d/completion $fpath $HOME/.zsh.d/nix-zsh-completions)

-autoload -U compinit && compinit

-compinit

+autoload -Uz compinit

+

+if [[ -n $HOME/.zcompdump(#qN.mh+24) ]]; then

+

+  echo running compinit

+  compinit

+  touch $HOME/.zcompdump

+else

+  compinit -C

+fi;

+

 # # End of lines added by compinstall

@@ -0,0 +1,8 @@

+autoload -Uz surround

+zle -N delete-surround surround

+zle -N add-surround surround

+zle -N change-surround surround

+bindkey -a cs change-surround

+bindkey -a ds delete-surround

+bindkey -a ys add-surround

+bindkey -M visual S add-surround

@@ -1,16 +1,11 @@

-FORTUNE="$(command -v fortune)"

-if [ -x "$FORTUNE" ]; then

-  $FORTUNE -ec

-fi

+# FORTUNE="$(command -v fortune)"

+# if [ -x "$FORTUNE" ]; then

+#   $FORTUNE -ec

+# fi

-#zprof

-export NVM_DIR="/home/edwlan/.nvm"

-[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm

+# echo 'zshrc done'

-echo 'zshrc done'

+# echo plugins done

-#THIS MUST BE AT THE END OF THE FILE FOR GVM TO WORK!!!

-[[ -s "/Users/edwlan/.gvm/bin/gvm-init.sh" ]] && source "/Users/edwlan/.gvm/bin/gvm-init.sh"

-

-echo plugins done

+# zprof

@@ -1,7 +1,7 @@

 #:depends-on:utils

 export GNU_PREFIX=''

 platform="$(uname -s)"

-interactive_echo the platform is "$platform"

+# interactive_echo the platform is "$platform"

 if [[ $platform == 'Darwin' ]] && command -v gls 2>&1 >/dev/null; then

 	GNU_PREFIX='g'

 else

@@ -80,6 +80,15 @@ function get_forge_function() {

   echo "${forge}_url"

 }

+function get_forge_root() {

+  local forge="$1"

+  if command -v "${forge}_root" &>>-; then

+    "${forge}_root"

+  else

+    echo "$GIT_3DP_DIR"/

+  fi

+}

+

 alias_forge bb github

 alias_forge gh github

 alias_forge gl gitlab

@@ -100,7 +109,7 @@ function git-get() {

     package=$2

     shift

   else

-    echo 'usage: <forge> <user> <package> or <forge> <package>'

+    echo 'usage: <forge> <user> <package>'

     return 2

   fi

@@ -108,10 +117,12 @@ function git-get() {

   shift

-  cd "$GIT_3DP_DIR"

+  local target="$(get_forge_root "$forge")"

+  cd "$target"

   local forge_url_function="${$(get_forge_function "$forge"):?forge not recognized}"

   git-forge-clone "$forge_url_function"

   cd "$(basename "$package")"

 }

+

@@ -4,28 +4,35 @@ savedir() {

     truncfile 50 $HOME/.gtaliases

     echo $cmd >> $HOME/.gtaliases

 }

+source "$HOME/.gtaliases"

 hash -d "desktop=$HOME/Desktop"

 hash -d "downloads=$HOME/Downloads"

 hash -d "programming=$HOME/Programming"

+

 git_dir=($HOME/git*_repos)

 num_git_dirs="$git_dir[(I)$git_dir[-1]]" 

 if (( num_git_dirs > 0 )); then

-  hash -d "g=${git_dir[1]}"

+  hash -d "g=${${git_dir[1]}%/}"

+

+  if [[ -d $HOME/dotfiles ]]; then

+    hash -d zsh_conf=$HOME/dotfiles/zsh

+    hash -d dotfiles=$HOME/dotfiles

+  elif [[ -d ~g/dotfiles ]]; then

+    hash -d zsh_conf=~g/dotfiles/zsh

+    hash -d dotfiles=~g/dotfiles

+  fi

+

 else

   echo no git directories

+

+  if [[ -d $HOME/dotfiles ]]; then

+    hash -d zsh_conf=$HOME/dotfiles/zsh

+    hash -d dotfiles=$HOME/dotfiles

+  fi

+

 fi

 gtdo() { cd ~downloads/"${(j</>)*}" }

-if [[ -d $HOME/dotfiles ]]; then

-  hash -d zsh_conf=$HOME/dotfiles/zsh

-  hash -d dotfiles=$HOME/dotfiles

-elif [[ -d $HOME/git_repos ]]; then

-  hash -d zsh_conf=$HOME/git_repos/dotfiles/zsh

-  hash -d dotfiles=$HOME/git_repos/dotfiles

-elif [[ -d $HOME/github_repos ]]; then

-  hash -d zsh_conf=$HOME/github_repos/dotfiles/zsh

-  hash -d dotfiles=$HOME/github_repos/dotfiles

-fi

@@ -1,5 +1,5 @@

 # -*- mode: sh; sh-shell: zsh;-*-

-#zmodload zsh/zprof

+# zmodload zsh/zprof

 if [[ "$TERM" == "dumb" ]]; then

     unsetopt zle

@@ -8,7 +8,7 @@ if [[ "$TERM" == "dumb" ]]; then

     unfunction precmd

     unfunction preexec

     PS1='$ '

-else 

+else

   PLUGIN_DIR="${PLUGIN_DIR:-$HOME/.zsh.d}"

   local script_depends loaded_depends

@@ -21,6 +21,9 @@ else

   build_depends() {

     local -a depends

     depends=(${(@f)$(get_depends "$1")})

+    if [[ -z $depends ]]; then

+      script_depends[$1]=-

+    fi

     for depend in $depends; do

       script_depends[$1]+="$depend:"

     done

@@ -28,7 +31,7 @@ else

   load_depends() {

     for depend in ${(s<:>)script_depends[$1]}; do

-      if [[ -z $loaded_depends[$depend] ]]; then

+      if [[ -z $loaded_depends[$depend] && "$depend" != "-" ]]; then

           loaded_depends[$depend]=1

           local fn="$PLUGIN_DIR/dependencies/$depend.zsh"

           if [[ -f $fn ]]; then

@@ -45,13 +48,18 @@ else

     done

   }

-  init_scripts=( $PLUGIN_DIR/*.{,z}sh(N) ) 

+  init_scripts=( $PLUGIN_DIR/*.{,z}sh(N) )

   PATH="<<<:$PATH:>>>"

   for x in $init_scripts; do

-    build_depends "$x"

-    load_depends "$x"

+    if [[ -f ~/zshrc.depends ]]; then

+      source ~/zshrc.depends

+      load_depends "$x"

+    else

+      build_depends "$x"

+      load_depends "$x"

+      echo "script_depends=(${(kv)script_depends})" >| ~/zshrc.depends

+    fi

     source "$x"

   done

 fi

-