diff options
| author |  Tom van der Lee <t0m.vd.l33@gmail.com> | 2015-02-23 21:46:54 +0100 |
|---|---|---|
| committer | Tom van der Lee <t0m.vd.l33@gmail.com> | 2015-02-23 21:46:54 +0100 |
| commit | fcb61b4acd186503f1aed031e75e4046c65df26f (patch) | |
| tree | b24033ac995c5b634d8ee6d3160434aac3826864 | |
| parent | cda4ba94e49b7545f3bc23f387d986c87bc7a835 (diff) | |
| parent | fcd8159ba89171ce1d45544d24bfed2146ed221f (diff) | |
| download | dotfiles-fcb61b4acd186503f1aed031e75e4046c65df26f.tar.gz dotfiles-fcb61b4acd186503f1aed031e75e4046c65df26f.tar.bz2 dotfiles-fcb61b4acd186503f1aed031e75e4046c65df26f.zip | |
Merging from remote
| -rw-r--r-- | bashrc | 4 |
1 files changed, 4 insertions, 0 deletions
| @@ -24,6 +24,10 @@ man() { | |||
| 24 | man "$@" | 24 | man "$@" |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | vim() { | ||
| 28 | (cd $@ && /usr/bin/vim) || /usr/bin/vim $@ | ||
| 29 | } | ||
| 30 | |||
| 27 | alias ls='ls --color=auto' | 31 | alias ls='ls --color=auto' |
| 28 | alias jblive='mpv rtmp://videocdn-us.geocdn.scaleengine.net/jblive/live/jblive.stream 2> /dev/null &' | 32 | alias jblive='mpv rtmp://videocdn-us.geocdn.scaleengine.net/jblive/live/jblive.stream 2> /dev/null &' |
| 29 | 33 | ||