Merge branch 'master' of https://github.com/xlogerais/config-bash
Conflicts: rc.d/zz-powerline
This commit is contained in:
commit
fdf83c632e
@ -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
14
rc.d/todo.txt
Normal 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
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user