Browse Source

Merge branch 'master' of github.com:10sr/dotfiles

pull/1/head
10sr 11 years ago
parent
commit
39f47d139d
2 changed files with 21 additions and 7 deletions
  1. +13
    -7
      bashrc
  2. +8
    -0
      xinitrc

+ 13
- 7
bashrc View File

@@ -810,7 +810,11 @@ test -n "$SSH_CONNECTION" && __my_ps1_ssh_str="${__my_c5}SSH${__my_cdef} "

__my_ps1_scale(){
local last=$?
printf "${LINES}x${COLUMNS}"
if null type stty && ! ismsys
then
stty size | tr -d $'\n' | tr " " x
printf " "
fi
return $last
}

@@ -885,12 +889,14 @@ then
__my_cdef="\[\e[0m\]"
fi

export _LAST_STATUS=$?
__my_export_last_status(){
export _LAST_STATUS=$?
echo $_LAST_STATUS
return $_LAST_STATUS
}
# export _LAST_STATUS=a
# __my_export_last_status(){
# local last=$?
# echo $last
# export _LAST_STATUS=$last
# echo $_LAST_STATUS
# return $last
# }

_ps1_bash="\
${__my_c4}:: ${__my_cdef}[${__my_c2}\u@\H${__my_cdef}:${__my_c1}\w/${__my_cdef}]\$(__my_ps1_git)\$(__my_ps1_bttry)\$(__my_ps1_ipaddr)\$(__my_ps1_moc)\n\


+ 8
- 0
xinitrc View File

@@ -1,7 +1,15 @@
#!/bin/sh

test -n "$DISPLAY" || return
test -z "$ROXTERM_PID" || return
test -z "$SSH_CONNECTION" || return

case "$TERM" in
xterm*) return;;
esac

unset TMUX

setxkbmap -layout "jp"
test "`hostname`" == "arch-aspireone" &&
setxkbmap -model "acer_laptop" -layout "jp" # this line must comes first


Loading…
Cancel
Save