Merge b58bf31444 into 1514145a09

plugins/common-aliases/common-aliases.plugin.zsh

@@ -56,27 +56,110 @@ autoload -Uz is-at-least
 if is-at-least 4.2.0; then
   # open browser on urls
   if [[ -n "$BROWSER" ]]; then
-    _browser_fts=(htm html de org net com at cx nl se dk)
+    _browser_fts=(htm html xhtml)
     for ft in $_browser_fts; do alias -s $ft='$BROWSER'; done
   fi
 
-  _editor_fts=(cpp cxx cc c hh h inl asc txt TXT tex)
-  for ft in $_editor_fts; do alias -s $ft='$EDITOR'; done
+  # open editable text files in text editor
+  if [[ -n "$VISUAL" ]] || [[ -n "$EDITOR" ]]; then
+    _aliases_launch_editor() {
+      # directly launch matched files with executable bit and shebang present
+      if [[ -x "${1}" ]]; then
+        read -r <"${1}"
+        if [[ ${#REPLY} -ge 3 ]] && [[ ${REPLY:0:2} = '#!' ]]; then
+          "$@"
+          return $?
+        fi
+      fi
 
+      if [[ -n "$VISUAL" ]]; then
+        $VISUAL "$@"
+      else
+        $EDITOR "$@"
+      fi
+    }
+    # Taken from the /language/metadata/property[name="globs"] sections of the
+    # gtksourceview language definition files in
+    # /usr/share/gtksourceview-3.0/language-specs/*.lang
+    _editor_fts=(
+      abnf as adb ads 4th forth asp am awk prg bib bsv boo cg h c cmake ctest
+      cbl cob cbd cdb cdc hh hp hpp h++ cpp cxx cc C c++ cs css CSSL csv cu cuh
+      desktop kdelnk diff patch rej d docbook bat cmd sys dot gv dpatch dtd dtl
+      e eif erl hrl fcl frt fs f f90 f95 for F F90 fs g gd gi gap gdb gs glslv
+      glslf go groovy hs lhs hx pro idl igm ini jade pug java js node ijs json
+      geojson topojson jl kt tex ltx sty cls dtx ins bbl l lex flex la lai lo
+      ll logcat lua m4 ac in make mak mk page markdown md mkd m mac MAC dem DEM
+      wxm WXM build mo mop mxml n nrx nai nsh m j ml mli mll mly ocl ooc sign
+      impl cl p pas txt TXT pl pm al perl t php php3 php4 phtml pig pc po pot
+      prolog proto pp py3 py pyw R Rout r Rhistory Rtspec rst rb rake gemspe rs
+      scala scm sce sci sh bash sml sig rq sql rnw Rnw snw Snw swift sv svh t2t
+      tcl tk tera texi texinfo thrift toml tml lock vala vapi vb v vhd xml xspf
+      siv smil smi sml kino xul xbel abw zabw glabe jnlp mml rdf rss wml xmi fo
+      xslfo xslt xsl y yacc yaml yml
+    )
+    for ft in $_editor_fts; do alias -s $ft=_aliases_launch_editor; done
+  fi
+
+  # open image files in image viewer
   if [[ -n "$XIVIEWER" ]]; then
-    _image_fts=(jpg jpeg png gif mng tiff tif xpm)
+    # List inspired by https://en.wikipedia.org/wiki/Image_file_formats
+    _image_fts=(
+      #: Raster formats
+      # JPEG, JPEG2000, HEIF/HEVC, JBIG
+      jpg jpeg jpe jif jfif jfi jp2 j2k jpf jpx jpm mj2 heif heic jbg jbig
+      # BMP, BPG, GIF, ICO/ANI, PCX, PNG+MNG, TGA, TIFF, WebP (Web)
+      bmp bpg gif dib ico cur ani pcx png mng tga tiff tif webp
+      # NetPBM, XBM/XPM/XWD (ASCII)
+      pbm bgm ppm pnm xbm xpm xwd
+      # CIFF, DNG, DPX, ECW, FITS, ICS, RGBE (HDR & Raw)
+      crw dng dpx ecw fits ics ids fit fts hdr
+      # DDS ICNS OpenRaster SunRaster (Other)
+      dds icns ora ras sun
+      #: Vector formats
+      # CGM WMF Gerber IGES SVG
+      cgm wmf emf wmz emz gbr iges svg svgz
+    )
     for ft in $_image_fts; do alias -s $ft='$XIVIEWER'; done
   fi
 
-  _media_fts=(ape avi flv m4a mkv mov mp3 mpeg mpg ogg ogm rm wav webm)
-  for ft in $_media_fts; do alias -s $ft=mplayer; done
+  if [[ -n "$XMVIEWER" ]]; then
+    _media_fts=(
+      #: Audio (container) formats
+      # https://en.wikipedia.org/wiki/Audio_file_format#List_of_formats
+      aac act aiff ape au awb dct dss flac gsm m4a m4b mp3 mpc oga opus ra sln
+      tta vox wav wma wv
+      #: Video (container) formats
+      # https://en.wikipedia.org/wiki/Video_file_format#List_of_video_file_formats
+      mkv flv f4v f4p f4a f4b vob ogv drc gifv avi mov qt wmv yuv rmvb asf amv
+      m4v mpg mp2 m2v mpeg mpe mpv svi 3g2 mxf nsv
+      #: Container formats that may store both
+      3gp ogg mogg mp4 m4p rm webm
+    )
+    for ft in $_media_fts; do alias -s $ft=$XMVIEWER; done
+  fi
 
-  #read documents
-  alias -s pdf=acroread
-  alias -s ps=gv
-  alias -s dvi=xdvi
-  alias -s chm=xchm
-  alias -s djvu=djview
+  #open complex document formats using the system viewer
+  _document_fts=(
+    # Long-term storage formats
+    djvu dvi fb2 epub pdf ps rtf
+    # Office Binary & Office OpenXML
+    doc docx docm ppt pptx pptm xls xlsx xlsm
+    # OpenDocument
+    odt fodt ods fods odp fodp odg fodg odf
+    # Uniform Office Format
+    uof uot uos uop
+    # StarOffice
+    sdw sxw sdc sxc sdd sci sda sxd smf sxm
+    # WordPerfect
+    wpd wp wp4 wp5 wp6 wp7
+    # Others
+    abw gnm gnumeric pages hwp
+  )
+  if type xdg-open >/dev/null; then
+    for ft in $_document_fts; do alias -s $ft=xdg-open; done
+  elif type open >/dev/null; then
+    for ft in $_document_fts; do alias -s $ft=open; done
+  fi
 
   #list whats inside packed file
   alias -s zip="unzip -l"

plugins/nvm/README.md

@@ -42,6 +42,8 @@ as you want:
 zstyle ':omz:plugins:nvm' lazy-cmd eslint prettier typescript ...
 ```
 
+There will be a function `_omz_nvm_load` available to load `nvm` without executing any other trigger command.
+
 #### `.nvmrc` autoload
 
 Note: _if used at the same time as `lazy`, `autoload` will start working only after nvm has been lazy-loaded_

plugins/nvm/nvm.plugin.zsh

@@ -20,7 +20,7 @@ if [[ -z "$NVM_DIR" ]] || [[ ! -f "$NVM_DIR/nvm.sh" ]]; then
   return
 fi
 
-function _omz_load_nvm_completion {
+function _omz_nvm_setup_completion {
   local _nvm_completion
   # Load nvm bash completion
   for _nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do
@@ -33,12 +33,12 @@ function _omz_load_nvm_completion {
       break
     fi
   done
-  unfunction _omz_load_nvm_completion
+  unfunction _omz_nvm_setup_completion
 }
 
-function _omz_setup_autoload {
+function _omz_nvm_setup_autoload {
   if ! zstyle -t ':omz:plugins:nvm' autoload; then
-    unfunction _omz_setup_autoload
+    unfunction _omz_nvm_setup_autoload
     return
   fi
 
@@ -68,13 +68,13 @@ function _omz_setup_autoload {
   add-zsh-hook chpwd load-nvmrc
 
   load-nvmrc
-  unfunction _omz_setup_autoload
+  unfunction _omz_nvm_setup_autoload
 }
 
 if zstyle -t ':omz:plugins:nvm' lazy; then
   # Call nvm when first using nvm, node, npm, pnpm, yarn, corepack or other commands in lazy-cmd
   zstyle -a ':omz:plugins:nvm' lazy-cmd nvm_lazy_cmd
-  nvm_lazy_cmd=(nvm node npm npx pnpm pnpx yarn corepack $nvm_lazy_cmd) # default values
+  nvm_lazy_cmd=(_omz_nvm_load nvm node npm npx pnpm pnpx yarn corepack $nvm_lazy_cmd) # default values
   eval "
     function $nvm_lazy_cmd {
       for func in $nvm_lazy_cmd; do
@@ -84,14 +84,16 @@ if zstyle -t ':omz:plugins:nvm' lazy; then
       done
       # Load nvm if it exists in \$NVM_DIR
       [[ -f \"\$NVM_DIR/nvm.sh\" ]] && source \"\$NVM_DIR/nvm.sh\"
-      _omz_load_nvm_completion
-      _omz_setup_autoload
+      _omz_nvm_setup_completion
+      _omz_nvm_setup_autoload
+      if [[ \"\$0\" != _omz_nvm_load ]]; then
         \"\$0\" \"\$@\"
+      fi
     }
   "
   unset nvm_lazy_cmd
 else
   source "$NVM_DIR/nvm.sh"
-  _omz_load_nvm_completion
-  _omz_setup_autoload
+  _omz_nvm_setup_completion
+  _omz_nvm_setup_autoload
 fi