From ab2e99e5e0b3b05457b5e7efb6fb22b8db78749b Mon Sep 17 00:00:00 2001 From: dakkar Date: Sun, 20 Sep 2015 19:47:00 +0100 Subject: smaller bash setup --- .bash_profile | 16 ---------------- .bashrc | 49 +++++++++---------------------------------------- 2 files changed, 9 insertions(+), 56 deletions(-) diff --git a/.bash_profile b/.bash_profile index 8cad899..f7c29eb 100644 --- a/.bash_profile +++ b/.bash_profile @@ -1,5 +1,3 @@ -# /etc/skel/.bash_profile - # This file is sourced by bash for login shells. The following line # runs your .bashrc and is recommended by the bash info pages. [[ -f ~/.bashrc ]] && . ~/.bashrc @@ -9,17 +7,6 @@ export EDITOR source ~/perl5/perlbrew/etc/bashrc export PATH="${HOME}/bin:${PATH}" -export GPG_TTY="$(tty)" - -eval "$(keychain --eval --noask --inherit any-once --agents gpg,ssh id_rsa id_ed25519 75193F88 D7A5DBBE)" - -function e() { - emacsclient "$@" -} - -function se() { - emacsclient "${@/#//sudo::}" -} function pm() { local fn @@ -31,6 +18,3 @@ function pm() { fi emacsclient -c -n "$fn" } - -fortune - diff --git a/.bashrc b/.bashrc index 3318cd5..621567d 100644 --- a/.bashrc +++ b/.bashrc @@ -1,14 +1,3 @@ -# /etc/skel/.bashrc -# -# This file is sourced by all *interactive* bash shells on startup, -# including some apparently interactive shells such as scp and rcp -# that can't tolerate any output. So make sure this doesn't display -# anything or bad things will happen ! - - -# Test for an interactive shell. There is no need to set anything -# past this point for scp and rcp, and it's important to refrain from -# outputting anything in those cases. if [[ $- != *i* ]] ; then # Shell is non-interactive. Be done now! return @@ -18,7 +7,6 @@ export LC_ALL=en_US.UTF-8 alias clr="echo -ne '\033c'" alias mv="mv -i" alias cp="cp -i" -alias btd="bittorrent-curses --max_upload_rate 6 " export history_control=ignoreboth export command_oriented_history export HISTIGNORE='&:[bf]g:exit:ls' @@ -26,35 +14,16 @@ shopt -s extglob shopt -s cmdhist shopt -s histappend shopt -s no_empty_cmd_completion +shopt -s checkwinsize -[ -f /etc/profile.d/xprint.sh ] && source /etc/profile.d/xprint.sh - -function xtitle() { - case $TERM in - xterm*|rxvt|Eterm|eterm) - echo -ne "\e]0;$1\007" - ;; - screen) - echo -ne "\e_$1\e\\" - ;; - esac -} +eval "$(dircolors -b)" -function xreset() { - case $TERM in - xterm*|rxvt|Eterm|eterm) - echo -ne '\ec' - ;; - esac -} +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 . ~/src/git-prompt/git-prompt.sh - -#export PS1="\ -#\[\033[1;37m\]\u@\h\ -#\[\033[0;37m\]:\w\n\ -#\[\033[1;34m\](\$?)\ -#\[\033[0;33m\][\j]\ -#\[\033[0;34m\]\$\ -#\[\033[0m\] " - -- cgit v1.2.3