xonecas.io
2780
D2

dotfiles-2014 / commit e345ef3

Single line bash prompt and other things.

sean2015-10-12 e345ef340e31fce4c6d6a47e0358b29be412a3e4 parent 8f7a466

5 files changed

.bashrc+0−171
@@ -1,171 +0,0 @@
1-# ~/.bashrc: executed by bash(1) for non-login shells.
2-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
3-# for examples
4-
5-# If not running interactively, don't do anything
6-case $- in
7- *i*) ;;
8- *) return;;
9-esac
10-
11-# don't put duplicate lines or lines starting with space in the history.
12-# See bash(1) for more options
13-HISTCONTROL=ignoreboth
14-
15-# append to the history file, don't overwrite it
16-shopt -s histappend
17-
18-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
19-HISTSIZE=1000
20-HISTFILESIZE=2000
21-
22-# check the window size after each command and, if necessary,
23-# update the values of LINES and COLUMNS.
24-shopt -s checkwinsize
25-
26-# If set, the pattern "**" used in a pathname expansion context will
27-# match all files and zero or more directories and subdirectories.
28-#shopt -s globstar
29-
30-# make less more friendly for non-text input files, see lesspipe(1)
31-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
32-
33-# set variable identifying the chroot you work in (used in the prompt below)
34-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
35- debian_chroot=$(cat /etc/debian_chroot)
36-fi
37-
38-# set a fancy prompt (non-color, unless we know we "want" color)
39-case "$TERM" in
40- xterm-color) color_prompt=yes;;
41-esac
42-
43-# uncomment for a colored prompt, if the terminal has the capability; turned
44-# off by default to not distract the user: the focus in a terminal window
45-# should be on the output of commands, not on the prompt
46-#force_color_prompt=yes
47-
48-if [ -n "$force_color_prompt" ]; then
49- if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
50- # We have color support; assume it's compliant with Ecma-48
51- # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
52- # a case would tend to support setf rather than setaf.)
53- color_prompt=yes
54- else
55- color_prompt=
56- fi
57-fi
58-
59-if [ "$color_prompt" = yes ]; then
60- PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
61-else
62- PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
63-fi
64-unset color_prompt force_color_prompt
65-
66-# If this is an xterm set the title to user@host:dir
67-case "$TERM" in
68-xterm*|rxvt*)
69- PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
70- ;;
71-*)
72- ;;
73-esac
74-
75-# enable color support of ls and also add handy aliases
76-if [ -x /usr/bin/dircolors ]; then
77- test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
78- alias ls='ls --color=auto'
79- #alias dir='dir --color=auto'
80- #alias vdir='vdir --color=auto'
81-
82- alias grep='grep --color=auto'
83- alias fgrep='fgrep --color=auto'
84- alias egrep='egrep --color=auto'
85-fi
86-
87-# some more ls aliases
88-alias ll='ls -alF'
89-alias la='ls -A'
90-alias l='ls -CF'
91-
92-# Add an "alert" alias for long running commands. Use like so:
93-# sleep 10; alert
94-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$//'\'')"'
95-
96-# Alias definitions.
97-# You may want to put all your additions into a separate file like
98-# ~/.bash_aliases, instead of adding them here directly.
99-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
100-
101-if [ -f ~/.bash_aliases ]; then
102- . ~/.bash_aliases
103-fi
104-
105-# enable programmable completion features (you don't need to enable
106-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
107-# sources /etc/bash.bashrc).
108-if ! shopt -oq posix; then
109- if [ -f /usr/share/bash-completion/bash_completion ]; then
110- . /usr/share/bash-completion/bash_completion
111- elif [ -f /etc/bash_completion ]; then
112- . /etc/bash_completion
113- fi
114-fi
115-
116-# I use vim
117-export EDITOR=vim
118-
119-alias wo='workon agentsmith'
120-alias wdir='cd /vagrant'
121-alias g='git'
122-alias gst='git status'
123-alias gc='git commit --verbose'
124-alias gp='git pull --rebase'
125-alias ggrep='git grep'
126-
127-export NVM_DIR="/home/vagrant/.nvm"
128-[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
129-
130-export VIRTUAL_ENV_DISABLE_PROMPT=1
131-source `which virtualenvwrapper.sh`
132-
133-# Prompt
134-function __git_dirty {
135- git diff --quiet HEAD &>/dev/null
136- [ $? == 1 ] && echo " ↺ "
137-}
138-
139-function __git_branch {
140- __git_ps1 "%s"
141-}
142-
143-function __virtualenv {
144- local env=$(basename "$VIRTUAL_ENV")
145- [ "$env" != "" ] && echo "py:$env"
146-}
147-
148-function __node {
149- if hash node 2>/dev/null; then
150- local v=$(node -v)
151- fi
152- [ "$v" != "" ] && echo "n:${v:1}"
153-}
154-
155-function __info {
156- local full=(
157- $(__virtualenv)
158- $(__node)
159- $(__git_branch)
160- $(__git_dirty)
161- )
162- full="${full[*]}"
163- [ "$full" != "" ] && echo "$full"
164-}
165-
166-COLOR1=$(tput setaf 1)
167-COLOR2=$(tput setaf 2)
168-COLOR3=$(tput setaf 3)
169-LINE1="$COLOR1┌─$COLOR3[$COLOR2\$(__info)$COLOR3]$COLOR1──$COLOR3($COLOR2\w$COLOR3)\n"
170-LINE2="$COLOR1└─> $COLOR3☠ \$(tput setaf 7)"
171-PS1="$LINE1$LINE2"
bashrc+1−3
@@ -167,6 +167,4 @@ function __info {
167167 COLOR1=$(tput setaf 1)
168168 COLOR2=$(tput setaf 2)
169169 COLOR3=$(tput setaf 3)
170-LINE1="$COLOR1┌─$COLOR3[$COLOR2\$(__info)$COLOR3]$COLOR1──$COLOR3($COLOR2\w$COLOR3)\n"
171-LINE2="$COLOR1└─> $COLOR3☠ \$(tput setaf 7)"
172-PS1="$LINE1$LINE2"
170+PS1="$COLOR3[$COLOR2\$(__info)$COLOR3] $COLOR1☠ $COLOR3($COLOR2\w$COLOR3) \$(tput setaf 7)"
install.py+7−0
@@ -23,6 +23,7 @@ PWD = dirname(__file__)
2323 VIMRC = join(HOME, ".vimrc")
2424 VIM = join(HOME, ".vim")
2525 TMUX_CONF = join(HOME, ".tmux.conf")
26+BASHRC = join(HOME, ".bashrc")
2627
2728 def clean():
2829 """ This rests everything """
@@ -36,6 +37,9 @@ def clean():
3637 if exists(TMUX_CONF):
3738 remove(TMUX_CONF)
3839
40+ if exists(BASHRC):
41+ remove(BASHRC)
42+
3943
4044 def create_vim_bundle():
4145 """ Create necessary folders: .vim/bundle """
@@ -88,6 +92,9 @@ def main():
8892 # tmux
8993 copyfile(join(PWD, "tmux.conf"), TMUX_CONF)
9094
95+ # bashrc
96+ copyfile(join(PWD, "bashrc"), BASHRC)
97+
9198 # vim
9299 create_vim_bundle()
93100 install_pathogen()
vim_plugins.txt+1−0
@@ -9,3 +9,4 @@ https://github.com/scrooloose/syntastic.git
99 https://github.com/sjl/badwolf.git
1010 https://github.com/tpope/vim-fugitive.git
1111 https://github.com/tpope/vim-haml.git
12+https://github.com/airblade/vim-gitgutter.git
vimrc+3−0
@@ -52,6 +52,9 @@ set t_Co=256
5252 set t_ut=
5353 set background=dark
5454 colorscheme badwolf
55+let g:badwolf_darkgutter = 1
56+let g:badwolf_html_link_underline = 0
57+let g:badwolf_css_props_highlight = 1
5558
5659
5760 " Plugin stuff