# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1339013754 -10800
# Node ID 0625f9c659134db1efee808a085ca305a20365d4
# Parent  917d19d3a081899afee07c831eeda92dce532ea9# Parent  f5363ac2e581cb47fc4547aa87b1781996485f09
merged

diff -r f5363ac2e581 -r 0625f9c65913 .bashrc
--- a/.bashrc	Thu May 31 23:50:19 2012 +0300
+++ b/.bashrc	Wed Jun 06 23:15:54 2012 +0300
@@ -144,3 +144,11 @@
   done
 fi
 
+################################################################
+# Load custom settings (user editable).
+# Placed to the end to allow override skel settings.
+
+if [[ -f ~/.bash_custom ]]; then
+  . ~/.bash_custom
+fi
+
diff -r f5363ac2e581 -r 0625f9c65913 .config/mc/mc.ext
--- a/.config/mc/mc.ext	Thu May 31 23:50:19 2012 +0300
+++ b/.config/mc/mc.ext	Wed Jun 06 23:15:54 2012 +0300
@@ -187,6 +187,9 @@
     Open=see %f 2>/dev/null &
     View=%view{ascii} catdoc -w %f
 
+regex/\.[hH][tT][mM][lL]?$
+    Open=see %f 2>/dev/null &
+
 regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
     Include=msword
 type/^Microsoft\ Word
diff -r f5363ac2e581 -r 0625f9c65913 .fvwm/config
--- a/.fvwm/config	Thu May 31 23:50:19 2012 +0300
+++ b/.fvwm/config	Wed Jun 06 23:15:54 2012 +0300
@@ -295,12 +295,14 @@
 # To add own menu items create proper ~/.menu/app-name file and run update-menu.
 # About this you can rean in /usr/share/doc/menu/menu.txt.gz.
 Read /etc/X11/fvwm/menudefs.hook quiet
+# Read $[FVWM_USERDIR]/menudefs.hook quiet
 
 AddToMenu MenuMy Media Title
++ HTop            Exec  exec xterm -name htop -e sudo htop
 + Emacs           Exec  exec emacs
-+ HTop            Exec  exec xterm -name htop -e sudo htop
 + Firefox         Exec  exec firefox
 + VLC             Exec  exec vlc
++ Skype           Exec  exec skype
 + Goldendict      Exec  exec goldendict
 + xkill           Exec  exec xkill
 + "Peoplenet"     Exec  exec xterm -e /usr/bin/pon
diff -r f5363ac2e581 -r 0625f9c65913 .xinitrc
--- a/.xinitrc	Thu May 31 23:50:19 2012 +0300
+++ b/.xinitrc	Wed Jun 06 23:15:54 2012 +0300
@@ -3,6 +3,10 @@
 if [[ -f ~/.bash_path ]]; then
   . ~/.bash_path
 fi
+# Load custom settings (user editable).
+if [[ -f ~/.bash_custom ]]; then
+  . ~/.bash_custom
+fi
 
 xrdb -merge ~/.Xdefaults
 # xrdb -load ~/.Xdefaults
diff -r f5363ac2e581 -r 0625f9c65913 Makefile
--- a/Makefile	Thu May 31 23:50:19 2012 +0300
+++ b/Makefile	Wed Jun 06 23:15:54 2012 +0300
@@ -93,6 +93,8 @@
 	chmod a+x ~/.xinitrc ~/.xserverrc
 	rm -f ~/.xsession
 	ln -s ~/.xinitrc ~/.xsession
+	rm -f ~/.bash_profile
+	ln -s ~/.bashrc ~/.bash_profile
 	v=`mc --version | sed 's|.*\([0-9]\+\.[0-9]\+\.[0-9]\+\)$$|\1|;q'`; \
 	vmajor=$${v%%.*}; \
 	vminor=$${v#*.}; \