Update all environment name (#195)

* Refactor env

* Update README.md

* Add demo tape

Author: b4b4r07

README.md

@@ -1,21 +1,19 @@
 function __enhancd_install --on-event enhancd_install
     set -l root (string join / (status filename | string split /)[1..-3])
 
-    set -Ux ENHANCD_FILTER
-    set -Ux ENHANCD_COMMAND "cd"
-
     set -Ux ENHANCD_ROOT "$root/functions/enhancd"
-
     set -Ux ENHANCD_DIR "$HOME/.enhancd"
-    set -Ux ENHANCD_DISABLE_DOT 0
-    set -Ux ENHANCD_DISABLE_HYPHEN 0
-    set -Ux ENHANCD_DISABLE_HOME 0
+    set -Ux ENHANCD_COMMAND "cd"
+
+    set -Ux ENHANCD_ENABLE_DOUBLE_DOT true
+    set -Ux ENHANCD_ENABLE_HYPHEN true
+    set -Ux ENHANCD_ENABLE_HOME true
 
-    set -Ux ENHANCD_DOT_ARG ".."
-    set -Ux ENHANCD_HYPHEN_ARG "-"
+    set -Ux ENHANCD_ARG_DOUBLE_DOT ".."
+    set -Ux ENHANCD_ARG_HYPHEN "-"
+    set -Ux ENHANCD_ARG_HOME ""
     set -Ux ENHANCD_HYPHEN_NUM 10
-    set -Ux ENHANCD_HOME_ARG ""
-    set -Ux ENHANCD_FILTER_ABBREV 0
+    set -Ux ENHANCD_USE_ABBREV false
 
     set -Ux ENHANCD_COMPLETION_DEFAULT 1
     set -Ux ENHANCD_COMPLETION_BEHAVIOR "default"
@@ -41,18 +39,17 @@ end
 
 function __enhancd_uninstall --on-event enhancd_uninstall
     command rm -rf $ENHANCD_DIR
-    set --erase ENHANCD_FILTER_ABBREV
-    set --erase ENHANCD_FILTER
+    set --erase ENHANCD_USE_ABBREV
     set --erase ENHANCD_COMMAND
     set --erase ENHANCD_ROOT
     set --erase ENHANCD_DIR
-    set --erase ENHANCD_DISABLE_DOT
-    set --erase ENHANCD_DISABLE_HYPHEN
-    set --erase ENHANCD_DISABLE_HOME
-    set --erase ENHANCD_DOT_ARG
-    set --erase ENHANCD_HYPHEN_ARG
+    set --erase ENHANCD_ENABLE_DOUBLE_DOT
+    set --erase ENHANCD_ENABLE_HYPHEN
+    set --erase ENHANCD_ENABLE_HOME
+    set --erase ENHANCD_ARG_DOUBLE_DOT
+    set --erase ENHANCD_ARG_HYPHEN
     set --erase ENHANCD_HYPHEN_NUM
-    set --erase ENHANCD_HOME_ARG
+    set --erase ENHANCD_ARG_HOME
     set --erase ENHANCD_COMPLETION_DEFAULT
     set --erase ENHANCD_COMPLETION_BEHAVIOR
     set --erase ENHANCD_COMPLETION_KEYBIND

conf.d/enhancd.fish

@@ -1,64 +1,92 @@
 Output demo.gif
 
-# Set Theme "Builtin Solarized Dark"
+#Set Theme "Builtin Solarized Dark"
+#Set Theme "TokyoNightLight"
+#Set Theme "nord"
+#Set Theme "Tinacious Design (Light)"
+#Set Theme "Violet Light"
+#Set Theme "Tomorrow"
 
-Set FontSize 30
-Set Width 1200
-Set Height 600
+# Dark theme
+#Set Theme { "name": "Whimsy", "black": "#535178", "red": "#ef6487", "green": "#5eca89", "yellow": "#fdd877", "blue": "#65aef7", "magenta": "#aa7ff0", "cyan": "#43c1be", "white": "#ffffff", "brightBlack": "#535178", "brightRed": "#ef6487", "brightGreen": "#5eca89", "brightYellow": "#fdd877", "brightBlue": "#65aef7", "brightMagenta": "#aa7ff0", "brightCyan": "#43c1be", "brightWhite": "#ffffff", "background": "#29283b", "foreground": "#b3b0d6", "selection": "#3d3c58", "cursor": "#b3b0d6" }
+
+# Light theme
+Set Theme { "name": "Spring", "black": "#000000", "red": "#ff4d83", "green": "#1f8c3b", "yellow": "#1fc95b", "blue": "#1dd3ee", "magenta": "#8959a8", "cyan": "#3e999f", "white": "#ffffff", "brightBlack": "#000000", "brightRed": "#ff0021", "brightGreen": "#1fc231", "brightYellow": "#d5b807", "brightBlue": "#15a9fd", "brightMagenta": "#8959a8", "brightCyan": "#3e999f", "brightWhite": "#ffffff", "background": "#ffffff", "foreground": "#4d4d4c", "cursor": "#f8aba6" }
+
+Set FontSize 40
+Set Width 1800
+Set Height 1000
 
 Set Shell bash
 
 Hide
-Type "source init.sh" Enter
+Type "source $PWD/init.sh" Enter
 #
+Type `export FZF_DEFAULT_OPTS='--height 75% --reverse --margin=0,1 --bind ctrl-p:toggle-preview,ctrl-f:page-down,ctrl-b:page-up --bind pgdn:preview-page-down,pgup:preview-page-up --pointer="▶" --prompt="❯ " --no-separator --scrollbar="█" --color bg+:#262626,fg+:#dadada,hl:#f09479,hl+:#f09479 --color border:#303030,info:#cfcfb0,header:#80a0ff,spinner:#36c692 --color prompt:#87afff,pointer:#ff5189,marker:#f09479'` Enter
 Type "export PS1='\[\e[38;2;90;86;224m\]\W\[\e[0m\] \$ '" Enter
 Type "export ENHANCD_FILTER=fzy:fzf:peco:zf:sk" Enter
+Type "export ENHANCD_DIR=$PWD/docs" Enter
 Type "cd ~" Enter
 Ctrl+L
 Show
 
-Set PlaybackSpeed 0.5
+Set PlaybackSpeed 0.2
 
 # First
-Sleep 1
-Type "cd" Sleep 1 Enter
-Down 5 Sleep 1
-Up 3 Sleep 1
-Type@250ms "afx" Sleep 1 Enter
+Sleep 1s
+Type "cd" Sleep 1s Enter
+Sleep 1s
+Down@100ms 5
+Up@100ms 3
+Sleep 1s
+Type@200ms "afx" Sleep 1s Enter
 
 # Second
-Sleep 1
-Type "echo $ENHANCD_FILTER" Sleep 1 Enter
-Type "export ENHANCD_FILTER=fzf:$ENHANCD_FILTER" Sleep 1 Enter
-Type "cd" Sleep 1 Enter
-Sleep 1
-Type "cd$" Sleep 1 Enter
+Sleep 1s
+Type@30ms "echo $ENHANCD_FILTER" Sleep 1s Enter
+Type@30ms "export ENHANCD_FILTER=fzf:$ENHANCD_FILTER" Sleep 1s Enter
+Type "cd" Sleep 1s Enter
+Sleep 1s
+Type@200ms "cd$" Sleep 1s Enter
 Enter
 
 # Third
-Type "export ENHANCD_FILTER='fzf --preview=ls --preview-window=down,50%'" Sleep 1 Enter
-Sleep 1
-Type "cd .." Sleep 1 Enter
-Down 3 Sleep 1
-Up 2 Sleep 1
+Type "# Let's configure fzf previewer as enhancd filter" Sleep 1s Ctrl+C
+Type@20ms `export ENHANCD_FILTER="fzf --preview='exa --tree --group-directories-first --git-ignore --level 1 {}'"` Sleep 1s Enter
+Sleep 1s
+Type "cd .." Sleep 1s Enter
+Sleep 1s
+Down@200ms 3 Sleep 1s
+Up@200ms 2 Sleep 1s
 Enter
 
 # Third
-Sleep 1
-Type "cd afx" Sleep 1 Enter
-Sleep 1
+Sleep 1s
+Type "cd afx" Sleep 1s Enter
+Sleep 500ms
+Ctrl+P # toggle preview
+Sleep 500ms
+Sleep 500ms Down 1
+Sleep 500ms Up 1
+Sleep 1s
 Enter
 
-Type "pwd" Sleep 1 Enter
+Type "pwd" Sleep 1s Enter
 
 # Forth
-Sleep 1
-Type "you can typo" Sleep 1 Ctrl+C
-Type "cd enhandc # typo" Sleep 1 Enter
-Sleep 1
-Enter
+Sleep 1s
+Type "cd enhandc  # works fine even if typo!" Sleep 1s Enter
+Sleep 1s
 
-Type "pwd" Sleep 1 Enter
+# Last
+Sleep 1s
+Type "cd .  # finds sub dirs!" Sleep 1s Enter
+Sleep 1s
+Type@200ms "src" Sleep 1s Enter
+Sleep 1s
 
 # end
+Enter Enter Enter
+Sleep 500ms
+Type "END."
 Sleep 2

docs/demo.gif

@@ -0,0 +1,108 @@
+/usr
+/bin
+/sbin
+/Library
+/System
+/private
+/Applications
+/opt
+/dev
+/Volumes
+/cores
+/Users/babarot/src/github.com/b4b4r07/github-labeler/docs
+/Users/babarot/src/github.com/b4b4r07/github-labeler/pkg
+/Users/babarot/src/github.com/b4b4r07/enhancd/docs
+/Users/Shared
+/Users/babarot/src/github.com/redhat-developer
+/Users/babarot/src/github.com/b4b4r07/gist/cmd
+/Users/babarot/src/github.com/b4b4r07/gist/docs
+/Users/babarot/src/github.com/b4b4r07/gist/pkg
+/Users/babarot/src/github.com/b4b4r07/vim-ltsv/ftdetect
+/Users/babarot/src/github.com/b4b4r07/vim-ltsv/syntax
+/Users/babarot/src/github.com/b4b4r07/minimal/modules
+/Users/babarot/src/github.com/tmux
+/Users/babarot/src/github.com/tmux/tmux/tools
+/Users/babarot/src/github.com/tmux/tmux/compat
+/Users/babarot/src/github.com/tmux/tmux/regress
+/Users/babarot/src/github.com/tmux/tmux/etc
+/Users/babarot/src/github.com/tmux/tmux/presentations
+/Users/babarot/src/github.com/tmux/tmux/logo
+/Users/babarot/src/github.com/tmux/tmux/fuzz
+/Users/babarot/src/github.com/b4b4r07/dotfiles/bin
+/Users/babarot/src/github.com/b4b4r07/dotfiles/etc
+/Users/babarot/src/github.com/b4b4r07/blog/cmd
+/Users/babarot/src/github.com/b4b4r07/blog/pkg
+/Users/babarot/src/github.com/b4b4r07/tellme.tokyo/cmd
+/Users/babarot/src/github.com/b4b4r07/tellme.tokyo/archetypes
+/Users/babarot/src/github.com/b4b4r07/tellme.tokyo/resources
+/Users/babarot/src/github.com/b4b4r07/tellme.tokyo/content
+/Users/babarot/src/github.com/b4b4r07/tellme.tokyo/docs
+/Users/babarot/src/github.com/b4b4r07/tellme.tokyo/layouts
+/Users/babarot/src/github.com/b4b4r07/tellme.tokyo/static
+/Users/babarot/src/github.com/b4b4r07/tellme.tokyo/sass
+/Users/babarot/Documents/Adobe
+/Users/babarot/Downloads/google-cloud-sdk/bin
+/Users/babarot/Downloads/google-cloud-sdk/platform
+/Users/babarot/Downloads/google-cloud-sdk/deb
+/Users/babarot/Downloads/google-cloud-sdk/lib
+/Users/babarot/Downloads/google-cloud-sdk/data
+/Users/babarot/Downloads/google-cloud-sdk/rpm
+/Users/babarot/src/github.com/b4b4r07/afx/pkg/update
+/Users/babarot/src/github.com/b4b4r07/afx/pkg/config
+/Users/babarot/src/github.com/b4b4r07/afx/pkg/dependency
+/Users/babarot/src/github.com/b4b4r07/afx/pkg/state
+/Users/babarot/src/github.com/b4b4r07/afx/pkg/printers
+/Users/babarot/src/github.com/b4b4r07/afx/pkg/github
+/Users/babarot/src/github.com/b4b4r07/afx/pkg/templates
+/Users/babarot/src/github.com/b4b4r07/afx/pkg/errors
+/Users/babarot/src/github.com/b4b4r07/afx/pkg/helpers
+/Users/babarot/src/github.com/b4b4r07/afx/pkg/logging
+/Users/babarot/src/github.com/b4b4r07/afx/cmd
+/Users/babarot/src/github.com/b4b4r07/afx/bin
+/Users/babarot/src/github.com/b4b4r07/afx/dist
+/Users/babarot/src/github.com/b4b4r07/afx/hack
+/Users/babarot/src/github.com/b4b4r07/afx/docs
+/Users/babarot/src/github.com/b4b4r07/enhancd/functions
+/Users/babarot/src/github.com/b4b4r07/action-opa
+/Users/babarot/src/github.com/b4b4r07/cursor-x.nvim
+/Users/babarot/src/github.com/b4b4r07/easypick.nvim
+/Users/babarot/src/github.com/b4b4r07/old
+/Users/babarot/src/github.com/b4b4r07/docs
+/Users/babarot/src/github.com/b4b4r07/tmux-git-prompt
+/Users/babarot/src/github.com/b4b4r07/gomi
+/Users/babarot/src/github.com/b4b4r07/tellme.tokyo.old
+/Users/babarot/src/github.com/b4b4r07/changed-objects
+/
+/Users/babarot/Music
+/Users/babarot/Pictures
+/Users/babarot/Library
+/Users/babarot/Public
+/Users/babarot/Movies
+/Users/babarot/pkg
+/Users/babarot/src/github.com/b4b4r07/afx/pkg
+/Users/babarot/src/github.com/b4b4r07/afx/pkg/data
+/Users/babarot/Downloads/google-cloud-sdk
+/Users/babarot/Desktop
+/Users/babarot/Documents
+/Users/babarot/Downloads
+/Users/babarot/src/github.com/b4b4r07/afx/pkg/env
+/Users/babarot/src/github.com/b4b4r07/tellme.tokyo
+/Users/babarot/src/github.com/b4b4r07/blog
+/Users/babarot/src/github.com/tmux/tmux
+/Users/babarot/src/github.com/b4b4r07/minimal
+/Users/babarot/src/github.com/b4b4r07/vim-ltsv
+/Users/babarot/src/github.com/b4b4r07/gist
+/Users/babarot/.afx
+/Users/babarot/src/github.com/b4b4r07/enhancd/conf.d
+/Users/babarot/src/github.com/b4b4r07
+/Users
+/Users/babarot/src/github.com/b4b4r07/github-labeler
+/Users/babarot/src/github.com/b4b4r07/dotfiles
+/Users/babarot/src
+/Users/babarot/src/github.com/b4b4r07/enhancd/.github
+/Users/babarot/src/github.com/b4b4r07/enhancd/src
+/Users/babarot/src/github.com
+/Users/babarot/src/github.com/b4b4r07/afx
+/Users/babarot/src/github.com/b4b4r07/enhancd
+/Users/babarot
+/Users/babarot/src/github.com/b4b4r07/enhancd/src

docs/demo.tape

@@ -13,7 +13,7 @@ function _enhancd_filter_interactive
     set -l filter (_enhancd_helper_parse_filter_string "$ENHANCD_FILTER")
     set -l count (echo "$stdin" | _enhancd_command_grep -c "")
 
-    if test $ENHANCD_FILTER_ABBREV = 1
+    if test $ENHANCD_USE_ABBREV = true
         function _enhancd_filter_interactive_abbrev
             while read -l line
                 string replace --regex "^$HOME" "~" "$line"

docs/enhancd.log

@@ -1,5 +1,5 @@
 function _enhancd_source_home
-    if test "$ENHANCD_DISABLE_HOME" = 1
+    if test "$ENHANCD_ENABLE_HOME" = false
         echo "$HOME"
         return 0
     end

functions/_enhancd_filter_interactive.fish

@@ -1,5 +1,5 @@
 function _enhancd_source_mru
-    test $ENHANCD_DISABLE_HYPHEN = 1 && echo "$OLDPWD" && return
+    test $ENHANCD_ENABLE_HYPHEN = false && echo "$OLDPWD" && return
 
     _enhancd_history_list "$argv[1]" \
         | _enhancd_filter_exclude "$HOME" \

functions/_enhancd_source_home.fish

@@ -1,5 +1,5 @@
 function _enhancd_source_parent_dirs
-    if test "$ENHANCD_DISABLE_DOT" = 1
+    if test "$ENHANCD_ENABLE_DOUBLE_DOT" = false
         echo ".."
         return 0
     end

functions/_enhancd_source_mru.fish

@@ -22,7 +22,7 @@ function enhancd
                 _enhancd_ltsv_open \
                   | _enhancd_command_awk -f "$ENHANCD_ROOT/lib/help.awk"
 
-            case "$ENHANCD_HYPHEN_ARG"
+            case "$ENHANCD_ARG_HYPHEN"
                 # If a hyphen is passed as the argument,
                 # searchs from the last 10 directory items in the log
                 set -a args (_enhancd_source_mru "$argv[2]" | _enhancd_filter_interactive)
@@ -31,7 +31,7 @@ function enhancd
             case '-'
                 set -a args "$OLDPWD"
 
-            case "$ENHANCD_DOT_ARG"
+            case "$ENHANCD_ARG_DOUBLE_DOT"
                 set -a args (_enhancd_source_parent_dirs "$argv[2]" | _enhancd_filter_interactive)
                 set code $status
 

functions/_enhancd_source_parent_dirs.fish

@@ -4,19 +4,19 @@
 export ENHANCD_ROOT
 export ENHANCD_COMMAND
 export ENHANCD_FILTER
-export ENHANCD_FILTER_ABBREV="${ENHANCD_FILTER_ABBREV:-0}"
 export ENHANCD_DIR="${ENHANCD_DIR:-$HOME/.enhancd}"
-export ENHANCD_DISABLE_DOT="${ENHANCD_DISABLE_DOT:-0}"
-export ENHANCD_DISABLE_DOT_CURRENT=${ENHANCD_DISABLE_DOT_CURRENT:-0}
-export ENHANCD_DISABLE_HYPHEN="${ENHANCD_DISABLE_HYPHEN:-0}"
-export ENHANCD_DISABLE_HOME="${ENHANCD_DISABLE_HOME:-0}"
-export ENHANCD_DOT_ARG="${ENHANCD_DOT_ARG:-..}"
-export ENHANCD_HYPHEN_ARG="${ENHANCD_HYPHEN_ARG:--}"
+export ENHANCD_ENABLE_DOUBLE_DOT="${ENHANCD_ENABLE_DOUBLE_DOT:-true}"
+export ENHANCD_ENABLE_SINGLE_DOT=${ENHANCD_ENABLE_SINGLE_DOT:-true}
+export ENHANCD_ENABLE_HYPHEN="${ENHANCD_ENABLE_HYPHEN:-true}"
+export ENHANCD_ENABLE_HOME="${ENHANCD_ENABLE_HOME:-true}"
+export ENHANCD_ARG_DOUBLE_DOT="${ENHANCD_ARG_DOUBLE_DOT:-..}"
+export ENHANCD_ARG_HYPHEN="${ENHANCD_ARG_HYPHEN:--}"
+export ENHANCD_ARG_HOME="${ENHANCD_ARG_HOME:-}"
 export ENHANCD_HYPHEN_NUM="${ENHANCD_HYPHEN_NUM:-10}"
-export ENHANCD_HOME_ARG="${ENHANCD_HOME_ARG:-}"
 export ENHANCD_COMPLETION_DEFAULT
 export ENHANCD_COMPLETION_KEYBIND="${ENHANCD_COMPLETION_KEYBIND:-^I}"
 export ENHANCD_COMPLETION_BEHAVIOR="${ENHANCD_COMPLETION_BEHAVIOR:-default}"
+export ENHANCD_USE_ABBREV="${ENHANCD_USE_ABBREV:-false}"
 
 if [[ -n ${BASH_VERSION} ]]; then
   # BASH