diff options
author | Karel Kočí <cynerd@email.cz> | 2017-05-07 11:43:33 +0200 |
---|---|---|
committer | Karel Kočí <cynerd@email.cz> | 2017-05-07 11:49:39 +0200 |
commit | 36e9201b0fd130f3aaf924b06bf29c0e46c88743 (patch) | |
tree | 20e48fafa829da0a2aeac92e54a0e355b21d4f84 /shellrc | |
parent | a793b23435567f2d4f49846196ceebcc47cd764c (diff) | |
parent | 9fbf8d27ddbfb136351780615d42af82ddb42337 (diff) | |
download | myconfigs-36e9201b0fd130f3aaf924b06bf29c0e46c88743.tar.gz myconfigs-36e9201b0fd130f3aaf924b06bf29c0e46c88743.tar.bz2 myconfigs-36e9201b0fd130f3aaf924b06bf29c0e46c88743.zip |
Merge branch 'master' into server
Diffstat (limited to 'shellrc')
-rw-r--r-- | shellrc | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -1,9 +1,6 @@ # vim: ft=sh: # This is file with aliases and variables shared between bash and zsh -export PATH=~/.local/bin:$PATH:$(ruby -e "print Gem.user_dir")/bin -export EDITOR=vim - # Continue only if this is interactive shell [[ $- != *i* ]] && return @@ -17,7 +14,7 @@ alias cgdb='cgdb -q' alias octave='octave-cli -q' alias ssh='TERM="xterm-256color" ssh' alias feh='feh --magick-timeout 1 -.' -alias make='make -j 8' +alias make="make -j$(nproc)" export LESS=-R export LESS_TERMCAP_mb=$'\E[1;31m' |