diff --git a/bashrc b/bashrc index afc58ba..029ae53 100755 --- a/bashrc +++ b/bashrc @@ -5,7 +5,7 @@ alias ismsys=false alias iscygwin=false -alias iswindows="(ismsys || iscygwin)" +alias iswindows=false alias isdarwin=false alias islinux=false @@ -16,6 +16,7 @@ case `uname` in (Linux*) alias islinux=true ;; esac +( ismsys || iscygwin ) && alias iswindows=true ########################################## null(){ @@ -49,7 +50,7 @@ export GIT_EDITOR="$EDITOR" null type stty && { stty stop undef # unbind C-s to stop displaying output - # test -z "$TMUX" && stty erase '^h' + # stty erase '^h' } if iswindows; then @@ -165,10 +166,12 @@ showinfo(){ x(){ if [[ -z $DISPLAY ]] && ! [[ -e /tmp/.X11-unix/X0 ]] && (( EUID )); then - #nohup startx >~/.backup/log/xorg.log 2>&1 & + #mkdir -p ~/.backup/log + # nohup startx >~/.backup/log/xorg.log 2>&1 & + # exit startx else - echo "X cant be started! Maybe another X is already running!" 1>&2 + echo "X cant be started! Maybe another X is already running or something." 1>&2 fi } diff --git a/tmux.conf b/tmux.conf index 28a3679..58e2dd4 100644 --- a/tmux.conf +++ b/tmux.conf @@ -5,4 +5,5 @@ bind-key C-z send-prefix set -g default-command /bin/bash set -g default-terminal screen-256color #set -g status-left "" -set -g status-right "#H | %a, %d %b %Y %T %z " +#set -g status-right "#H | %a, %d %b %Y %T %z #(tmux -V)" +set -g status-right "#H | #(tmux -V) " diff --git a/xprograms b/xprograms index 078c040..9baa426 100755 --- a/xprograms +++ b/xprograms @@ -7,6 +7,7 @@ test -f "$HOME/.fehbg" && type feh >/dev/null 2>&1 && sh "$HOME/.fehbg" +#tint2 -c ~/.dotfiles/tint2rc & tint2 & dropboxd & # done by ~/.config/autostart/dropbox.desktop