Add .Xmodmap & .inputrc; Other small updates.

* .Xmodmap: disable CapsLock key
* .inputrc: vi-style bindings for readline

8 files changed, 71 insertions, 14 deletions

diff --git a/.Xmodmap b/.Xmodmap
new file mode 100644
index 0000000..e6e0ef0
--- /dev/null
+++ b/.Xmodmap
@@ -0,0 +1,18 @@
+!! ~/.Xmodmap
+!!
+!! Custom keymaps
+!!
+!! Aaron LI
+!! 2015/06/15
+!!
+
+!! Swap 'Caps Lock' with 'Left Control'
+!! Reference: http://c2.com/cgi/wiki?RemapCapsLock
+remove Lock = Caps_Lock
+remove Control = Control_L
+keysym Caps_Lock = Control_L
+!! If don't want a 'Caps Lock' at all, just comment the following *1* line.
+!keysym Control_L = Caps_Lock
+add Control = Control_L
+add Lock = Caps_Lock
+
diff --git a/.config/htop/htoprc b/.config/htop/htoprc
index 9c39c23..5bef5a2 100644
--- a/.config/htop/htoprc
+++ b/.config/htop/htoprc
@@ -16,6 +16,7 @@ header_margin=1
 detailed_cpu_time=0
 cpu_count_from_zero=0
 update_process_names=0
+account_guest_in_cpu_meter=0
 color_scheme=0
 delay=15
 left_meters=AllCPUs Memory Swap 
diff --git a/.gitconfig b/.gitconfig
index 78316a6..e8177da 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,5 +1,5 @@
 [user]
 	name = Aaron LI
-	email = aaronly.me@outlook.com
+	email = aaronly.me@gmail.com
 [push]
 	default = simple
diff --git a/.gitignore b/.gitignore
index e625812..abd7817 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@
 *~
 *.swp
 *.orig
+*.bak
+*_bak
 
 ## vifm
 .vifm/Trash/
@@ -87,7 +89,8 @@ __pycache__/
 # mutt
 .mutt/aliases
 .mutt/certificates
-.mutt/history
+.mutt/xlabels
+.mutt/*history
 .mutt/mailboxes*
 .mutt/signature
 .mutt/accounts/
diff --git a/.inputrc b/.inputrc
new file mode 100644
index 0000000..7d93f5d
--- /dev/null
+++ b/.inputrc
@@ -0,0 +1,30 @@
+#
+# ~/.inputrc
+#
+# readline configurations
+#
+# Reference:
+# [1] ArchWiki - Readline
+#     https://wiki.archlinux.org/index.php/Readline
+#
+# Aaron LI
+# 2015-09-26
+#
+
+#$include /etc/inputrc
+
+# vi mode
+set editing-mode vi
+$if mode=vi
+set keymap vi-command
+# these are for vi-command mode
+"\e[A": history-search-backward
+"\e[B": history-search-forward
+set keymap vi-insert
+# these are for vi-insert mode
+"\e[A": history-search-backward
+"\e[B": history-search-forward
+$endif
+
+
+#  vim: set ts=8 sw=4 tw=0 fenc=utf-8 ft=readline: #
diff --git a/.tmux.conf b/.tmux.conf
index 33cd481..260954e 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -48,8 +48,8 @@ bind -r C-h select-window -t :-
 bind -r C-l select-window -t :+
 
 ## Quich cycle through windows
-bind-key -n C-p previous-window
-bind-key -n C-n next-window
+#bind-key -n C-p previous-window
+#bind-key -n C-n next-window
 
 ## Pane resizing
 bind -r H resize-pane -L 5
diff --git a/.xinitrc b/.xinitrc
index bfeb0a2..f52892e 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# ~/.xinitrc
+#
 
 # Run all system xinitrc shell scripts.
 xinitdir="/etc/X11/xinit/xinitrc.d"
@@ -9,7 +12,14 @@ if [ -d "$xinitdir" ]; then
             . "$script"
         fi
     done
+    unset $script
 fi
 
-[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
+[ -f ~/.Xresources ] && xrdb -load ~/.Xresources
+
+# disable beep
+xset b off
+
+# disable CapsLock
+setxkbmap -option ctrl:nocaps
 
diff --git a/.zshrc.local b/.zshrc.local
index 90db61b..9e5d50d 100644
--- a/.zshrc.local
+++ b/.zshrc.local
@@ -5,8 +5,8 @@
 ## 2014/05/31
 
 ### locale {{{
-export LANG="en_US.utf8"
-export LC_CTYPE="zh_CN.utf8"
+export LANG="en_US.UTF-8"
+export LC_CTYPE="zh_CN.UTF-8"
 export LC_COLLATE="C"
 ### }}}
 
@@ -15,7 +15,7 @@ if [ -d "$HOME/bin" ]; then
     export PATH="$HOME/bin:$PATH"
 fi
 # admin
-if `groups | grep -qE '\b(wheel|adm|sudo)\b'`; then
+if groups | grep -qE '\b(wheel|adm|sudo)\b'; then
     export PATH="$PATH:/usr/local/sbin:/usr/sbin:/sbin"
 fi
 
@@ -54,11 +54,6 @@ fi
 ### python-virtualenv }}}
 
 ### astro {{{
-## DS9 settings
-#if [ -x $HOME/bin/ds9 ]; then
-#    alias ds9="$HOME/bin/ds9"
-#fi
-
 # backup LD_LIBRARY_PATH settings
 LD_LIBRARY_PATH_BAK="${LD_LIBRARY_PATH}"
 
@@ -87,7 +82,7 @@ function ciaoinit() {
         heainit > /dev/null
     fi
     if [ "x${CIAO_STATE}" = "x" ]; then
-        source $CIAO_PATH/bin/ciao.bash > /dev/null
+        source $CIAO_PATH/bin/ciao.bash
     else
         source $CIAO_PATH/bin/ciao.bash -o
     fi