Browse Source

misc changes

pull/1/head
10sr 12 years ago
parent
commit
6daebe24ed
3 changed files with 10 additions and 5 deletions
  1. +7
    -4
      bashrc
  2. +2
    -1
      tmux.conf
  3. +1
    -0
      xprograms

+ 7
- 4
bashrc View File

@@ -5,7 +5,7 @@


alias ismsys=false alias ismsys=false
alias iscygwin=false alias iscygwin=false
alias iswindows="(ismsys || iscygwin)"
alias iswindows=false
alias isdarwin=false alias isdarwin=false
alias islinux=false alias islinux=false


@@ -16,6 +16,7 @@ case `uname` in
(Linux*) alias islinux=true ;; (Linux*) alias islinux=true ;;
esac esac


( ismsys || iscygwin ) && alias iswindows=true


########################################## ##########################################
null(){ null(){
@@ -49,7 +50,7 @@ export GIT_EDITOR="$EDITOR"


null type stty && { null type stty && {
stty stop undef # unbind C-s to stop displaying output stty stop undef # unbind C-s to stop displaying output
# test -z "$TMUX" && stty erase '^h'
# stty erase '^h'
} }


if iswindows; then if iswindows; then
@@ -165,10 +166,12 @@ showinfo(){


x(){ x(){
if [[ -z $DISPLAY ]] && ! [[ -e /tmp/.X11-unix/X0 ]] && (( EUID )); then 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 startx
else 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 fi
} }




+ 2
- 1
tmux.conf View File

@@ -5,4 +5,5 @@ bind-key C-z send-prefix
set -g default-command /bin/bash set -g default-command /bin/bash
set -g default-terminal screen-256color set -g default-terminal screen-256color
#set -g status-left "" #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) "

+ 1
- 0
xprograms View File

@@ -7,6 +7,7 @@ test -f "$HOME/.fehbg" &&
type feh >/dev/null 2>&1 && type feh >/dev/null 2>&1 &&
sh "$HOME/.fehbg" sh "$HOME/.fehbg"


#tint2 -c ~/.dotfiles/tint2rc &
tint2 & tint2 &


dropboxd & # done by ~/.config/autostart/dropbox.desktop dropboxd & # done by ~/.config/autostart/dropbox.desktop


Loading…
Cancel
Save