|
|
@@ -1,55 +1,23 @@
|
|
|
-# ~/.bashrc: executed by bash(1) for non-login shells.
|
|
|
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
|
|
|
-# for examples
|
|
|
-
|
|
|
-# 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 histappend
|
|
|
shopt -s checkwinsize
|
|
|
|
|
|
-# If set, the pattern "**" used in a pathname expansion context will
|
|
|
-# match all files and zero or more directories and subdirectories.
|
|
|
-#shopt -s globstar
|
|
|
-
|
|
|
-# make less more friendly for non-text input files, see lesspipe(1)
|
|
|
[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
|
|
|
|
|
|
-# 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) 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=
|
|
|
@@ -63,49 +31,23 @@ else
|
|
|
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\]$PS1"
|
|
|
- PS1='[\u@\h \W]\$ '
|
|
|
- ;;
|
|
|
- *)
|
|
|
- ;;
|
|
|
-esac
|
|
|
-
|
|
|
-# 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
|
|
|
|
|
|
-# some more ls aliases
|
|
|
alias ll='ls -alF'
|
|
|
alias la='ls -A'
|
|
|
alias l='ls -CF'
|
|
|
|
|
|
-# Add an "alert" alias for long running commands. Use like so:
|
|
|
-# sleep 10; alert
|
|
|
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
|
|
|
-
|
|
|
-# 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
|
|
|
@@ -114,8 +56,7 @@ if ! shopt -oq posix; then
|
|
|
fi
|
|
|
fi
|
|
|
|
|
|
-# allow ctrl+S in vim to save files, ie pass the command to vim when
|
|
|
-# vim is open.
|
|
|
+# allow ctrl+S in vim to save files, ie pass the command to vim when vim is open.
|
|
|
export EDITOR="vim"
|
|
|
vim() {
|
|
|
local STTYOPTS="$(stty --save)"
|
|
|
@@ -126,6 +67,8 @@ vim() {
|
|
|
|
|
|
export PATH=$PATH:$HOME/.gem/ruby/2.1.0/bin
|
|
|
export PATH=$PATH:/opt/android-sdk/tools:/opt/android-sdk/platform-tools
|
|
|
-export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
|
|
|
+export PATH="$PATH:$HOME/.rvm/bin"
|
|
|
|
|
|
-alias xbox_controller='sudo xboxdrv --config ~/Documents/xboxdrv_profiles/wiredxbox_minecraft.conf --detach-kernel-driver'
|
|
|
+if [ -x /usr/bin/ssh-agent -a -z "$SSH_AUTH_SOCK" ]; then
|
|
|
+ eval "$(keychain --eval -Q -q --agents ssh `find $HOME/.ssh/* ! -name '*.pub' ! -name 'config' ! -name 'known_hosts'`)"
|
|
|
+fi
|
