From e71a2a67932d3b874827f3cb72c8c327df6b3720 Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Tue, 12 Jan 2016 10:43:43 +0500
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=87=D0=B5=D0=B3=D0=BE=20=D0=BC=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etc/X/xbindkeysrc.GenuineIntel        | 22 +++++++++++++++++++++-
 etc/X/xinitrc.GenuineIntel            |  4 ++--
 etc/soft/conky/conkyrc.GenuineIntel   | 17 +++++------------
 etc/wm/musca/musca_start.GenuineIntel |  5 ++---
 4 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/etc/X/xbindkeysrc.GenuineIntel b/etc/X/xbindkeysrc.GenuineIntel
index e4dfd5c..c9a0f5e 100644
--- a/etc/X/xbindkeysrc.GenuineIntel
+++ b/etc/X/xbindkeysrc.GenuineIntel
@@ -1,6 +1,6 @@
 # xbindkeysrc.GehuineIntel
 #
-# Изменён: Вс 25 авг 2013 01:57:58
+# Изменён: Вт 12 янв 2016 10:19:05
 #
 
 #Запуск программ#{{{
@@ -15,6 +15,26 @@
 
 #}}}
 
+#Запуск программ#{{{
+
+"xkill"
+	m:0xc + c:9
+	Control+Alt + Escape
+
+"import screenshot.png"
+	m:0x0 + c:107
+        Print
+
+"xkill"
+	m:0x10c + c:9
+	Control+Alt+Mod2 + Escape
+
+"import screenshot.png"
+	m:0x10 + c:107
+        Mod2 + Print
+
+#}}}
+
 #HP ProBook{{{
 "amixer set PCM 2dB-"
 	m:0x0 + c:122
diff --git a/etc/X/xinitrc.GenuineIntel b/etc/X/xinitrc.GenuineIntel
index f5e84a2..6d2fad2 100644
--- a/etc/X/xinitrc.GenuineIntel
+++ b/etc/X/xinitrc.GenuineIntel
@@ -1,10 +1,10 @@
 display -window root $SHELLRC/etc/wm/wallpaper.$(uname -i).jpg
 
 setxkbmap -model pc104 -layout us,ru -variant ,
-setxkbmap -option -option terminate:ctrl_alt_bksp,caps:escape,grp:lwin_toggle
-xmodmap -e 'keycode 135 = Super_R'
+setxkbmap -option -option terminate:ctrl_alt_bksp,caps:escape,grp:lwin_toggle,compose:ralt
 
 xmodmap $SHELLRC/etc/X/Xmodmaprc.$(uname -i)
+xmodmap -e 'keycode 135 = Super_R'
 
 sleep 0.5
 exec musca > /dev/null
diff --git a/etc/soft/conky/conkyrc.GenuineIntel b/etc/soft/conky/conkyrc.GenuineIntel
index cf6004a..33bd559 100644
--- a/etc/soft/conky/conkyrc.GenuineIntel
+++ b/etc/soft/conky/conkyrc.GenuineIntel
@@ -10,7 +10,7 @@ own_window_transparent no
 own_window_colour black
 own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager
 double_buffer yes
-minimum_size 1366 3
+minimum_size 1277 3
 draw_shades no
 draw_outline no
 draw_borders no
@@ -40,19 +40,12 @@ TEXT
 [ ${color darkblue}${execi 2 SHELL=/bin/sh musca -c "silent show groups" \
 	| cut -f 2- -d ' ' \
 	| sed -e :a -e '$b;N;s/\n/ | /;ba' \
-	| sed 's/- //g;s/\*/⚫/g'
+	| sed 's/- //g;s/\*/+/g'
 } ]${offset 55}\
 ${alignc} \
 ${if_mounted /}$color /: ${color brown}${fs_free /}${endif}\
-${if_mounted /home/maks}$color | home: ${color brown}${fs_free /home/maks}${endif}\
-${if_mounted /media/2TB}$color | 2TB: ${color brown}${fs_free /media/2TB}${endif}\
-${if_mounted /media/MEDIA}$color | media: ${color brown}${fs_free /media/MEDIA}${endif}\
-${if_mounted /media/DATA}$color | data: ${color brown}${fs_free /media/DATA}${endif}\
-${if_mounted /media/FLASH}$color | flash: ${color brown}${fs_free /media/FLASH}${endif}\
+${if_mounted /home}$color | home: ${color brown}${fs_free /home}${endif}\
+${if_mounted /mnt/data}$color | home: ${color brown}${fs_free /mnt/data}${endif}\
 ${alignr}\
-${color darkred} ${execi 86400 dates >/dev/null && echo "[✻] " || echo ""}\
-${color brown}⚠$color ${battery_percent}%$color | \
-${color darkgreen}⏏$color: ${execi 18000 cat $SHELLRC/var/log/updates | wc -l}$color | \
-${color darkred}⌧$color: ${execi 60 cat $MD/new}$color | \
-${color darkblue}[${execi 2 SHELL=/bin/sh skb 1}]$color | \
+${color darkblue}[${execi 2 SHELL=/bin/sh ~/.shellrc/bin/skb 1}]$color | \
 ${color black}${time %H:%M} (${time %d.%m.%Y}) 
diff --git a/etc/wm/musca/musca_start.GenuineIntel b/etc/wm/musca/musca_start.GenuineIntel
index 4014b58..4bdd9c8 100644
--- a/etc/wm/musca/musca_start.GenuineIntel
+++ b/etc/wm/musca/musca_start.GenuineIntel
@@ -1,7 +1,7 @@
 [~/.musca_start]
 
 #
-# Изменён: Пн 13 янв 2014 21:36:49
+# Изменён: Вт 12 янв 2016 10:41:53
 #
 
 #Цветовая схема#{{{
@@ -19,7 +19,6 @@ set border_catchall_unfocus #882255
 name work
 hook on add pad 0 0 21 0
 add internet
-add im
 add music
 use video
 pad 0 0 0 0
@@ -34,7 +33,7 @@ refresh
 bind on Mod4+t exec urxvtc
 
 # dmenu
-bind on Mod4+x shell
+bind on Mod4+x exec ~/.shellrc/bin/dmenu/dmenu_exec
 
 # Файловый менеджер dmenu
 bind on Mod4+z exec dmenfm