diff --git a/debian-config.sh b/debian-config.sh index 8eed0d6..e08f806 100755 --- a/debian-config.sh +++ b/debian-config.sh @@ -56,7 +56,7 @@ echo if [ -e /etc/ssh/sshd_config ] then echo "=== Disallow root login: #PermitRootLogin yes" - sed -i "s|^PermitRootLogin yes|#PermitRootLogin yes|g" /etc/ssh/sshd_config + sed -i "s|^PermitRootLogin |#PermitRootLogin |g" /etc/ssh/sshd_config service sshd restart echo fi diff --git a/nixhome/.bashrc b/nixhome/.bashrc index dc5377e..bb56a0a 100644 --- a/nixhome/.bashrc +++ b/nixhome/.bashrc @@ -58,6 +58,9 @@ then alias ll='ls -lGA' # show .xxx alias dir='ls -lGA' alias lll='ls -lGa' # show .xxx and . and .. + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' alias sedi='sed -i ""' export HOMEBREW_NO_AUTO_UPDATE=true export BASH_SILENCE_DEPRECATION_WARNING=1 @@ -66,6 +69,9 @@ else alias ll='ls -lA --color=auto' alias dir='ls -lA --color=auto' alias lll='ls -la --color=auto' + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' alias sedi='sed -i' export TIME_STYLE='+%Y-%m-%d--%H:%M:%S' fi @@ -89,6 +95,50 @@ case "$TERM" in ;; esac +############## following settings copied from amazon's debian #################### +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi + +# set a fancy prompt (non-color, unless we know we "want" color) +case "$TERM" in + xterm-color|*-256color) color_prompt=yes;; +esac + +# uncomment for a colored prompt, if the terminal has the capability; turned +# off by default to not distract the user: the focus in a terminal window +# should be on the output of commands, not on the prompt +#force_color_prompt=yes + +if [ -n "$force_color_prompt" ]; then + if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + color_prompt=yes + else + color_prompt= + fi +fi + +if [ "$color_prompt" = yes ]; then + PS1='[${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]] ' +else + PS1='[${debian_chroot:+($debian_chroot)}\u@\h:\w] ' +fi +unset color_prompt force_color_prompt + +# If this is an xterm set the title to user@host:dir +case "$TERM" in +xterm*|rxvt*) + PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" + ;; +*) + ;; +esac +############## above settings copied from amazon's debian #################### + # nvm settings if [ -d $HOME/.nvm ] then