# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1349074721 -10800
# Node ID 3b7ad4d4c162c904ae398fdbfc7f3632644ae50a
# Parent  f01e7848ac4ded518ee813d0c1c9393156206150# Parent  3d6277e853d78cbf8f41dd30b9321606aa7f909b
merged

diff -r f01e7848ac4d -r 3b7ad4d4c162 .bashrc
--- a/.bashrc	Mon Oct 01 01:39:21 2012 +0300
+++ b/.bashrc	Mon Oct 01 09:58:41 2012 +0300
@@ -94,6 +94,7 @@
 alias man='LANG=C man'
 
 alias j='jobs '
+alias e.='e .'
 
 # make and change to a directory
 md () { mkdir -p "$1" && cd "$1"; }
diff -r f01e7848ac4d -r 3b7ad4d4c162 .fvwm/config
--- a/.fvwm/config	Mon Oct 01 01:39:21 2012 +0300
+++ b/.fvwm/config	Mon Oct 01 09:58:41 2012 +0300
@@ -386,16 +386,20 @@
 Read /etc/X11/fvwm/menudefs.hook quiet
 # Read $[FVWM_USERDIR]/menudefs.hook quiet
 
-AddToMenu MenuMy "My Menu" Title
+DestroyMenu MenuMy
+AddToMenu   MenuMy "My Menu" Title
 + &HTop%/usr/share/app-install/icons/htop.png%  Exec  exec xterm -name htop -title HTop -geometry +10+10 -e sudo htop
 + &Emacs%emacs.png%  Exec  exec emacs
 + &Firefox%iceweasel.png%  Exec  exec firefox
-+ &Netbeans%netbeans.png%  Exec  exec $(ls /opt/*/bin/netbeans 2>/dev/null | tail -n 1; [[ ${PIPESTATUS[0]} -gt 0 ]] && command -v netbeans)
 + &VLC%vlc.png%  Exec  exec vlc
 + &Skype%skype.png%  Exec  exec skype
 + &Goldendict%goldendict.png%  Exec  exec goldendict
 + xkill           Exec  exec xkill
-+ "Peoplenet"     Exec  exec xterm -e /usr/bin/pon
+
+DestroyMenu MenuMyDev
+AddToMenu   MenuMyDev "My Dev Menu" Title
++ &Netbeans%netbeans.png%  Exec  exec $(ls /opt/*/bin/netbeans 2>/dev/null | tail -n 1; [[ ${PIPESTATUS[0]} -gt 0 ]] && command -v netbeans)
++ "SQL Developer"  Exec  exec $(ls /opt/*/sqldeveloper.sh 2>/dev/null | tail -n 1; [[ ${PIPESTATUS[0]} -gt 0 ]] && echo xmessage "Can't find 'SQL Developer' in /opt")
 
 # Drawback - you can not make it smaller.
 Style "htop" MinWindowSize 98 98
@@ -434,6 +438,7 @@
 + ""  Nop
 + &Debian%menu/submenu-16x16.xpm%  Popup "/Debian"
 + &My%menu/submenu-16x16.xpm%  Popup MenuMy
++ &MyDev%menu/submenu-16x16.xpm%  Popup MenuMyDev
 + &Window%menu/submenu-16x16.xpm%  Popup MenuWindowOperations
 + &Fvwm%menu/submenu-16x16.xpm%  Popup MenuFvwmRoot
 + ""  Nop
diff -r f01e7848ac4d -r 3b7ad4d4c162 .xmodmaprc
--- a/.xmodmaprc	Mon Oct 01 01:39:21 2012 +0300
+++ b/.xmodmaprc	Mon Oct 01 09:58:41 2012 +0300
@@ -12,3 +12,9 @@
 add mod3 = Super_L
 add mod4 = Hyper_R
 
+! Delete CapsLock (map to Ctrl).
+remove Lock = Caps_Lock
+keysym Caps_Lock = Control_L
+add Control = Control_L
+add Control = Caps_Lock
+