From 9a03d6de56ce3c0d09ce087e3daa554fde5afd32 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Wed, 23 Aug 2017 19:49:41 +0200 Subject: [PATCH] Add .bashrc --- .bashrc | 119 ++++++++++++++++++++++++++++++++++++++++++++ initialize_script | 7 +-- scripts/connect-nfs | 19 ++++--- 3 files changed, 132 insertions(+), 13 deletions(-) create mode 100644 .bashrc diff --git a/.bashrc b/.bashrc new file mode 100644 index 0000000..ea90a55 --- /dev/null +++ b/.bashrc @@ -0,0 +1,119 @@ +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples + +# Color mapping +grey='\[\033[1;30m\]' +red='\[\033[0;31m\]' +RED='\[\033[1;31m\]' +green='\[\033[0;32m\]' +GREEN='\[\033[1;32m\]' +yellow='\[\033[0;33m\]' +YELLOW='\[\033[1;33m\]' +orange='\[\033[0;214m\]' +ORANGE="\033[38;5;214m" +purple='\[\033[0;35m\]' +PURPLE='\[\033[1;35m\]' +white='\[\033[0;37m\]' +WHITE='\[\033[1;37m\]' +blue='\[\033[0;34m\]' +BLUE='\[\033[1;34m\]' +cyan='\[\033[0;36m\]' +CYAN='\[\033[1;36m\]' +NC='\[\033[0m\]' + +# If not running interactively, don't do anything +case $- in + *i*) ;; + *) return;; +esac + +# don't put duplicate lines or lines starting with space in the history. +# See bash(1) for more options +HISTCONTROL=ignoreboth + +# append to the history file, don't overwrite it +shopt -s histappend + +# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) +HISTSIZE=1000 +HISTFILESIZE=2000 + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# make less more friendly for non-text input files, see lesspipe(1) +[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +# 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 + # Purple hostname indicates SSH connection + if [ -n "$SSH_CONNECTION" ];then + PS1="\e[1m$ORANGE\e2\u$BLUE@$GREEN\h$white:$BLUE\w$white\$ $RED[SSH]$white " + else + PS1="\e[1m$ORANGE\e2\u$BLUE@$GREEN\h$white:$BLUE\w$white\$ " + fi +else + PS1='\u@\h:\w\$ ' +fi + +# Show different prompt when root +if [ $(id -u) -eq 0 ]; +then + PS1="[$RED\u@\h$white]----[$RED\$(pwd)$white]\n# " +fi + +unset color_prompt force_color_prompt + +# enable color support of ls and also add handy aliases +if [ -x /usr/bin/dircolors ]; then + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + #alias dir='dir --color=auto' + #alias vdir='vdir --color=auto' + + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' +fi + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +fi + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +if ! shopt -oq posix; then + if [ -f /usr/share/bash-completion/bash_completion ]; then + . /usr/share/bash-completion/bash_completion + elif [ -f /etc/bash_completion ]; then + . /etc/bash_completion + fi +fi diff --git a/initialize_script b/initialize_script index db4f4e4..40da93a 100755 --- a/initialize_script +++ b/initialize_script @@ -14,12 +14,13 @@ function user_config { if [[ "$USER" == "user" ]]; then get_path - ln -s $SCRIPTPATH/{vim/.vimrc,tmux/.tmux.conf} /home/$SUDO_USER/; - ln -s $SCRIPTPATH/vim/colors /home/$SUDO_USER/.vim/ - chown -R $SUDO_USER:$SUDO_USER /home/$SUDO_USER/.vim + mkdir $HOME/.vim + ln -s $SCRIPTPATH/{vim/.vimrc,tmux/.tmux.conf} $HOME/; + ln -s $SCRIPTPATH/vim/colors $HOME/.vim/ echo 'Linking configuration files done' elif [[ "$USER" == "root" ]]; then get_path + mkdir /root/.vim ln -s $SCRIPTPATH/{vim/.vimrc,tmux/.tmux.conf} /root/ ln -s $SCRIPTPATH/vim/colors /root/.vim/ echo 'Linking configuration files done' diff --git a/scripts/connect-nfs b/scripts/connect-nfs index bf9518a..4e8bb25 100755 --- a/scripts/connect-nfs +++ b/scripts/connect-nfs @@ -2,26 +2,25 @@ # Connects remote nfs filesystems if [ $# -eq 2 ]; then echo "Mounting $1" - sudo mount -t nfs -o vers=4 10.8.0.1:/mnt/$1 /mnt/nfs/$1 + sudo mount -t nfs -o soft,intr 10.8.0.1:/mnt/$1 /mnt/nfs/$1 echo "Mounting $2" - sudo mount -t nfs -o vers=4 10.8.0.1:/mnt/$2 /mnt/nfs/$2 + sudo mount -t nfs -o soft,intr 10.8.0.1:/mnt/$2 /mnt/nfs/$2 elif [ $# -gt 2 ]; then echo "Mounting $1" - sudo mount -t nfs -o vers=4 10.8.0.1:/mnt/$1 /mnt/nfs/$1 + sudo mount -t nfs -o soft,intr 10.8.0.1:/mnt/$1 /mnt/nfs/$1 echo "Mounting $2" - sudo mount -t nfs -o vers=4 10.8.0.1:/mnt/$2 /mnt/nfs/$2 + sudo mount -t nfs -o soft,intr 10.8.0.1:/mnt/$2 /mnt/nfs/$2 echo "Mounting $3" - sudo mount -t nfs -o vers=4 10.8.0.1:/mnt/$3 /mnt/nfs/$3 + sudo mount -t nfs -o soft,intr 10.8.0.1:/mnt/$3 /mnt/nfs/$3 elif [ $# -eq 1 ]; then echo "Mounting $1" - sudo mount -t nfs -o vers=4 10.8.0.1:/mnt/$1 /mnt/nfs/$1 + sudo mount -t nfs -o soft,intr 10.8.0.1:/mnt/$1 /mnt/nfs/$1 fi if [ $# -eq 0 ]; then - sudo mount -t nfs -o vers=4 10.8.0.1:/mnt/Music /mnt/nfs/Music - sudo mount -t nfs -o vers=4 10.8.0.1:/mnt/Downloads /mnt/nfs/Downloads - sudo mount -t nfs -o vers=4 10.8.0.1:/mnt/Video /mnt/nfs/Video + sudo mount -t nfs -o soft,intr 10.8.0.1:/mnt/Music /mnt/nfs/Music + sudo mount -t nfs -o soft,intr 10.8.0.1:/mnt/Downloads /mnt/nfs/Downloads + sudo mount -t nfs -o soft,intr 10.8.0.1:/mnt/Video /mnt/nfs/Video echo "Mounted Music, Downloads and Video" fi - exit 0