From d2866cf0945f04de6803bf9f32a0c4c9264ab865 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Tue, 17 Apr 2012 17:51:16 +0900 Subject: [PATCH] misc changes --- bashrc | 12 ++++++------ profile | 5 +++-- vimrc | 3 ++- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bashrc b/bashrc index 6b8a383..e39bc55 100755 --- a/bashrc +++ b/bashrc @@ -77,7 +77,7 @@ alias grep="grep -n${_coloroption}" # alias la="ls -A" # alias lla="ls -Al" # alias less="" -alias vl=/usr/share/vim/vimcurrent/macros/less.sh +# alias vl=/usr/share/vim/vimcurrent/macros/less.sh alias em="emacs -nw" null type vim && alias vi=vim alias pstree="LANG=C pstree" @@ -122,7 +122,7 @@ null type pacman-color && { export PACMAN=pacman-color # used by yaourt } null type pacmatic && { - alias pacman="pacman_program=${pacman_program} pacmatic" + alias pacman="pacmatic" export PACMAN="pacmatic" } @@ -242,15 +242,15 @@ fi o(){ if test $# -eq 0 then - _open_file . & + _open_file . >/dev/null 2>&1 & else for f in "$@" do if test -d $f then - _open_file $f & + _open_file $f >/dev/null 2>&1 & else - _open_file $f + _open_file $f >/dev/null 2>&1 & fi done fi @@ -272,7 +272,7 @@ _my_git_config(){ git config --global color.ui auto git config --global status.relativePaths false 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.b "branch" git config --global alias.ci "commit --verbose" diff --git a/profile b/profile index 7ef445d..077a537 100755 --- a/profile +++ b/profile @@ -19,17 +19,18 @@ export ENV=~/.shrc test -f "${HOME}/.pythonrc" && export PYTHONSTARTUP="${HOME}/.pythonrc" export PYTHONPATH="~/.local/share/lib/python3.2/site-packages" -addtopath(){ +__add_to_path(){ for p in "$@" do echo $PATH | grep -E "^$p:|:$p:|:$p$" >/dev/null 2>&1 || PATH="$p:${PATH}" done } # 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 # in my environment powerdown does not work mkdir -p ~/.backup/log mkdir -p /tmp/$USER-tmp + diff --git a/vimrc b/vimrc index 056fd57..c2ee842 100644 --- a/vimrc +++ b/vimrc @@ -28,6 +28,7 @@ set wrapscan " 折り返し検索 set showmatch " 括弧を閉じた時、対になる括弧を一瞬ハイライトする set ignorecase set smartcase " 検索時に大文字を含んでいたら大/小を区別 +set incsearch set wildmode=longest,list,full set ruler " 行番号、カーソル位置を表示 set nonumber " do not show line number at left side @@ -68,7 +69,7 @@ if has('gui_running') endif if has('win32') -" Windows 用の設定 +" prefs for Windows endif """""""""""""""""""""""""""""""""""""""