From 56e6b660b5cd8bfb354f64d3f0220292da29e10d Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Thu, 13 Mar 2014 15:58:21 +0600
Subject: [PATCH] V5: various

---
 etc/X/Xmodmaprc.AuthenticAMD   |  6 ++++++
 etc/X/xbindkeysrc.AuthenticAMD | 27 ++++++++++++++-------------
 etc/shell/bash/bashrc          |  6 +++---
 etc/soft/mc/mc.ext             | 28 ++++++++++++++++------------
 4 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/etc/X/Xmodmaprc.AuthenticAMD b/etc/X/Xmodmaprc.AuthenticAMD
index af8adbe..75a2689 100644
--- a/etc/X/Xmodmaprc.AuthenticAMD
+++ b/etc/X/Xmodmaprc.AuthenticAMD
@@ -1,3 +1,9 @@
+! Настройка мультимедийных клавиш Genius KB-21
+
+keycode 121 = XF86AudioMute
+keycode 122 = XF86AudioLowerVolume
+keycode 123 = XF86AudioRaiseVolume
+
 ! Замена <Caps Lock> на <ESC>
 ! clear Lock
 ! keycode 0x42 = Escape
diff --git a/etc/X/xbindkeysrc.AuthenticAMD b/etc/X/xbindkeysrc.AuthenticAMD
index 74feac7..6b86dda 100644
--- a/etc/X/xbindkeysrc.AuthenticAMD
+++ b/etc/X/xbindkeysrc.AuthenticAMD
@@ -1,8 +1,21 @@
 # xbindkeysrc.AuthenticAMD
 #
-# Изменён: Вс 25 авг 2013 01:55:59
+# Изменён: Чт 13 мар 2014 14:16:34
 #
 
+#ACPI#{{{
+
+"amixer -q set Master 2-"
+	XF86AudioLowerVolume
+
+"amixer -q set Master 2+"
+	XF86AudioRaiseVolume
+
+"amixer -q set Master toggle"
+	XF86AudioMute
+
+#}}}
+
 #Запуск программ#{{{
 
 "xkill"
@@ -21,18 +34,6 @@
 	m:0x10 + c:107
         Mod2 + Print
 
-"serial"
-	m:0x40 + c:33
-	Mod4 + p
-
-"dmenfm"
-	m:0x40 + c:52
-	Mod4 + z
-
-"moveWindow"
-	m:0x40 + c:57
-	Mod4 + n
-
 #}}}
 
 #Управление плеером#{{{
diff --git a/etc/shell/bash/bashrc b/etc/shell/bash/bashrc
index bc09ce6..5e37e66 100755
--- a/etc/shell/bash/bashrc
+++ b/etc/shell/bash/bashrc
@@ -1,6 +1,6 @@
 #!/bin/bash ####################################################################
 #
-# Изменён: Ср 12 мар 2014 20:56:39
+# Изменён: Чт 13 мар 2014 12:47:05
 #
 ################################################################################
 
@@ -50,8 +50,8 @@ export NOCOLOR_PIPE=1
 #export CW_INVERT=1
 
 #Настройки компилятора
-export CFLAGS="-march=k8 -Os -pipe"
-export MAKEOPTS="-j 3"
+export CFLAGS="-O2 -pipe"
+# export MAKEOPTS="-j 3"
 
 if [[ $OS != Windows* ]]; then
 	#Версия gcc
diff --git a/etc/soft/mc/mc.ext b/etc/soft/mc/mc.ext
index 9e84aaf..9a4afa7 100644
--- a/etc/soft/mc/mc.ext
+++ b/etc/soft/mc/mc.ext
@@ -426,7 +426,7 @@ shell/i/.svg
 	Open=/usr/libexec/mc/ext.d/image.sh open svg
 
 include/image
-	Open=geeqie
+	Open=/usr/libexec/mc/ext.d/image.sh open ALL_FORMATS
 	View=%view{ascii} /usr/libexec/mc/ext.d/image.sh view ALL_FORMATS
 
 
@@ -516,7 +516,7 @@ type/WebM
     Include=video
 
 include/video
-	Open=vlc %p
+	Open=/usr/libexec/mc/ext.d/video.sh open ALL_FORMATS
 	View=%view{ascii} /usr/libexec/mc/ext.d/video.sh view ALL_FORMATS
 
 
@@ -524,19 +524,13 @@ include/video
 
 # Postscript
 type/^PostScript
-	Include=zathura
+	Open=/usr/libexec/mc/ext.d/doc.sh open ps
+	View=%view{ascii} /usr/libexec/mc/ext.d/doc.sh view ps
 
 # PDF
 type/^PDF
-	Include=zathura
-
-# DjVu
-regex/i/\.djvu?$
-	Include=zathura
-
-include/zathura
-	Open=nohup zathura -c %var{SHELLRC:~/.shellrc}/etc/soft/zathura/ -d %var{SHELLRC:~/.shellrc}/etc/soft/zathura/ -p %var{SHELLRC:~/.shellrc}/etc/soft/zathura/plugins %p &>/dev/null &
-	View=%view{ascii} /usr/libexec/mc/ext.d/doc.sh view djvu
+	Open=/usr/libexec/mc/ext.d/doc.sh open pdf
+	View=%view{ascii} /usr/libexec/mc/ext.d/doc.sh view pdf
 
 # html
 regex/i/\.html?$
@@ -601,6 +595,11 @@ shell/i/.dvi
 shell/i/.tex
 	Include=editor
 
+# DjVu
+regex/i/\.djvu?$
+	Open=/usr/libexec/mc/ext.d/doc.sh open djvu
+	View=%view{ascii} /usr/libexec/mc/ext.d/doc.sh view djvu
+
 # Comic Books
 regex/i/\.cb[zr]$
 	Open=/usr/libexec/mc/ext.d/doc.sh open comic
@@ -686,6 +685,11 @@ type/i/^zip\ archive
 	Open=%cd %p/uzip://
 	View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view zip
 
+# jar(zip)
+type/i/^Java\ Jar\ file\ data\ \(zip\)
+	Open=%cd %p/uzip://
+	View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view zip
+
 # zoo
 shell/i/.zoo
 	Open=%cd %p/uzoo://