Merge remote-tracking branch 'bpinto/master'

.gitignore

 custom/*
 
-.DS_Store
\ No newline at end of file
+.DS_Store
+*.pyc

plugins/jump/README.md

+jump
+====
+
+A port of [Jeroen Janssens' "jump" utility] [1] to the fish shell (and [Oh My Fish!] [2]).
+
+[1]: http://jeroenjanssens.com/2013/08/16/quickly-navigate-your-filesystem-from-the-command-line.html
+[2]: https://github.com/bpinto/oh-my-fish

plugins/jump/jump.fish

+function jump
+  if test (count $argv) -ne 1
+    echo "Usage: jump <MARK_NAME>"
+  else
+    if test -d $MARKPATH/$argv[1] -a -L $MARKPATH/$argv[1]
+      cd $MARKPATH/$argv[1]
+    else
+      echo "No such mark: $argv[1]"
+    end
+  end
+end

plugins/jump/jump.load

+set -gx MARKPATH $HOME/.marks
+command mkdir -p $MARKPATH

plugins/jump/mark.fish

+function mark
+  if test (count $argv) -eq 0 -o (count $argv) -gt 2
+    echo "Usage: mark <MARK_NAME> [DIRECTORY]"
+  else if test -e $MARKPATH/$argv[1]
+    if test -d $MARKPATH/$argv[1] -a -L $MARKPATH/$argv[1]
+      echo "A mark named $argv[1] already exists."
+    else
+      echo "$MARKPATH/$argv[1] already exists."
+    end
+  else if test (count $argv) -eq 1
+    command ln -s (pwd) $MARKPATH/$argv[1]
+  else if test (count $argv) -eq 2
+    if test -d $argv[2]
+      set -l current_dir (pwd)
+      cd $argv[2]
+      command ln -s (pwd) $MARKPATH/$argv[1]
+      cd $current_dir
+    else
+      echo "$argv[2] is not a valid directory."
+    end
+  end
+end

plugins/jump/marks.fish

+function marks
+  if test (count $argv) -gt 0
+    echo "Usage: marks"
+  else
+    set -l file_list (command ls $MARKPATH)
+    if test (count $file_list) -eq 0
+      echo "No marks currently defined."
+    else
+      set -l mark_list
+      for file in $file_list
+        if test -d $MARKPATH/$file -a -L $MARKPATH/$file
+          set mark_list $mark_list $file
+        end
+      end
+      if test (count $mark_list) -eq 0
+        echo "No marks currently defined."
+      else
+        set -l current_dir (pwd)
+        for mark_name in $mark_list
+          cd $MARKPATH/$mark_name
+          set -l real_path (pwd)
+          echo "$mark_name -> $real_path"
+        end
+        cd $current_dir
+      end
+    end
+  end
+end

plugins/jump/unmark.fish

+function unmark
+  if test (count $argv) -eq 0
+    echo "Usage: unmark <MARK_NAME>..."
+  else
+    for mark_name in $argv
+      if test -d $MARKPATH/$mark_name -a -L $MARKPATH/$mark_name
+        command rm -i $MARKPATH/$mark_name
+      else
+        echo "No such mark: $mark_name"
+      end
+    end
+  end
+end

plugins/python/_python.fish

+# Use python2 if found, otherwise fallback to python.
+function _python
+  if which python2
+    python2
+  else
+    python
+  end
+end

plugins/python/pybeautifyjson.fish

 # beautify json string
 # use : pybeautifyjson '{"foo": "lorem", "bar": "ipsum"}'
 function pybeautifyjson
-  echo $argv | python -mjson.tool
-end
\ No newline at end of file
+  echo $argv | _python -mjson.tool
+end

plugins/python/pyclean.fish

 # clean current directory recursively from any .pyc and .pyo files
 function pyclean
-  if test -n $argv
-    set path2CLEAN $argv
-  else
+  set -l path2CLEAN
+
+  if set -q $argv
     set path2CLEAN .
+  else
+    set path2CLEAN $argv
   end
 
   find $path2CLEAN -name "*.py[co]" -type f -delete
-end
\ No newline at end of file
+end

plugins/python/pyhttp.fish

@@ -5,5 +5,6 @@ function pyhttp
   else
     set HTTPPORT 1025
   end
-  python -m SimpleHTTPServer $HTTPPORT;
+
+  _python -m SimpleHTTPServer $HTTPPORT;
 end

plugins/python/pysmtp.fish

@@ -5,6 +5,7 @@ function pysmtp
   else
     set SMTPPORT 1025
   end
+
   echo "smtp server started on port" $SMTPPORT;
-  python -m smtpd -n -c DebuggingServer localhost:$SMTPPORT;
+  _python -m smtpd -n -c DebuggingServer localhost:$SMTPPORT;
 end

plugins/sublime/subl.fish

-function subl --description 'Open Sublime Text 2'
-  if test -d "/Applications/Sublime Text 2.app"
+function subl --description 'Open Sublime Text'
+  if test -d "/Applications/Sublime Text.app"
+    "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl" $argv
+  else if test -d "/Applications/Sublime Text 2.app"
     "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl" $argv
+  else if test -x "/opt/sublime_text/sublime_text"
+    "/opt/sublime_text/sublime_text" $argv
+  else
+    echo "No Sublime Text installation found"
   end
 end

plugins/vi-mode/README.md

+# vi-mode
+Basic vi key bindings emulation for fish.
+
+## Install
+Add `vi-mode` to your list of fish plugins in your `config.fish`.
+
+Example:
+
+    set fish_plugins autojump vi-mode
+
+## Configuration
+### Default mode
+The default vi mode can be set by defining the variable `vi_mode_default` in
+your `config.fish`.
+If used, this variable must be set before loading `oh-my-fish`.
+Its default value is `vi_mode_insert`.
+
+To set normal mode as default:
+
+    set vi_mode_default vi_mode_normal
+
+### Mode indicator
+The mode indicator is stored in the variable `vi_mode`.
+
+See the oh-my-fish theme `simplevi` for an example of integration of the
+indicator into the prompt.
+
+### User key bindings
+User additional key bindings can be defined with the function
+`vi_mode_user_key_bindings`. If used, this function must be defined before
+loading `oh-my-fish`.
+
+Example:
+
+    function vi_mode_user_key_bindings
+        bind \el  suppress-autosuggestion
+    end
+
+## Not implemented
+- bind 2 vi-arg-digit
+- bind y yank-direction
+- bind g magic :-P
+- bind ^a increment next number
+- bind ^x decrement next number
+- bind /?nN search (jk kind of does this)
+- registers (maybe try to make sensible integration into X, like an
+  explicit yank with y goes to an X selection, while an implicit
+  delete with x etc. doesn't. "\* and "+ should natually go to the
+  appropriate X selection if possible)
+- etc.
+
+## Author
+This mode has been created by [Ian Munsie][ian_github], the original file can
+be found [here][original].
+It has been adapted for oh-my-fish by [Sylvain Benner][syl_github].
+
+[ian_github]: https://github.com/DarkStarSword
+[original]: https://github.com/DarkStarSword/junk/blob/master/vi-mode.fish
+[syl_github]: https://github.com/syl20bnr
+
+
+

plugins/vi-mode/vi-mode-impl.py

+# This script is part of the vi-mode plugin for fish
+# author: Ian Munsie
+# Adapted for oh-my-fish by Sylvain Benner
+
+import sys
+from functools import reduce
+
+command = sys.argv[1]
+direction = sys.argv[2]
+new_pos = pos = int(sys.argv[3])
+lineno = int(sys.argv[4]) - 1
+cmdline_list = sys.argv[5:]
+cmdline = '\n'.join(cmdline_list)
+
+def start():
+    return (0, 0)
+def end():
+    return (len(cmdline), -1)
+class not_found(Exception): pass
+
+def dir_0():
+    return (reduce(lambda a,b: a + len(b) + 1, cmdline_list[:lineno], 0), 0)
+
+def dir_eol(): # end of line
+    before_len = reduce(lambda a,b: a + len(b) + 1, cmdline_list[:lineno], 0)
+    line_len = len(cmdline_list[lineno]) or 1
+    return (before_len + line_len, -1)
+
+# These routines are all similar, they can probably be combined into one, but
+# I'll make sure I get all working and understand the differences first
+def dir_fnw(): # First Non-Whitespace
+    import re
+    len_before = reduce(lambda a,b: a + len(b) + 1, cmdline_list[:lineno], 0)
+    match = re.search('^\s*[^\s]', cmdline_list[lineno])
+    if not match:
+        return start()
+    return (len_before + match.end()-1, 0)
+dir__ = dir_fnw # XXX: I always used _ as this, but turns out that might not be quite right
+
+def _dir_w(regexp):
+    import re
+
+    searchpart = cmdline[pos:]
+    match = re.search(regexp, searchpart)
+    if not match:
+        return end()
+    return (pos + match.end()-1, 0)
+
+def _dir_e(regexp):
+    import re
+
+    searchpart = cmdline[pos+1:]
+    match = re.search(regexp, searchpart)
+    if not match:
+        return end()
+    return (pos+2 + match.start(), -1)
+
+def _dir_b(regexp):
+    import re
+
+    if pos == 0:
+        return start()
+
+    # Reverse the string instead of matching to right:
+    searchpart = cmdline[pos-1::-1]
+    match = re.search(regexp, searchpart)
+    if not match:
+        return start()
+    return (len(searchpart) - (match.start()+1), 0)
+
+def _dir_ge(regexp):
+    import re
+
+    if pos == 0:
+        return start()
+
+    # Reverse the string instead of matching to right:
+    searchpart = cmdline[pos::-1]
+    match = re.search(regexp, searchpart)
+    if not match:
+        return start()
+    return (len(searchpart) - (match.end()), 0)
+
+# Simple, but not inclusive enough:
+# def dir_w(): return _dir_w(r'[^\w]\w')
+# def dir_e(): return _dir_e(r'\w[^\w]')
+
+# Slightly too inclusive, e.g. fi--sh matches both '-' characters, but should only match one:
+_dir_w_regexp = r'[^\w][^\s]|\w[^\w\s]'
+_dir_e_regexp = r'[^\s][^\w]|[^\w\s]\w'
+_dir_W_regexp = r'\s[^\s]'
+_dir_E_regexp = r'[^\s]\s'
+
+def dir_w(): return _dir_w(_dir_w_regexp)
+def dir_W(): return _dir_w(_dir_W_regexp)
+def dir_e(): return _dir_e(_dir_e_regexp)
+def dir_E(): return _dir_e(_dir_E_regexp)
+def dir_b(): return _dir_b(_dir_e_regexp)
+def dir_B(): return _dir_b(_dir_E_regexp)
+def dir_ge(): return _dir_ge(_dir_w_regexp)
+def dir_gE(): return _dir_ge(_dir_W_regexp)
+def dir_cw(): return _dir_w(_dir_e_regexp)
+def dir_cW(): return _dir_w(_dir_E_regexp)
+
+def dir_h():
+    if pos: return (pos-1, 0)
+    return start()
+
+def dir_l():
+    return (pos+1, 0)
+
+def dir_t(char):
+    new_pos = cmdline.find(char, pos+1)
+    if new_pos < 0:
+        raise not_found
+    return (new_pos, -1)
+
+def dir_T(char):
+    new_pos = cmdline.rfind(char, 0, pos)
+    if new_pos < 0:
+        raise not_found
+    return (new_pos+1, 0)
+
+def dir_f(char): return (dir_t(char)[0]+1, -1)
+def dir_F(char): return (dir_T(char)[0]-1, 0)
+
+def cmd_delete():
+    dst_pos = dir(direction)
+    if dst_pos >= pos:
+        new_cmdline = cmdline[:pos] + cmdline[dst_pos:]
+        return (new_cmdline, pos)
+    new_cmdline = cmdline[:dst_pos] + cmdline[pos:]
+    return (new_cmdline, dst_pos)
+
+def cmd_change():
+    # 'Special case: 'cw' and 'cW' are treated like 'ce' and 'cE' if the cursor
+    # is on a non-blank.  This is because 'cw' is interpreted as change-word,
+    # and a word does not include the following white space.'
+    #
+    # Note: Even with this special case the behaviour does not quite match what
+    # vim actually does in practice - try with the cursor on punctuation, or on
+    # the last character in a word. Specifically, the behaviour of cw differs
+    # from ce when the cursor is already on the last character of a 'word', for
+    # vim's definition of word.
+    #
+    # Because of this, we use a special direction to handle this case.
+    global direction
+    if direction in 'wW' and not cmdline[pos].isspace():
+        direction = direction.replace('w', 'cw').replace('W', 'cW')
+    return cmd_delete()
+
+def cmd_o():
+    above = '\n'.join(cmdline_list[:lineno + 1])
+    below = '\n'.join(cmdline_list[lineno + 1:])
+    return (above + '\n\n' + below, len(above)+1)
+
+def cmd_O():
+    above = '\n'.join(cmdline_list[:lineno])
+    below = '\n'.join(cmdline_list[lineno:])
+    return (above + '\n\n' + below, len(above)+1)
+
+def _dir_cmd_func(func):
+    (pos1, pos2) = (pos, dir(direction))
+    if pos2 < pos:
+        (pos1, pos2) = (pos2, pos1)
+    new_cmdline = cmdline[:pos1] + func(cmdline[pos1:pos2]) + cmdline[pos2:]
+    return (new_cmdline, pos1)
+
+# XXX: automagic completion sometimes hides the results of changing the case in these commands:
+def cmd_upper(): return _dir_cmd_func(str.upper)
+def cmd_lower(): return _dir_cmd_func(str.lower)
+def cmd_swapcase():  return _dir_cmd_func(str.swapcase)
+
+def dir(d, cursor = False):
+    def validate(pos):
+        if pos < 0: return 0
+        if pos > len(cmdline): return len(cmdline)
+        return pos
+    a = ()
+    if ':' in d:
+        (d, a) = d.split(':', 1)
+    (new_pos, cursor_off) = globals()['dir_%s' % d](*a)
+    if cursor:
+        return validate(new_pos + cursor_off)
+    return validate(new_pos)
+
+def cmd(c): return globals()['cmd_%s' % c]()
+
+def cmd_normal():
+    return (None, dir(direction, True))
+
+try:
+    (cmdline, new_pos) = cmd(command)
+    if cmdline is not None:
+        print ( cmdline )
+except not_found:
+    new_pos = pos
+print ( new_pos )

themes/numist/fish_prompt.fish

@@ -43,6 +43,7 @@ function fish_prompt
 
   # Prompt
   set -l prompt
+  set -l UID (id -u $USER)
   if [ "$UID" = "0" ]
     set prompt "$red# "
   else

themes/simplevi/README.md

+fish_prompt-simplevi
+====================
+
+The stock prompt with the vi indicator appended.
+It is meant to be used with the `vi-mode` plugin.
+
+Screenshots:
+
+![normal mode](https://raw.github.com/syl20bnr/fish_prompt-simplevi/master/prompt_fish-simplevi-n.png)
+
+![insert mode](https://raw.github.com/syl20bnr/fish_prompt-simplevi/master/prompt_fish-simplevi-i.png)
+

themes/simplevi/fish_prompt.fish

+# name: simplevi
+function fish_prompt -d "Write out the prompt"
+  printf '%s@%s%s%s%s [%s]> ' (whoami) (hostname|cut -d . -f 1) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal) $vi_mode
+end