aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2016-07-14 03:12:48 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2016-07-14 03:12:48 +0300
commite54607b6060afd68930735266ccddd8671e59f49 (patch)
treed68dc7bf1840b1fc5dbfc36a2ff51c0f11507635
parentsplit .bashrc into multiple files (diff)
downloadlinux-home-e54607b6060afd68930735266ccddd8671e59f49.tar.gz
linux-home-e54607b6060afd68930735266ccddd8671e59f49.zip
merge upstream bash-related dotfiles
-rw-r--r--.bash_profile2
-rw-r--r--.bashrc17
-rw-r--r--.inputrc2
-rw-r--r--.profile2
4 files changed, 13 insertions, 10 deletions
diff --git a/.bash_profile b/.bash_profile
index f33ed86..6944194 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -5,7 +5,7 @@
# with this software.
# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# base-files version 4.2-3
+# base-files version 4.2-4
# ~/.bash_profile: executed by bash(1) for login shells.
diff --git a/.bashrc b/.bashrc
index 82f8e7d..5d3ffe4 100644
--- a/.bashrc
+++ b/.bashrc
@@ -5,7 +5,7 @@
# with this software.
# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# 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
diff --git a/.inputrc b/.inputrc
index 8d36752..7030b04 100644
--- a/.inputrc
+++ b/.inputrc
@@ -5,7 +5,7 @@
# with this software.
# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# base-files version 4.2-3
+# base-files version 4.2-4
# ~/.inputrc: readline initialization file.
diff --git a/.profile b/.profile
index 209c38d..6b44625 100644
--- a/.profile
+++ b/.profile
@@ -5,7 +5,7 @@
# with this software.
# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# base-files version 4.2-3
+# base-files version 4.2-4
# ~/.profile: executed by the command interpreter for login shells.