From e54607b6060afd68930735266ccddd8671e59f49 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Thu, 14 Jul 2016 03:12:48 +0300 Subject: merge upstream bash-related dotfiles --- .bashrc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to '.bashrc') diff --git a/.bashrc b/.bashrc index 82f8e7d..5d3ffe4 100644 --- a/.bashrc +++ b/.bashrc @@ -5,7 +5,7 @@ # with this software. # If not, see . -# base-files version 4.2-3 +# base-files version 4.2-4 # ~/.bashrc: executed by bash(1) for interactive shells. @@ -26,10 +26,6 @@ # If not running interactively, don't do anything [[ "$-" != *i* ]] && return -set -o pipefail -set -o nounset -shopt -s nullglob - # Shell Options # # See man bash for more options... @@ -104,14 +100,14 @@ alias df='df -h' alias du='du -h' # # Misc :) -alias less='less -R' # raw control characters +# alias less='less -r' # raw control characters # alias whence='type -a' # where, of a sort alias grep='grep --color' # show differences in colour alias egrep='egrep --color=auto' # show differences in colour alias fgrep='fgrep --color=auto' # show differences in colour # # Some shortcuts for different directory listings -alias ls='ls -lAh --color=tty' # classify files in colour +# alias ls='ls -hF --color=tty' # classify files in colour # alias dir='ls --color=auto --format=vertical' # alias vdir='ls --color=auto --format=long' # alias ll='ls -l' # long list @@ -201,6 +197,13 @@ alias ls='ls -lAh --color=tty' # classify files in colour # # alias cd=cd_func +set -o pipefail +set -o nounset +shopt -s nullglob + +alias less='less -R' +alias ls='ls -lAh --color=tty' + PS1='\[\e[33m\]\W\[\e[0m\]: ' # Cygwin stuff -- cgit v1.2.3