Commit graph

147 commits

Author SHA1 Message Date
Gaetan Semet
02e2063325 Merge remote-tracking branch 'cadusk/master'
# Conflicts:
#	templates/zshrc-linux.zsh
#	templates/zshrc-mac.zsh
2016-02-04 14:50:03 +01:00
Carlos Cardoso
43be8baf77 template updates 2016-02-01 17:17:09 -02:00
Carlos Cardoso
c6eb1cd8fa changed zsh theme 2015-10-24 00:55:43 -04:00
Gaetan Semet
9a63084e20 Merge remote-tracking branch 'upstream/master'
Conflicts:
	plugins/git/git.plugin.zsh
	plugins/jump/jump.plugin.zsh
2015-08-10 16:15:53 +02:00
Gaetan Semet
3df85d8148 rm temp envvar
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2015-08-10 16:13:04 +02:00
Carlos Cardoso
152083a471 integrated upstream changes 2015-07-19 09:41:16 -04:00
Carlos Cardoso
638819a22b simplified initialization scripts 2015-07-19 09:40:07 -04:00
Jordan Klassen
45121611fe Update template zshrc with HYPHEN_INSENSITIVE 2015-05-01 15:10:45 -07:00
Gaetan Semet
ec0da7e7c4 add docker completion 2015-04-22 18:18:27 +02:00
Carlos Cardoso
57e1376297 zshrc templates customization 2014-12-30 12:18:33 -02:00
Carlos Cardoso
2a58921469 Merge remote-tracking branch 'blessed/master'
* blessed/master: (75 commits)
  added exec command to docker plugin
  Quote path in case $HOME has a space in it.
  Update the list of Heroku Postgres commands
  fix(tools/check_for_upgrade): Don't source profile
  Fix aws.plugins.zsh check rule
  Revert PR #3359 as this is breaking stuff for many folks. Need to rethink how we handle system defaults differently on this
  Updated Yii2 command completion
  added node- before node version for consistency
  mira theme shows active node, ruby and java versions
  Add yii2 readme
  Added Yii2 command completion
  Change to alias and remove deprecated GREP_COLOR
  Tidy up the grep.zsh library
  Use unaliased grep in flag check
  Ignore .bzr folders in grep too
  Extract VCS folders definition to avoid repetition
  Add itunes shuffle command to OSX plugin.
  Fixed output issues webith websearch plugin.
  Fix dircycle plugin
  add current bookmark to rkj-repos theme
  ...
2014-12-29 12:06:52 -02:00
Carlos Cardoso
aff15e81e2 disabled python default plugin 2014-12-05 17:55:53 -02:00
Gaetan Semet
a96971e7a8 Merge remote-tracking branch 'upstream/master'
Conflicts:
	templates/zshrc.zsh-template
2014-12-01 11:30:35 +01:00
Gaetan Semet
5a87d7eaa9 sync plugins with mac
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-11-24 13:44:58 +01:00
Gaetan Semet
f6cd211a6d stibb: enable colored-man
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-11-24 13:44:17 +01:00
Doan Truong Thi
b6b1dd3cd7 Fix Yosemite broken zsh where $PATH var does not get appended correctly.
Sourcing oh-my-zsh immediately after export PATH.
2014-11-21 10:07:23 +09:00
Carlos Cardoso
29565c5ac4 added heroku integration 2014-11-18 13:39:20 -02:00
Gaetan Semet
cf1c065d71 Merge remote-tracking branch 'cadusk/master'
Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
2014-10-07 11:53:12 +02:00
Carlos Cardoso
c95561b79f merged upstream in 2014-09-03 01:15:27 -03:00
Gaetan Semet
4c312936fd add pip in my plugin list
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-07-22 17:08:04 +02:00
Gaetan Semet
6646fb0073 intel-repo plugin
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-07-15 17:46:42 +02:00
Gaetan Semet
ec49ae1a98 Merge remote-tracking branch 'upstream/master'
Conflicts:
	lib/git.zsh
	plugins/common-aliases/common-aliases.plugin.zsh
	plugins/repo/repo.plugin.zsh
	templates/zshrc.zsh-template
2014-07-03 16:18:02 +02:00
Dražen Lučanin
7297b446b8 too many plugins = slow init warning 2014-06-04 10:53:19 +02:00
Sean McCann
1ad1c52797 Move aliases to 'custom' section of .zshrc template
By convention, user-specific aliases are kept in each user's .zshrc
file. The .zshrc template provided by oh-my-zsh has an area for example
aliases, though these were being loaded before other aliases in libs, plugins,
and themes. As a result, personal aliases could be overwritten by these
other aliases as they are loaded. To make personal customization easier, the
sample aliases section of the .zshrc template has been moved to the area
dedicated for personal customization. This section of the configuration
is processed after all other items are loaded, preventing personal aliases
and exports from being inadvertently clobbered by oh-my-zsh.
2014-05-25 22:55:56 +02:00
Simon Courtois
4c64cf4a25 Replacing DISABLE_CORRECTION with ENABLE_CORRECTION in zshrc template
Since commands auto-correction must be explicitly enable with
the ENABLE_CORRECTION envvar, this commit replaces the unaccurate
example in the zshrc template.
2014-05-24 20:07:05 +02:00
Gaetan Semet
d5062e640e disable auto update
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-05-22 11:11:22 +02:00
Carlos Cardoso
62e09457f0 disabled terminal cleanup on pager (less) exit 2014-05-03 01:30:27 -03:00
Carlos Cardoso
53838bb9d1 theme customization based on avit and sporty_256 2014-04-26 23:29:34 -03:00
Carlos Cardoso
d4db25b634 adding /usr/local/bin removed by mistake 2014-04-19 11:38:07 -03:00
Carlos Cardoso
4b8a93d68a merged in blessed/master 2014-04-19 11:18:40 -03:00
Carlos Cardoso
e2bede24ca updated python initialization for macosx 2014-04-19 11:12:30 -03:00
Gaetan Semet
b1307d9e19 Merge remote-tracking branch 'upstream/master'
Conflicts:
	plugins/jsontools/jsontools.plugin.zsh
	templates/zshrc.zsh-template
2014-04-17 16:06:34 +02:00
ncanceill
2dfcc5af42 mention $ZSH_CUSTOM as suggested in #2295 2014-04-17 16:05:23 +02:00
ncanceill
f8e9e82a63 suggest setting $LANG to fix #1286 and fix #1823 2014-04-17 16:05:23 +02:00
Luke Horvat
b369baf1c9 Fixed typos + made wording more consistent in zshrc.zsh-template 2014-04-17 16:02:38 +02:00
Carlos Cardoso
4e9a61dcdd added custom python support from brew 2014-04-12 18:00:12 -03:00
Luke Horvat
5f09d0f6dd Fixed typos + made wording more consistent in zshrc.zsh-template 2014-03-25 22:12:30 +11:00
Gaetan Semet
92ed38cb85 Merge remote-tracking branch 'cadusk/master'
Conflicts:
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	tools/install.sh
2014-03-24 11:56:16 +01:00
Gaetan Semet
5afa441d66 Merge remote-tracking branch 'upstream/master'
Conflicts:
	templates/zshrc.zsh-template
2014-03-24 11:54:41 +01:00
Carlos Cardoso
cde788ed19 added git-fast to oh-my-zsh startup config 2014-03-23 23:39:43 -03:00
Carlos Cardoso
ad4e88bc23 Merged blessed. 2014-03-23 19:58:16 -03:00
Carlos Cardoso
eff8820e29 Unified aliases in oh-my-zsh aliases file. 2014-03-23 19:28:27 -03:00
ncanceill
6889dfaa46 $ZSH is the OMZ installation folder, not configuration 2014-03-23 15:03:36 +01:00
ncanceill
04c2d29398 mention $ZSH_CUSTOM as suggested in #2295 2014-03-23 15:03:16 +01:00
ncanceill
f9ad3686bb suggest setting $LANG to fix #1286 and fix #1823 2014-03-23 15:02:58 +01:00
Carlos Cardoso
80782afeca New git aliases. 2014-03-22 22:53:30 -03:00
Robby Russell
95302af79b Merge pull request #646 from whittle/master
Change default zshrc to export $ZSH (as required by check_for_upgrade.sh).
2014-03-22 13:51:47 -07:00
Gaetan Semet
4888217c85 Merge remote-tracking branch 'upstream/master'
Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc.zsh-template
	tools/install.sh
2014-03-14 16:50:51 +01:00
Gaetan Semet
644aac2bf5 moved my git plugin to git2
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-02-03 14:18:06 +01:00
Gaetan Semet
ad426a6579 Merge remote-tracking branch 'cadusk/master'
Conflicts:
	templates/zshrc-mac.zsh
2014-01-02 10:46:36 +01:00