Merge branch 'master' of https://github.com/xlogerais/config-bash

Conflicts:
	rc.d/zz-powerline

profile.d/tsocks

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

rc.d/todo.txt

@@ -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

rc.d/zz-powerline

@@ -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"