custom/example.zsh

@@ -1,12 +1,10 @@
-# Put files in this folder to add your own custom functionality.
+# You can put files here to add functionality separated per file, which
-# See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization
+# will be ignored by git.
-# 
+# Files on the custom/ directory will be automatically loaded by the init
-# Files in the custom/ directory will be:
+# script, in alphabetical order.
-# - loaded automatically by the init script, in alphabetical order
+
-# - loaded last, after all built-ins in the lib/ directory, to override them
+# For example: add yourself some shortcuts to projects you often work on.
-# - ignored by git by default
-# 
-# Example: add custom/shortcuts.zsh for shortcuts to your local projects
 #
 # brainstormr=~/Projects/development/planetargon/brainstormr
 # cd $brainstormr
+#

custom/plugins/example/example.plugin.zsh

@@ -1,3 +1,2 @@
 # Add your own custom plugins in the custom/plugins directory. Plugins placed
 # here will override ones with the same name in the main plugins directory.
-# See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization#overriding-and-adding-plugins

custom/themes/example.zsh-theme

@@ -1,6 +1,4 @@
 # Put your custom themes in this folder.
-# See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization#overriding-and-adding-themes
-# 
 # Example:
 
 PROMPT="%{$fg[red]%}%n%{$reset_color%}@%{$fg[blue]%}%m %{$fg[yellow]%}%~ %{$reset_color%}%% "

plugins/autoenv/autoenv.plugin.zsh

@@ -17,13 +17,9 @@ if ! type autoenv_init >/dev/null; then
       /usr/local/bin
       /usr/share/autoenv-git
       ~/Library/Python/bin
-      .venv/bin
-      venv/bin
-      env/bin
-      .env/bin
     )
     for d ( $install_locations ); do
-      if [[ -e $d/activate || -e $d/activate.sh ]]; then
+      if [[ -e $d/activate.sh ]]; then
         autoenv_dir=$d
         break
       fi
@@ -33,7 +29,7 @@ if ! type autoenv_init >/dev/null; then
   # Look for Homebrew path as a last resort
   if [[ -z "$autoenv_dir" ]] && (( $+commands[brew] )); then
     d=$(brew --prefix)/opt/autoenv
-    if [[ -e $d/activate || -e $d/activate.sh ]]; then
+    if [[ -e $d/activate.sh ]]; then
       autoenv_dir=$d
     fi
   fi
@@ -50,12 +46,8 @@ END
     return 1
   fi
   # Load autoenv
-  if [[ -e $autoenv_dir/activate ]]; then
-    source $autoenv_dir/activate
-  else
   source $autoenv_dir/activate.sh
 fi
-fi
 }
 [[ $? != 0 ]] && return $?
 

plugins/git/README.md

@@ -254,7 +254,6 @@ These features allow to pause a branch development and switch to another one (_"
 | work_in_progress | Echoes a warning if the current branch is a wip |
 | gwip             | Commit wip branch                               |
 | gunwip           | Uncommit wip branch                             |
-| gunwipall        | Uncommit `--wip--` commits recursively          |
 
 ### Deprecated functions
 

plugins/git/git.plugin.zsh

@@ -27,20 +27,6 @@ function work_in_progress() {
   command git -c log.showSignature=false log -n 1 2>/dev/null | grep -q -- "--wip--" && echo "WIP!!"
 }
 
-# Same as `gunwip` but recursive
-# "Unwips" all recent `--wip--` commits in loop until there is no left
-function gunwipall() {
-  while true; do
-    commit_message=$(git rev-list --max-count=1 --format="%s" HEAD)
-    if [[ $commit_message =~ "--wip--" ]]; then
-      git reset "HEAD~1"
-      (( $? )) && return 1
-    else
-      break
-    fi
-  done
-}
-
 # Check if main exists and use instead of master
 function git_main_branch() {
   command git rev-parse --git-dir &>/dev/null || return