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

20-keyboard.conf

@@ -4,6 +4,6 @@ Section "InputClass"
     Identifier             "Keyboard Defaults"
     MatchIsKeyboard        "yes"
 #    Option                 "XkbModel" "acer_laptop"
-#    Option                 "XkbLayout" "jp"
+    Option                 "XkbLayout" "jp"
     Option                 "XkbOptions" "ctrl:nocaps,ctrl:menu_rctrl"
 EndSection

_keysnail.js

@@ -26,13 +26,13 @@ function ignore(k, i) [k, null];
 ///////////////////////////////////////////
 //// firefox
 // style.register("#bookmarksPanel > hbox,#history-panel > hbox {display: none !important;} //#urlbar-container{max-width: 500px !important;}");
-style.register(                 //not work
-        <><![CDATA[
-            input,textarea {
-                font-family: monospace !important;
-            }
-        ]]></>.toString()
-);
+// style.register(                 //not work
+//         <><![CDATA[
+//             input,textarea {
+//                 font-family: monospace !important;
+//             }
+//         ]]></>.toString()
+// );
 
 ///////////////////////////////////
 //search engine

bashrc

@@ -716,6 +716,7 @@ __my_ps1_moc(){
 }
 
 for f in /usr/share/git/git-prompt.sh \
+    /opt/local/share/git-core/git-prompt.sh \
     /opt/local/share/doc/git-core/contrib/completion/git-prompt.sh
 do
     test -r $f && . $f && break

xinitrc

@@ -2,6 +2,7 @@ test -n "$DISPLAY" || return
 test -z "$ROXTERM_PID" || return
 test -z "$SSH_CONNECTION" || return
 
+setxkbmap -layout "jp"
 test "`hostname`" == "arch-aspireone" &&
 setxkbmap -model "acer_laptop" -layout "jp" # this line must comes first