From 2ca14e8da17062405a4e73e7e4c4bafe3522cee3 Mon Sep 17 00:00:00 2001 From: PHO Date: Mon, 8 Jun 2009 14:36:27 +0900 Subject: [PATCH] Auto commit by The Sugar System. --- dot-files/_Xmodmap | 96 ++++++++++++++++++++++++----------------- dot-files/_emacs_el | 36 ++++++++++++---- dot-files/_navi2ch/init | 4 +- dot-files/_xinitrc | 9 +++- dot-files/_zshenv | 3 ++ 5 files changed, 97 insertions(+), 51 deletions(-) diff --git a/dot-files/_Xmodmap b/dot-files/_Xmodmap index 253c74f..17ab620 100644 --- a/dot-files/_Xmodmap +++ b/dot-files/_Xmodmap @@ -1,27 +1,45 @@ -keycode 8 = a A aring Aring -keycode 9 = s S ssharp Iacute -keycode 10 = d D partialderivative Icircumflex -keycode 11 = f F function Idiaeresis -keycode 12 = h H abovedot Oacute -keycode 13 = g G copyright doubleacute -keycode 14 = z Z Greek_OMEGA cedilla -keycode 15 = x X U2248 ogonek -keycode 16 = c C ccedilla Ccedilla -keycode 17 = v V radical U25CA +clear Shift +add Shift = Shift_L Shift_R + +clear Lock +add Lock = Caps_Lock + +clear Control +add Control = Control_L Control_R + +clear Mod1 +clear Mod2 +clear Mod3 +clear Mod4 +clear Mod5 + +add Mod1 = Mode_switch +add Mod2 = Meta_L + +keycode 8 = a A dead_macron U0304 +keycode 9 = s S ssharp nobreakspace +keycode 10 = d D eth ETH +keycode 11 = f F function nobreakspace +keycode 12 = h H U02CD U0331 +keycode 13 = g G copyright caret +keycode 14 = z Z U02C0 U0309 +keycode 15 = x X period U0323 +keycode 16 = c C dead_cedilla U0327 +keycode 17 = v V dead_caron U030C keycode 18 = section plusminus -keycode 19 = b B integral idotless +keycode 19 = b B dead_breve U0306 keycode 20 = q Q oe OE -keycode 21 = w W U2211 doublelowquotemark -keycode 22 = e E dead_acute acute +keycode 21 = w W dead_abovedot U0307 +keycode 22 = e E dead_acute U0301 keycode 23 = r R registered U2030 -keycode 24 = y Y yen Aacute -keycode 25 = t T dagger caron +keycode 24 = y Y yen nobreakspace +keycode 25 = t T thorn THORN keycode 26 = 1 exclam exclamdown U2044 keycode 27 = 2 at trademark EuroSign keycode 28 = 3 numbersign sterling U2039 keycode 29 = 4 dollar cent U203A -keycode 30 = 6 asciicircum section UFB02 -keycode 31 = 5 percent infinity UFB01 +keycode 30 = 6 asciicircum dead_circumflex U0302 +keycode 31 = 5 percent section dagger keycode 32 = equal plus notequal plusminus keycode 33 = 9 parenleft ordfeminine periodcentered keycode 34 = 7 ampersand paragraph doubledagger @@ -29,39 +47,39 @@ keycode 35 = minus underscore endash emdash keycode 36 = 8 asterisk enfilledcircbullet degree keycode 37 = 0 parenright masculine singlelowquotemark keycode 38 = bracketright braceright leftsinglequotemark rightsinglequotemark -keycode 39 = o O oslash Ooblique -keycode 40 = u U dead_diaeresis diaeresis +keycode 39 = o O oslash Oslash +keycode 40 = u U dead_diaeresis U0308 keycode 41 = bracketleft braceleft leftdoublequotemark rightdoublequotemark -keycode 42 = i I dead_circumflex U02C6 -keycode 43 = p P Greek_pi U220F +keycode 42 = i I U02BC U031B +keycode 43 = p P comma U0326 keycode 44 = Return -keycode 45 = l L notsign Ograve -keycode 46 = j J U2206 Ocircumflex +keycode 45 = l L minus U0335 +keycode 46 = j J dead_doubleacute U030B keycode 47 = apostrophe quotedbl ae AE -keycode 48 = k K U02DA UF8FF -keycode 49 = semicolon colon ellipsis Uacute +keycode 48 = k K dead_abovering U030A +keycode 49 = semicolon colon ellipsis numerosign keycode 50 = backslash bar guillemotleft guillemotright -keycode 51 = comma less lessthanequal macron +keycode 51 = comma less lessthanequal doublelowquotemark keycode 52 = slash question division questiondown -keycode 53 = n N dead_tilde U02DC -keycode 54 = m M mu Acircumflex -keycode 55 = period greater greaterthanequal breve +keycode 53 = n N dead_tilde U0303 +keycode 54 = m M dead_ogonek U0328 +keycode 55 = period greater greaterthanequal U0294 keycode 56 = Tab keycode 57 = space NoSymbol nobreakspace -keycode 58 = grave asciitilde dead_grave grave +keycode 58 = grave asciitilde dead_grave U0300 keycode 59 = BackSpace -keycode 60 = U0003 +keycode 60 = 0x1000003 keycode 61 = Escape keycode 62 = keycode 63 = Meta_L keycode 64 = Shift_L keycode 65 = Caps_Lock -keycode 66 = Alt_L +keycode 66 = Mode_switch keycode 67 = Control_L keycode 68 = Shift_R -keycode 69 = Alt_R +keycode 69 = Mode_switch keycode 70 = Control_R -keycode 71 = Meta_R +keycode 71 = keycode 72 = keycode 73 = KP_Decimal keycode 74 = Right asterisk @@ -91,18 +109,18 @@ keycode 97 = KP_7 keycode 98 = keycode 99 = KP_8 keycode 100 = KP_9 -keycode 101 = yen bar backslash bar -keycode 102 = underscore NoSymbol dead_grave grave -keycode 103 = comma +keycode 101 = +keycode 102 = +keycode 103 = keycode 104 = F5 keycode 105 = F6 keycode 106 = F7 keycode 107 = F3 keycode 108 = F8 keycode 109 = F9 -keycode 110 = space +keycode 110 = keycode 111 = F11 -keycode 112 = space +keycode 112 = keycode 113 = F13 keycode 114 = keycode 115 = F14 diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el index 357306d..352263c 100644 --- a/dot-files/_emacs_el +++ b/dot-files/_emacs_el @@ -72,6 +72,14 @@ (message "Warning: feature %s is absent" feature) ; warn and ignore (apply 'signal (car e) (cdr e)))))) ; rethrow +(defun load-if-present (file) + (condition-case e + (load file) + (file-error + (if (equal (cadr e) "Cannot open load file") + (message "Warning: file named %s is absent" file) ; warn and ignore + (apply 'signal (car e) (cdr e)))))) ; rethrow + (defun load-file-if-present (path) (if (file-exists-p path) (load-file path) @@ -92,12 +100,22 @@ ;; MPC ;(require-if-present 'mpc-autoloads) -;; riece -(autoload 'riece "riece" "riece the IRC client" t) +;; twittering-mode +(require-if-present 'twittering-mode) +(setq twittering-username "phonohawk") ;; cedet (load-file-if-present "/usr/pkg/share/emacs/site-lisp/cedet/common/cedet.el") +;; riece +(autoload 'riece "riece" "Start Riece" t) +(add-hook 'riece-after-load-startup-hook + #'(lambda () + (add-to-list 'riece-addons 'riece-alias) + (add-to-list 'riece-addons 'riece-skk-kakutei) + (add-to-list 'riece-addons 'riece-keyword) + (add-to-list 'riece-addons 'riece-ctlseq))) + ;; ecb (require-if-present 'ecb-autoloads) (let* ((hosts '(("netbsd." . @@ -107,9 +125,6 @@ ("g1.cuenote.jp" . (("~/sandbox/MR/engine/libycom" "libycom") )) - ("g1.cuenote.jp" . - (("~/sandbox/MR/engine/libycom" "libycom") - )) ("aria.cielonegro.org" . (("~/sandbox/_web-app/Rakka" "Rakka") ("~/sandbox/_haskell/Lucu" "Lucu") @@ -122,6 +137,8 @@ ("~/sandbox/_haskell/hxt-compile" "hxt-compile") ("~/src/ghc-6.10.1" "ghc-6.10.1") ("~/sandbox/sugar" "sugar") + ("~/sandbox/_haskell/dns" "dns") + ("~/sandbox/_haskell/blackboard-ddns" "blackboard-ddns") )))) (paths (cdr (assoc (system-name) hosts)))) (setq ecb-source-path paths)) @@ -186,10 +203,7 @@ (setq tramp-default-method "ssh") ;; Haskell -(autoload 'haskell-mode "haskell-mode" - "Major mode for editing Haskell scripts." t) -(autoload 'literate-haskell-mode "haskell-mode" - "Major mode for editing literate Haskell scripts." t) +(load-if-present "haskell-site-file.el") (autoload 'run-haskell "inf-haskell" "" t) (autoload 'switch-to-haskell "inf-haskell" "" t) @@ -365,6 +379,7 @@ '(mouse-wheel-scroll-amount (quote (1 ((shift) . 5) ((control))))) '(navi2ch-browse-url-browser-function (quote browse-url-firefox)) '(navi2ch-display-splash-screen nil) + '(navi2ch-list-moved-board-alist (quote (("http://mamono.2ch.net/ihou/" . "http://hideyoshi.2ch.net/ihou/")))) '(navi2ch-mona-face-variable (quote navi2ch-mona16-face)) '(navi2ch-mona-on-message-mode t) '(newsticker-html-renderer (quote w3m-region)) @@ -372,6 +387,9 @@ '(newsticker-url-list-defaults (quote (("slashdot" "http://slashdot.org/index.rss" nil 3600)))) '(nxml-auto-insert-xml-declaration-flag t) '(nxml-slash-auto-complete-flag t) + '(riece-layout "default") + '(riece-layout-alist (quote (("middle-right" riece-configure-windows right middle) ("middle-left" riece-configure-windows left middle) ("top-right" riece-configure-windows right top) ("top-left" riece-configure-windows left top) ("bottom-right" riece-configure-windows right bottom) ("bottom-left" riece-configure-windows left bottom) ("top" riece-configure-windows-top) ("spiral" riece-configure-windows-spiral) ("default" . "middle-right")))) + '(riece-others-buffer-mode nil) '(rng-schema-locating-files (quote ("schemas.xml" "/sw/share/schema/schemas.xml" "~/share/nxml/schemas.xml"))) '(safe-local-variable-values (quote ((todo-categories "Todo" "Todo" "Todo" "Todo")))) '(w3m-bookmark-file-coding-system (quote utf-8)) diff --git a/dot-files/_navi2ch/init b/dot-files/_navi2ch/init index 6254643..b348439 100644 --- a/dot-files/_navi2ch/init +++ b/dot-files/_navi2ch/init @@ -44,7 +44,9 @@ (navi2ch-auto-modify (setq navi2ch-article-message-filter-by-name-alist - '(("雷鳥" . hide) + '(("◆.NHnubyYck" . hide) + ("◆3waIkAJWrg" . hide) + ("雷鳥" . hide) ("ミノワマソ" . hide) ("◆.EDMOUBKE2" . hide) ("改行太郎 ◆KAIGYOBBMM " . hide) diff --git a/dot-files/_xinitrc b/dot-files/_xinitrc index b900705..cd5cff9 100644 --- a/dot-files/_xinitrc +++ b/dot-files/_xinitrc @@ -2,8 +2,8 @@ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap -sysresources=/etc/X11/xinit/.Xresources -sysmodmap=/etc/X11/xinit/.Xmodmap +sysresources=/usr/pkg/lib/X11/xinit/.Xresources +sysmodmap=/usr/pkg/lib/X11/xinit/.Xmodmap # merge in defaults and keymaps if [ -d "/usr/local/lib/X11/fonts/Unicode" ]; then @@ -11,6 +11,11 @@ if [ -d "/usr/local/lib/X11/fonts/Unicode" ]; then xset fp rehash fi +if [ -d "/usr/pkg/lib/X11/fonts/local/" ]; then + xset fp+ /usr/pkg/lib/X11/fonts/local/ + xset fp rehash +fi + if [ -f $sysresources ]; then xrdb -merge $sysresources fi diff --git a/dot-files/_zshenv b/dot-files/_zshenv index a7429ac..9b6e180 100644 --- a/dot-files/_zshenv +++ b/dot-files/_zshenv @@ -73,6 +73,9 @@ export PERL_BADLANG=0 export DARCS_EMAIL="pho@cielonegro.org" export DARCS_DONT_ESCAPE_8BIT=1 +# CVS +export CVS_RSH=ssh + # uim-fep export UIM_FEP=skk -- 2.40.0