From: pho Date: Mon, 8 Dec 2008 04:21:04 +0000 (+0900) Subject: Auto commit by The Sugar System. X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=5a4ae2f676698eb4c47e399858b7459269bf3fae;p=sugar.git Auto commit by The Sugar System. --- diff --git a/GNUmakefile b/GNUmakefile index 6ffe0fb..5fa1230 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -9,6 +9,8 @@ help: @echo " make install - update the current dot files with the repository" @echo " make import FILES=" @echo " - import the dot files into the repository" + @echo " make diff FILE=" + @echo " - show diff of the dot file" @echo lint: @@ -43,4 +45,14 @@ import: -git status endif -.PHONY: help lint update commit install import +ifeq ($(FILE),) +diff: + @echo "Specify one file." + @echo "Usage: make diff FILE=" + @exit 1 +else +diff: + perl ./tools/diff.pl $(FILE) | $(PAGER) +endif + +.PHONY: help lint update commit install import diff diff --git a/dot-files/_xinitrc b/dot-files/_xinitrc index 90192b6..b900705 100644 --- a/dot-files/_xinitrc +++ b/dot-files/_xinitrc @@ -35,6 +35,14 @@ fi LANG="ja_JP.UTF-8"; export LANG GTK_IM_MODULE="uim"; export GTK_IM_MODULE +# start some nice programs +xhost +localhost + +# Set the mouse speed +xset m 5 4 + +echo ".xinitrc is going to exec window manager..." + # start the window manager if which quartz-wm 2>&1 >/dev/null; then quartz-wm --only-proxy & diff --git a/dot-files/_zshenv b/dot-files/_zshenv index 807201e..51e6b4f 100644 --- a/dot-files/_zshenv +++ b/dot-files/_zshenv @@ -53,6 +53,7 @@ export DYLD_FALLBACK_LIBRARY_PATH="" append_path DYLD_FALLBACK_LIBRARY_PATH /usr/pkg/lib # Languages +export LANGUAGAE="ja" export LANG="ja_JP.UTF-8" export OUTPUT_CHARSET="UTF-8" diff --git a/dot-files/_zshrc b/dot-files/_zshrc index 1713829..6d8cf63 100644 --- a/dot-files/_zshrc +++ b/dot-files/_zshrc @@ -69,21 +69,26 @@ alias lls='ls -wla' alias p='pushd' alias o='popd' alias d='dirs' -alias unstuff='open -a StuffIt\ Expander.app' -alias pa='open -a NiseRingo.app' alias df='df -h' alias ed='ed -p "ed> "' alias du='du -k' alias nc='nc -vv' alias mwget="wget --user-agent='Mozilla/1.4b'" alias pstow="pushd /usr/local/stow" -alias safari="open -a Safari" alias w3m="w3m -O UTF-8" alias w3mb="w3m -O UTF-8 -B" -alias ldd="otool -L" -alias heboris='open /Applications/HeborisUEMac/exe/Heboris\ OpenGL.app' -alias hengband='open ~/Applications/hengband*/Hengband*' +if [ $(hostname) = "aria.cielonegro.org" ]; then + alias safari="open -a Safari" + alias unstuff='open -a StuffIt\ Expander.app' + alias pa='open -a NiseRingo.app' + alias heboris='open /Applications/HeborisUEMac/exe/Heboris\ OpenGL.app' + alias hengband='open ~/Applications/hengband*/Hengband*' +fi + +if [ $(uname) = "Darwin" ]; then + alias ldd="otool -L" +fi # The following lines were added by compinstall diff --git a/tools/diff.pl b/tools/diff.pl new file mode 100644 index 0000000..2471c56 --- /dev/null +++ b/tools/diff.pl @@ -0,0 +1,19 @@ +use strict; +use warnings; +use Smart::Comments; +use lib 'tools'; +require 'utils.pl'; +use File::Spec; +use File::Path; + +sub main { + my $arg = shift; + + my $rel = File::Spec->abs2rel($arg, $ENV{HOME}); + my $abs = File::Spec->rel2abs($rel, $ENV{HOME}); + my $saved = rel2saved($rel); + + system('diff', '-u', $abs, $saved); +} + +main($ARGV[0] // die); diff --git a/tools/list-files.pl b/tools/list-files.pl index 2059c9e..2ed8ba8 100644 --- a/tools/list-files.pl +++ b/tools/list-files.pl @@ -76,7 +76,7 @@ __DATA__ .emacs.d .eshell .firefox -.fontconfig* +.fontconfig .fonts .gconf* .gimp* @@ -92,8 +92,8 @@ __DATA__ .localized .mozilla .mpd -.mplayer/DVDKeys* -.mplayer/skins* +.mplayer/DVDKeys +.mplayer/skins .nautilus .navi2ch/*.net .navi2ch/*.com @@ -119,6 +119,7 @@ __DATA__ .w3m/*arrived .w3m/*cookie .w3m/*sessions +.wine .xchat2* .zcomp* .zfunc