Browse Source

misc changes

pull/1/head
10sr 12 years ago
parent
commit
d2866cf094
3 changed files with 11 additions and 9 deletions
  1. +6
    -6
      bashrc
  2. +3
    -2
      profile
  3. +2
    -1
      vimrc

+ 6
- 6
bashrc View File

@@ -77,7 +77,7 @@ alias grep="grep -n${_coloroption}"
# alias la="ls -A" # alias la="ls -A"
# alias lla="ls -Al" # alias lla="ls -Al"
# alias less="" # alias less=""
alias vl=/usr/share/vim/vimcurrent/macros/less.sh
# alias vl=/usr/share/vim/vimcurrent/macros/less.sh
alias em="emacs -nw" alias em="emacs -nw"
null type vim && alias vi=vim null type vim && alias vi=vim
alias pstree="LANG=C pstree" alias pstree="LANG=C pstree"
@@ -122,7 +122,7 @@ null type pacman-color && {
export PACMAN=pacman-color # used by yaourt export PACMAN=pacman-color # used by yaourt
} }
null type pacmatic && { null type pacmatic && {
alias pacman="pacman_program=${pacman_program} pacmatic"
alias pacman="pacmatic"
export PACMAN="pacmatic" export PACMAN="pacmatic"
} }


@@ -242,15 +242,15 @@ fi
o(){ o(){
if test $# -eq 0 if test $# -eq 0
then then
_open_file . &
_open_file . >/dev/null 2>&1 &
else else
for f in "$@" for f in "$@"
do do
if test -d $f if test -d $f
then then
_open_file $f &
_open_file $f >/dev/null 2>&1 &
else else
_open_file $f
_open_file $f >/dev/null 2>&1 &
fi fi
done done
fi fi
@@ -272,7 +272,7 @@ _my_git_config(){
git config --global color.ui auto git config --global color.ui auto
git config --global status.relativePaths false git config --global status.relativePaths false
git config --global status.showUntrackedFiles normal git config --global status.showUntrackedFiles normal
git config --global alias.graph "log --graph --date-order -C -M --pretty=tformat:\"<%h> %ad [%an] %Cgreen%d%Creset %s\" --all --date=short"
git config --global alias.graph "log --graph --date-order -C -M --pretty=tformat:\"<%h> %ad [%an] %Cgreen%d%Creset %s\" --all --date=iso"
git config --global alias.st "status -s" git config --global alias.st "status -s"
git config --global alias.b "branch" git config --global alias.b "branch"
git config --global alias.ci "commit --verbose" git config --global alias.ci "commit --verbose"


+ 3
- 2
profile View File

@@ -19,17 +19,18 @@ export ENV=~/.shrc
test -f "${HOME}/.pythonrc" && export PYTHONSTARTUP="${HOME}/.pythonrc" test -f "${HOME}/.pythonrc" && export PYTHONSTARTUP="${HOME}/.pythonrc"
export PYTHONPATH="~/.local/share/lib/python3.2/site-packages" export PYTHONPATH="~/.local/share/lib/python3.2/site-packages"


addtopath(){
__add_to_path(){
for p in "$@" for p in "$@"
do do
echo $PATH | grep -E "^$p:|:$p:|:$p$" >/dev/null 2>&1 || PATH="$p:${PATH}" echo $PATH | grep -E "^$p:|:$p:|:$p$" >/dev/null 2>&1 || PATH="$p:${PATH}"
done done
} }
# export PATH="${PATH}:${HOME}/bin" # export PATH="${PATH}:${HOME}/bin"
addtopath ${HOME}/bin
__add_to_path ${HOME}/bin


type setterm >/dev/null 2>&1 && setterm -blank 30 -powersave on # -powerdown 10 type setterm >/dev/null 2>&1 && setterm -blank 30 -powersave on # -powerdown 10
# in my environment powerdown does not work # in my environment powerdown does not work


mkdir -p ~/.backup/log mkdir -p ~/.backup/log
mkdir -p /tmp/$USER-tmp mkdir -p /tmp/$USER-tmp


+ 2
- 1
vimrc View File

@@ -28,6 +28,7 @@ set wrapscan " 折り返し検索
set showmatch " 括弧を閉じた時、対になる括弧を一瞬ハイライトする set showmatch " 括弧を閉じた時、対になる括弧を一瞬ハイライトする
set ignorecase set ignorecase
set smartcase " 検索時に大文字を含んでいたら大/小を区別 set smartcase " 検索時に大文字を含んでいたら大/小を区別
set incsearch
set wildmode=longest,list,full set wildmode=longest,list,full
set ruler " 行番号、カーソル位置を表示 set ruler " 行番号、カーソル位置を表示
set nonumber " do not show line number at left side set nonumber " do not show line number at left side
@@ -68,7 +69,7 @@ if has('gui_running')
endif endif


if has('win32') if has('win32')
" Windows 用の設定
" prefs for Windows
endif endif


""""""""""""""""""""""""""""""""""""""" """""""""""""""""""""""""""""""""""""""


Loading…
Cancel
Save