Conflicts:
	rc.d/zz-powerline
This commit is contained in:
Xavier Logerais 2014-04-09 18:29:16 +02:00
commit fdf83c632e
3 changed files with 19 additions and 2 deletions

View File

@ -1,4 +1,7 @@
#!/bin/bash
# Proxy
export TSOCKS_CONF_FILE=~/.config/tsocks/tsocks.conf
if [ -x /usr/bin/tsocks ]
then
export TSOCKS_CONF_FILE=~/.config/tsocks/tsocks.conf
fi

14
rc.d/todo.txt Normal file
View File

@ -0,0 +1,14 @@
#!/bin/bash
if [ -f ~/software/todo.txt-cli/todo.sh ]; then
source ~/software/todo.txt-cli/todo_completion
export TODOTXT_DEFAULT_ACTION=ls
alias todo='~/software/todo.txt-cli/todo.sh'
complete -F _todo todo
alias t='~/software/todo.txt-cli/todo.sh'
complete -F _todo t
fi

View File

@ -7,7 +7,7 @@ POWERLINE_FILE=/usr/share/powerline/bash/powerline.sh
export URXVT_FONT_NAME="DejaVu Sans Mono for Powerline"
export URXVT_FONT_SIZE="8"
if [ -f "${POWERLINE_FILE}" ]
if [ -f "${POWERLINE_FILE}" -a -z "$SSH_CONNECTION" ]
then
xrdb -merge <<"EOF"