Permalink
Browse files

Update configuration

  • Loading branch information...
abtris committed Dec 27, 2012
1 parent 245e901 commit 7342d0a93f7510a2686b0e39833b5430b3b7e32d
Showing with 32 additions and 15 deletions.
  1. +1 −0 bash/aliases
  2. +1 −1 bash/env
  3. +4 −4 bin/lmcswitch
  4. +21 −8 ssh/config
  5. +5 −2 zshrc-ohmyzsh
View
@@ -157,6 +157,7 @@ alias ga='git add'
alias gca="git commit -a -m"
alias gdm='git diff master'
alias gl='git pull --ff'
+alias glup='git pull upstream master'
alias glr='git pull --rebase'
alias gcd='cd "`git rev-parse --show-toplevel`"'
alias gnp="git-notpushed"
View
@@ -16,7 +16,7 @@ fi
# CTRL+D
export STTY="eof '^D'"
# PATH
-export PATH=~/bin:$PATH:/usr/local/php5/bin:~/bin/dotfiles/bin:~/bin/android-sdk-linux_x86-1.5_r3/tools:/opt/local/bin:/sw/bin:/usr/local/mysql/bin
+export PATH=~/bin:$PATH:/usr/local/php5/bin:~/bin/dotfiles/bin:~/bin/android-sdk-linux_x86-1.5_r3/tools:/opt/local/bin:/sw/bin:/usr/local/mysql/bin:/usr/local/share/npm/bin
export PYTHONPATH=/usr/local/lib/python:$PYTHONPATH
if [ -f `brew --prefix`/etc/autojump ]; then
View
@@ -16,8 +16,8 @@ if (isset($argv[1])) {
$switch = strtolower($argv[1]);
if (!in_array($switch, $environments)) {
writeln('Invalid environment "' . $switch . '"', TRUE);
- }
- file_put_contents(getenv("HOME") . "/.lmcenv", "$switch");
+ }
+ file_put_contents(getenv("HOME") . "/.lmcenv", "$switch");
} else {
writeln('Missing environment name (' . implode(', ', $environments) . ')', TRUE);
}
@@ -49,9 +49,9 @@ foreach($content as &$line) {
} elseif ($env) {
$line = ($env == $switch ? '' : '#') . ltrim($line, '#');
}
- if (preg_match('/(\.?jobs\.cz|\.?prace\.cz|\.?hotjobs\.cz)/i', $line, $m)) {
+ if (preg_match('/(\.?jobs\.cz|\.?prace\.cz|\.?hotjobs\.cz|.?lmc\.cz)/i', $line, $m)) {
$line = ($switch!='off' ? '' : '#') . ltrim($line, '#');
- }
+ }
}
}
View
29 ssh/config 100644 → 100755
@@ -1,3 +1,10 @@
+Host wp
+User root
+Port 2222
+Hostname 195.140.252.117
+IdentityFile id_rsa
+ForwardAgent yes
+
Host test
User root
Hostname dev.lecturer.cz
@@ -10,7 +17,7 @@ IdentityFile id_rsa
Host dzogchen
User root
-HostName dzogchen.cz
+HostName 212.24.146.193
IdentityFile id_dsa
Host nabu
@@ -19,10 +26,16 @@ Port 2222
HostName adato.cz
IdentityFile id_rsa
+Host babu
+Port 2222
+User root
+Hostname 195.140.253.89
+IdentityFile id_rsa
+
Host kabu
User root
Port 2222
-Hostname 80.79.23.87
+Hostname kabu.adato.cz
IdentityFile id_rsa
Host andrea
@@ -61,7 +74,7 @@ ForwardAgent yes
Host deploy
User prskavecl
-Hostname vap12.deploy.lmc.cz
+Hostname ap01.deploy.lmc.cz
IdentityFile id_dsa
ForwardAgent yes
@@ -73,7 +86,7 @@ ForwardAgent yes
Host preprod
User prskavecl
-Hostname vap13.preprod.lmc.cz
+Hostname ap01.preprod.lmc.cz
IdentityFile id_dsa
ForwardAgent yes
@@ -91,25 +104,25 @@ ForwardAgent yes
Host prod1
User prskavecl
-Hostname ap0903.prod.lmc.cz
+Hostname ap01.prod.lmc.cz
IdentityFile id_dsa
ForwardAgent yes
Host prod2
User prskavecl
-Hostname vap14.prod.lmc.cz
+Hostname ap02.prod.lmc.cz
IdentityFile id_dsa
ForwardAgent yes
Host prod3
User prskavecl
-Hostname vap15.prod.lmc.cz
+Hostname ap03.prod.lmc.cz
IdentityFile id_dsa
ForwardAgent yes
Host prod4
User prskavecl
-Hostname ap01.prod.lmc.cz
+Hostname ap04.prod.lmc.cz
IdentityFile id_dsa
ForwardAgent yes
View
@@ -24,7 +24,7 @@ DISABLE_AUTO_UPDATE="true"
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
# Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git textmate ruby brew osx svn cap gem heroku vagrant abtris knife bundler mercurial redis-cli sublime rails)
+plugins=(autojump git textmate ruby brew osx svn cap gem heroku vagrant abtris knife bundler mercurial redis-cli sublime rails)
# Rbenv https://github.com/sstephenson/rbenv/#section_2.2
export PATH="$HOME/.rbenv/bin:$PATH"
@@ -45,5 +45,8 @@ __git_files () {
# Customize to your needs...
[[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
[[ -s $HOME/nvm/nvm.sh ]] && source $HOME/nvm/nvm.sh
-
+[[ -s `brew --prefix`/etc/autojump.sh ]] && . `brew --prefix`/etc/autojump.sh
PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
+
+### Added by the Heroku Toolbelt
+export PATH="/usr/local/heroku/bin:$PATH"

0 comments on commit 7342d0a

Please sign in to comment.