Commit graph

83 commits

Author SHA1 Message Date
Gaetan Semet
a587b6f98a upgrade my zshrc 2013-11-25 11:34:54 +01:00
Gaetan Semet
6d372d6b25 imported my local zshrc changes (linux) + sync up mac template 2013-11-18 15:02:43 +01:00
Gaetan Semet
412a38a989 Merge remote-tracking branch 'cadusk/master'
Conflicts:
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
2013-11-18 14:57:43 +01:00
Gaetan Semet
778b60cf38 updated zshrc mac template
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-11-16 23:57:46 +01:00
Carlos Cardoso
8727fc77a6 Fixing templates. 2013-11-15 13:20:44 -02:00
Carlos Cardoso
fe2304ca54 Merge branch 'linux'
* linux:
  custom linux changes.
2013-11-15 13:10:41 -02:00
Carlos Cardoso
bb9cc48de7 custom linux changes. 2013-11-15 13:02:46 -02:00
Carlos Cardoso
eb6f4b8244 fixing postgres plugin reference. 2013-11-13 01:41:23 -02:00
Carlos Cardoso
422a4224fb customzing defaults. 2013-11-13 00:31:10 -02:00
Gaetan Semet
bd32698531 Merge remote-tracking branch 'upstream/master'
Conflicts:
	.gitignore
	plugins/git/git.plugin.zsh
	plugins/jump/jump.plugin.zsh
	templates/zshrc.zsh-template
2013-09-24 14:30:27 +02:00
David Strawn
9d2b5c841e Fixed comments in zshrc.zsh-template about disabling auto updates.
Previously they did not make sense nor were they accurate.
2013-09-14 12:26:33 -06:00
Gaetan Semet
fc27f4088b Merge remote-tracking branch 'dlintw/2024-list-theme-features' 2013-09-11 15:33:29 +02:00
Daniel YC Lin
8f18bd38fd show themes featues by grep 2013-08-06 17:03:21 +08:00
Gaetan Semet
60f4ae1bed Merge remote-tracking branch 'cadusk/master'
Conflicts:
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
2013-06-13 17:13:13 +02:00
Stibbons
2703f6c241 Changed default plugins for mac and linux templates 2013-06-05 23:56:06 +02:00
Gaetan Semet
781364a35a Merge remote-tracking branch 'upstream/master'
Conflicts:
	lib/theme-and-appearance.zsh
	plugins/tmux/tmux.plugin.zsh
2013-06-05 11:10:38 +02:00
Carlos Cardoso
b501522a21 Changing theme. 2013-06-03 23:09:42 -03:00
Carlos Cardoso
ee3267f30d Merged official branch changes. 2013-06-03 22:12:29 -03:00
Robby Russell
a2c8db9eb3 Resolving conflict in #1266 merge 2013-04-23 20:30:21 -07:00
Robby Russell
78bb69968d Merge pull request #1734 from cborgia/master
simple grammar change in template file
2013-04-23 19:45:15 -07:00
Jeremy Attali
e41714d72c Added option to allow untracked files as non dirty
In this commit, the option only works for git but it should not be to hard for
someone who knows svn to so the same.
This commit is largely inspired by @yoavweiss, I only added an option to use
it.
2013-04-22 10:59:08 +02:00
Chris Borgia
52dc3b99f9 Edited Grammar in template file 2013-04-18 16:43:54 -04:00
Carlos Cardoso
cd3e41ac4b Force xterm to behave like xterm-256color. 2013-03-28 17:43:05 -03:00
Gaetan Semet
b964433381 Merge branch 'master' of https://github.com/Stibbons/oh-my-zsh
Conflicts:
	README.textile
	custom/plugins/launch_trial/_launch_trial.sh
	plugins/encode64/encode64.plugin.zsh
	plugins/git/git.plugin.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
	tools/install.sh

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-03-27 16:51:05 +01:00
Gaetan Semet
1c1ab1eaec updating scripts 2013-03-27 10:15:10 +01:00
Carlos Cardoso
b90e172390 disable ssh-agent. 2013-03-27 10:10:33 +01:00
Carlos Cardoso
c5c0eadaf3 Added tmux plugin. 2013-03-27 10:10:33 +01:00
Carlos Cardoso
848f059e6a Fixed customizations for mac and linux environments. 2013-03-27 10:10:33 +01:00
Carlos Cardoso
7a34d01628 Fixed aliases and theme appearance. 2013-03-27 10:10:33 +01:00
Carlos Cardoso
fb15c83086 Updated repository references. 2013-03-27 10:10:33 +01:00
Carlos Cardoso
2a85404a82 My custom zshrc's 2013-03-27 10:10:33 +01:00
Carlos Cardoso
d17330b34d Disable correction suggestions. 2013-03-27 10:10:33 +01:00
Carlos Cardoso
f1288297c7 Updated virtualenv initialization. 2013-03-27 10:10:32 +01:00
Carlos Cardoso
73f0d5f79e New customizations. 2013-03-27 10:09:35 +01:00
Carlos Cardoso
ea57d2cb7c set pythonbrew plugin as initializable. 2013-03-27 10:08:13 +01:00
cadusk@yahoo.com.br
7be8212634 Removido plugin 'osx' da inicializacao automatica. 2013-03-27 10:08:13 +01:00
Carlos Cardoso
0d6232722a Atualizado default LC_ALL e LANG 2013-03-27 10:08:12 +01:00
Carlos Cardoso
2deeed1301 redirecionamento de vim para 7.3 2013-03-27 10:08:12 +01:00
Carlos Cardoso
5c95ca4caf Changed shell theme 2013-03-27 10:07:26 +01:00
Carlos Cardoso
c6e8fa92ea Added new virtualenvwrapper plugin 2013-03-27 10:05:54 +01:00
Carlos Cardoso
eda24dcb75 My zsh config 2013-03-27 10:04:53 +01:00
Carlos Cardoso
bd78c3b2bf Disable VENV on change directory. 2013-03-10 22:32:53 -03:00
Gaetan Semet
baa421cbae Merge branch 'master' of https://github.com/cadusk/oh-my-zsh
Conflicts:
	.gitignore
	templates/zshrc.zsh-template
	tools/install.sh
2013-03-04 16:54:51 +01:00
Gaetan SEMET
f84b2eddeb Creating new completion scheme for buildbot and repo tools 2013-02-12 14:50:46 +01:00
Robby Russell
ded745bf14 Modifying documentation in zshrc template for new config option 2012-11-30 05:58:08 -08:00
Eric Danielson
200a25818a Add UPDATE_ZSH_DAYS setting 2012-11-26 11:35:16 -08:00
Carlos Cardoso
1ce4265072 disable ssh-agent. 2012-10-27 13:27:20 -02:00
Carlos Cardoso
c071030b68 Added tmux plugin. 2012-10-25 21:22:32 -02:00
Carlos Cardoso
ba136bb773 Fixed customizations for mac and linux environments. 2012-10-25 21:10:15 -02:00
Carlos Cardoso
623c4b2ac3 Fixed aliases and theme appearance. 2012-10-25 14:16:27 -02:00