Permalink
Browse files

[zsh] Bye bye oh-my-zsh, hello prezto

  • Loading branch information...
1 parent fe3fbf7 commit 6132049bc2dfb52b972f081fab5dabf6e72fd0c8 Russell Harmon committed Oct 1, 2012
Showing with 4,397 additions and 191 deletions.
  1. +4 −1 .gitignore
  2. +3 −3 .gitmodules
  3. +0 −1 .oh-my-zsh
  4. +29 −0 .zlogin
  5. +1 −0 .zprezto
  6. +127 −0 .zpreztorc
  7. +42 −0 .zsh/help/alias
  8. +76 −0 .zsh/help/autoload
  9. +4 −0 .zsh/help/bg
  10. +2 −0 .zsh/help/bindkey
  11. +3 −0 .zsh/help/break
  12. +2 −0 .zsh/help/builtin
  13. +10 −0 .zsh/help/bye
  14. +1 −0 .zsh/help/cap
  15. +52 −0 .zsh/help/cd
  16. +52 −0 .zsh/help/chdir
  17. +1 −0 .zsh/help/clone
  18. +4 −0 .zsh/help/colon
  19. +10 −0 .zsh/help/command
  20. +2 −0 .zsh/help/comparguments
  21. +2 −0 .zsh/help/compcall
  22. +2 −0 .zsh/help/compctl
  23. +2 −0 .zsh/help/compdescribe
  24. +2 −0 .zsh/help/compfiles
  25. +2 −0 .zsh/help/compgroups
  26. +2 −0 .zsh/help/compquote
  27. +2 −0 .zsh/help/comptags
  28. +2 −0 .zsh/help/comptry
  29. +2 −0 .zsh/help/compvalues
  30. +4 −0 .zsh/help/continue
  31. +252 −0 .zsh/help/declare
  32. +16 −0 .zsh/help/dirs
  33. +14 −0 .zsh/help/disable
  34. +14 −0 .zsh/help/disown
  35. +18 −0 .zsh/help/dot
  36. +24 −0 .zsh/help/echo
  37. +1 −0 .zsh/help/echotc
  38. +1 −0 .zsh/help/echoti
  39. +76 −0 .zsh/help/emulate
  40. +13 −0 .zsh/help/enable
  41. +6 −0 .zsh/help/eval
  42. +6 −0 .zsh/help/exec
  43. +10 −0 .zsh/help/exit
  44. +5 −0 .zsh/help/export
  45. +2 −0 .zsh/help/false
  46. +94 −0 .zsh/help/fc
  47. +4 −0 .zsh/help/fg
  48. +252 −0 .zsh/help/float
  49. +76 −0 .zsh/help/functions
  50. +1 −0 .zsh/help/getcap
  51. +3 −0 .zsh/help/getln
  52. +29 −0 .zsh/help/getopts
  53. +46 −0 .zsh/help/hash
  54. +94 −0 .zsh/help/history
  55. +252 −0 .zsh/help/integer
  56. +14 −0 .zsh/help/jobs
  57. +24 −0 .zsh/help/kill
  58. +6 −0 .zsh/help/let
  59. +82 −0 .zsh/help/limit
  60. +252 −0 .zsh/help/local
  61. +2 −0 .zsh/help/log
  62. +10 −0 .zsh/help/logout
  63. +2 −0 .zsh/help/noglob
  64. +14 −0 .zsh/help/popd
  65. +74 −0 .zsh/help/print
  66. +30 −0 .zsh/help/printf
  67. +31 −0 .zsh/help/pushd
  68. +74 −0 .zsh/help/pushln
  69. +5 −0 .zsh/help/pwd
  70. +94 −0 .zsh/help/r
  71. +114 −0 .zsh/help/read
  72. +252 −0 .zsh/help/readonly
  73. +46 −0 .zsh/help/rehash
  74. +15 −0 .zsh/help/return
  75. +1 −0 .zsh/help/sched
  76. +50 −0 .zsh/help/set
  77. +1 −0 .zsh/help/setcap
  78. +22 −0 .zsh/help/setopt
  79. +5 −0 .zsh/help/shift
  80. +4 −0 .zsh/help/source
  81. +1 −0 .zsh/help/stat
  82. +4 −0 .zsh/help/suspend
  83. +20 −0 .zsh/help/test
  84. +2 −0 .zsh/help/times
  85. +72 −0 .zsh/help/trap
  86. +2 −0 .zsh/help/true
  87. +9 −0 .zsh/help/ttyctl
  88. +43 −0 .zsh/help/type
  89. +252 −0 .zsh/help/typeset
  90. +48 −0 .zsh/help/ulimit
  91. +8 −0 .zsh/help/umask
  92. +18 −0 .zsh/help/unalias
  93. +18 −0 .zsh/help/unfunction
  94. +18 −0 .zsh/help/unhash
  95. +10 −0 .zsh/help/unlimit
  96. +20 −0 .zsh/help/unset
  97. +8 −0 .zsh/help/unsetopt
  98. +1 −0 .zsh/help/vared
  99. +6 −0 .zsh/help/wait
  100. +43 −0 .zsh/help/whence
  101. +43 −0 .zsh/help/where
  102. +43 −0 .zsh/help/which
  103. +108 −0 .zsh/help/zcompile
  104. +2 −0 .zsh/help/zformat
  105. +1 −0 .zsh/help/zftp
  106. +1 −0 .zsh/help/zle
  107. +304 −0 .zsh/help/zmodload
  108. +2 −0 .zsh/help/zparseopts
  109. +1 −0 .zsh/help/zprof
  110. +1 −0 .zsh/help/zpty
  111. +2 −0 .zsh/help/zregexparse
  112. +2 −0 .zsh/help/zsocket
  113. +1 −0 .zsh/help/zstyle
  114. +1 −0 .zsh/help/ztcp
  115. +130 −102 .zshenv
  116. +116 −0 .zshenv.old
  117. +56 −84 .zshrc
View
@@ -18,10 +18,13 @@
!.vimrc
!.zprofile
+!.zlogin
!.zshrc
+!.zshenv.old
!.zshenv
+!.zpretzorc
+!.zpretzo/
!.zsh/
-!.oh-my-zsh/
!.dotprivate/
!.tmux.conf
View
@@ -1,6 +1,3 @@
-[submodule "oh-my-zsh"]
- path = .oh-my-zsh
- url = git@github.com:eatnumber1/oh-my-zsh.git
[submodule "dotprivate"]
path = .dotprivate
url = git@github.com:eatnumber1/dotprivate.git
@@ -28,3 +25,6 @@
[submodule ".vim/bundle/inkpot"]
path = .vim/bundle/inkpot
url = git://github.com/ciaranm/inkpot.git
+[submodule ".zprezto"]
+ path = .zprezto
+ url = https://github.com/sorin-ionescu/prezto.git
Submodule .oh-my-zsh deleted from fba2c8
View
@@ -0,0 +1,29 @@
+#
+# Executes commands at login post-zshrc.
+#
+# Authors:
+# Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+# Execute code that does not affect the current session in the background.
+{
+ # Compile the completion dump to increase startup speed.
+ zcompdump="${ZDOTDIR:-$HOME}/.zcompdump"
+ if [[ "$zcompdump" -nt "${zcompdump}.zwc" || ! -s "${zcompdump}.zwc" ]]; then
+ zcompile "$zcompdump"
+ fi
+
+ # Set environment variables for launchd processes.
+ if [[ "$OSTYPE" == darwin* ]]; then
+ for env_var in PATH MANPATH; do
+ launchctl setenv "$env_var" "${(P)env_var}"
+ done
+ fi
+} &!
+
+# Print a random, hopefully interesting, adage.
+if (( $+commands[fortune] )); then
+ fortune -a
+ print
+fi
+
Submodule .zprezto added at f8da04
View
@@ -0,0 +1,127 @@
+#
+# Sets Prezto options.
+#
+# Authors:
+# Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+#
+# General
+#
+
+# Set case-sensitivity for completion, history lookup, etc.
+zstyle ':prezto:*:*' case-sensitive 'yes'
+
+# Color output (auto set to 'no' on dumb terminals).
+zstyle ':prezto:*:*' color 'yes'
+
+# Set the Zsh modules to load (man zshmodules).
+# zstyle ':prezto:load' zmodule 'attr' 'stat'
+
+# Set the Zsh functions to load (man zshcontrib).
+# zstyle ':prezto:load' zfunction 'zargs' 'zmv'
+
+# Set the Prezto modules to load (browse modules).
+# The order matters.
+zstyle ':prezto:load' pmodule \
+ 'environment' \
+ 'terminal' \
+ 'editor' \
+ 'history' \
+ 'directory' \
+ 'spectrum' \
+ 'utility' \
+ 'completion' \
+ 'prompt' \
+ 'syntax-highlighting'
+
+#
+# Editor
+#
+
+# Set the key mapping style to 'emacs' or 'vi'.
+zstyle ':prezto:module:editor' keymap 'emacs'
+
+# Auto convert .... to ../..
+# zstyle ':prezto:module:editor' dot-expansion 'yes'
+
+#
+# Git
+#
+
+# Ignore submodules when they are 'dirty', 'untracked', 'all', or 'none'.
+# zstyle ':prezto:module:git:ignore' submodule 'all'
+
+#
+# GNU Utility
+#
+
+# Set the command prefix on non-GNU systems.
+# zstyle ':prezto:module:gnu-utility' prefix 'g'
+
+#
+# Pacman
+#
+
+# Set the Pacman frontend.
+# zstyle ':prezto:module:pacman' frontend 'yaourt'
+
+#
+# Prompt
+#
+
+# Set the prompt theme to load.
+# Setting it to 'random' loads a random theme.
+# Auto set to 'off' on dumb terminals.
+zstyle ':prezto:module:prompt' theme 'walters'
+
+#
+# Screen
+#
+
+# Auto start a session when Zsh is launched.
+# zstyle ':prezto:module:screen' auto-start 'yes'
+
+#
+# GPG-Agent
+#
+
+# Enable SSH-Agent protocol emulation.
+# zstyle ':prezto:module:gpg-agent' ssh-support 'yes'
+
+#
+# SSH-Agent
+#
+
+# Enable ssh-agent forwarding.
+# zstyle ':prezto:module:ssh-agent' forwarding 'yes'
+
+# Set ssh-agent identities to load.
+# zstyle ':prezto:module:ssh-agent' identities 'id_rsa' 'id_rsa2' 'id_github'
+
+#
+# Syntax Highlighting
+#
+
+# Set syntax highlighters.
+# By default main, brackets, and cursor are enabled.
+# zstyle ':prezto:module:syntax-highlighting' highlighters \
+# 'main' \
+# 'brackets' \
+# 'pattern' \
+# 'cursor' \
+# 'root'
+
+#
+# Terminal
+#
+
+# Auto set the tab and window titles.
+zstyle ':prezto:module:terminal' auto-title 'yes'
+
+#
+# Tmux
+#
+
+# Auto start a session when Zsh is launched.
+# zstyle ':prezto:module:tmux' auto-start 'yes'
View
@@ -0,0 +1,42 @@
+alias [ {+|-}gmrsL ] [ name[=value] ... ]
+ For each name with a corresponding value, define an alias with
+ that value. A trailing space in value causes the next word to
+ be checked for alias expansion. If the -g flag is present,
+ define a global alias; global aliases are expanded even if they
+ do not occur in command position.
+
+ If the -s flags is present, define a suffix alias: if the com-
+ mand word on a command line is in the form `text.name', where
+ text is any non-empty string, it is replaced by the text `value
+ text.name'. Note that name is treated as a literal string, not
+ a pattern. A trailing space in value is not special in this
+ case. For example,
+
+ alias -s ps=gv
+
+ will cause the command `*.ps' to be expanded to `gv *.ps'. As
+ alias expansion is carried out earlier than globbing, the `*.ps'
+ will then be expanded. Suffix aliases constitute a different
+ name space from other aliases (so in the above example it is
+ still possible to create an alias for the command ps) and the
+ two sets are never listed together.
+
+ For each name with no value, print the value of name, if any.
+ With no arguments, print all currently defined aliases other
+ than suffix aliases. If the -m flag is given the arguments are
+ taken as patterns (they should be quoted to preserve them from
+ being interpreted as glob patterns), and the aliases matching
+ these patterns are printed. When printing aliases and one of
+ the -g, -r or -s flags is present, restrict the printing to
+ global, regular or suffix aliases, respectively; a regular alias
+ is one which is neither a global nor a suffix alias. Using `+'
+ instead of `-', or ending the option list with a single `+',
+ prevents the values of the aliases from being printed.
+
+ If the -L flag is present, then print each alias in a manner
+ suitable for putting in a startup script. The exit status is
+ nonzero if a name (with no value) is given for which no alias
+ has been defined.
+
+ For more on aliases, include common problems, see the section
+ ALIASING in zshmisc(1).
View
@@ -0,0 +1,76 @@
+functions [ {+|-}UXkmtuz ] [ name ... ]
+functions -M mathfn [ min [ max [ shellfn ] ] ]
+functions -M [ -m pattern ... ]
+functions +M [ -m ] mathfn
+ Equivalent to typeset -f, with the exception of the -M option.
+ Use of the -M option may not be combined with any of the options
+ handled by typeset -f.
+
+ functions -M mathfn defines mathfn as the name of a mathematical
+ function recognised in all forms of arithmetical expressions;
+ see the section `Arithmetic Evaluation' in zshmisc(1). By
+ default mathfn may take any number of comma-separated arguments.
+ If min is given, it must have exactly min args; if min and max
+ are both given, it must have at least min and and at most max
+ args. max may be -1 to indicate that there is no upper limit.
+
+ By default the function is implemented by a shell function of
+ the same name; if shellfn is specified it gives the name of the
+ corresponding shell function while mathfn remains the name used
+ in arithmetical expressions. The name of the function in $0 is
+ mathfn (not shellfn as would usually be the case), provided the
+ option FUNCTION ARGZERO is in effect. The positional parameters
+ in the shell function correspond to the arguments of the mathe-
+ matical function call. The result of the last arithmetical
+ expression evaluated inside the shell function (even if it is a
+ form that normally only returns a status) gives the result of
+ the mathematical function.
+
+ functions -M with no arguments lists all such user-defined func-
+ tions in the same form as a definition. With the additional
+ option -m and a list of arguments, all functions whose mathfn
+ matches one of the pattern arguments are listed.
+
+ function +M removes the list of mathematical functions; with the
+ additional option -m the arguments are treated as patterns and
+ all functions whose mathfn matches the pattern are removed.
+ Note that the shell function implementing the behaviour is not
+ removed (regardless of whether its name coincides with mathfn).
+
+ For example, the following prints the cube of 3:
+
+ zmath cube() { (( $1 * $1 * $1 )) }
+ functions -M cube 1 1 zmath cube
+ print $(( cube(3) ))
+
+autoload [ {+|-}UXktz ] [ -w ] [ name ... ]
+ Equivalent to functions -u, with the exception of -X/+X and -w.
+
+ The flag -X may be used only inside a shell function, and may
+ not be followed by a name. It causes the calling function to be
+ marked for autoloading and then immediately loaded and executed,
+ with the current array of positional parameters as arguments.
+ This replaces the previous definition of the function. If no
+ function definition is found, an error is printed and the func-
+ tion remains undefined and marked for autoloading.
+
+ The flag +X attempts to load each name as an autoloaded func-
+ tion, but does not execute it. The exit status is zero (suc-
+ cess) if the function was not previously defined and a defini-
+ tion for it was found. This does not replace any existing defi-
+ nition of the function. The exit status is nonzero (failure) if
+ the function was already defined or when no definition was
+ found. In the latter case the function remains undefined and
+ marked for autoloading. If ksh-style autoloading is enabled,
+ the function created will contain the contents of the file plus
+ a call to the function itself appended to it, thus giving normal
+ ksh autoloading behaviour on the first call to the function.
+
+ With the -w flag, the names are taken as names of files compiled
+ with the zcompile builtin, and all functions defined in them are
+ marked for autoloading.
+
+ The flags -z and -k mark the function to be autoloaded in native
+ or ksh emulation, as if the option KSH AUTOLOAD were unset or
+ were set, respectively. The flags override the setting of the
+ option at the time the function is loaded.
View
@@ -0,0 +1,4 @@
+bg [ job ... ]
+job ... &
+ Put each specified job in the background, or the current job if
+ none is specified.
View
@@ -0,0 +1,2 @@
+bindkey
+ See the section `Zle Builtins' in zshzle(1).
View
@@ -0,0 +1,3 @@
+break [ n ]
+ Exit from an enclosing for, while, until, select or repeat loop.
+ If n is specified, then break n levels instead of just one.
View
@@ -0,0 +1,2 @@
+builtin name [ args ... ]
+ Executes the builtin name, with the given args.
View
@@ -0,0 +1,10 @@
+exit [ n ]
+ Exit the shell with the exit status specified by n; if none is
+ specified, use the exit status from the last command executed.
+ An EOF condition will also cause the shell to exit, unless the
+ IGNORE EOF option is set.
+
+bye Same as exit.
+
+logout [ n ]
+ Same as exit, except that it only works in a login shell.
View
@@ -0,0 +1 @@
+cap See the section `The zsh/cap Module' in zshmodules(1).
View
@@ -0,0 +1,52 @@
+cd [ -qsLP ] [ arg ]
+cd [ -qsLP ] old new
+cd [ -qsLP ] {+|-}n
+ Change the current directory. In the first form, change the
+ current directory to arg, or to the value of $HOME if arg is not
+ specified. If arg is `-', change to the previous directory.
+
+ Otherwise, if arg begins with a slash, attempt to change to the
+ directory given by arg.
+
+ If arg does not begin with a slash, the behaviour depends on
+ whether the current directory `.' occurs in the list of directo-
+ ries contained in the shell parameter cdpath. If it does not,
+ first attempt to change to the directory arg under the current
+ directory, and if that fails but cdpath is set and contains at
+ least one element attempt to change to the directory arg under
+ each component of cdpath in turn until successful. If `.'
+ occurs in cdpath, then cdpath is searched strictly in order so
+ that `.' is only tried at the appropriate point.
+
+ The order of testing cdpath is modified if the option POSIX CD
+ is set, as described in the documentation for the option.
+
+ If no directory is found, the option CDABLE VARS is set, and a
+ parameter named arg exists whose value begins with a slash,
+ treat its value as the directory. In that case, the parameter
+ is added to the named directory hash table.
+
+ The second form of cd substitutes the string new for the string
+ old in the name of the current directory, and tries to change to
+ this new directory.
+
+ The third form of cd extracts an entry from the directory stack,
+ and changes to that directory. An argument of the form `+n'
+ identifies a stack entry by counting from the left of the list
+ shown by the dirs command, starting with zero. An argument of
+ the form `-n' counts from the right. If the PUSHD MINUS option
+ is set, the meanings of `+' and `-' in this context are swapped.
+
+ If the -q (quiet) option is specified, the hook function chpwd
+ and the functions in the array chpwd functions are not called.
+ This is useful for calls to cd that do not change the environ-
+ ment seen by an interactive user.
+
+ If the -s option is specified, cd refuses to change the current
+ directory if the given pathname contains symlinks. If the -P
+ option is given or the CHASE LINKS option is set, symbolic links
+ are resolved to their true values. If the -L option is given
+ symbolic links are retained in the directory (and not resolved)
+ regardless of the state of the CHASE LINKS option.
+
+chdir Same as cd.
Oops, something went wrong.

0 comments on commit 6132049

Please sign in to comment.