From f2ee4a3df3155a423ecaf2d47a352ce2d5af886b Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Sun, 30 Aug 2015 12:04:51 +0100
Subject: laptop: battery meter, diff. keys

---
 components/bindings/Extra-Keybindings |  8 ++++----
 recipes/Dakkar                        | 12 +++++++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/components/bindings/Extra-Keybindings b/components/bindings/Extra-Keybindings
index f8ec431..d2c5ce4 100644
--- a/components/bindings/Extra-Keybindings
+++ b/components/bindings/Extra-Keybindings
@@ -5,9 +5,9 @@ Mouse 3 RI $[Mod1] Exec exec $[infostore.DefaultTerminal] -title local-screen -e
 
 Mouse 3 RI $[Mod2] Popup /Screens
 
-Key XF86Launch3 A N Exec emacsclient -nc
-Key XF86Launch4 A N Exec firefox
-Key XF86Launch4 A S Exec firefox --private-window
+Key F1 A $[Mod1] Exec emacsclient -nc
+Key F2 A $[Mod1] Exec firefox
+Key F2 A ${Mod1]S Exec firefox --private-window
 Key XF86MonBrightnessUp A N Exec xgamma -gamma 1.5
 Key XF86MonBrightnessDown A N Exec $(grep xgamma ~/.xinitrc)
-Key XF86MonBrightnessDown A $[Mod1] Exec xscreensaver-command -lock
+Key Print A $[Mod1] Exec xscreensaver-command -lock
diff --git a/recipes/Dakkar b/recipes/Dakkar
index b541e17..24e9437 100644
--- a/recipes/Dakkar
+++ b/recipes/Dakkar
@@ -58,7 +58,7 @@ AddToFunc FvwmPagerWindow
 
 FvwmPagerWindow
 
-FvwmTrayerPanel request pixel "24" top right "248" "4"
+FvwmTrayerPanel request pixel "24" top right "420" "4"
 
 All (FvwmButtons-Panel) Close
 DestroyModuleConfig FvwmButtons-Panel: *
@@ -85,6 +85,8 @@ Action (Mouse 3) Window-List-Icons "$[MenuPosition_SW]")
 *FvwmButtons-Panel: (1x1, Size 22 22, Icon "22x22/fvwm-crystal/applications.png", \
 	Action (Mouse 1) Menu /Applications $[MenuPosition_SW])
 
+*FvwmButtons-Panel: (7x1, Size 165 24, Swallow (Close, Respawn) "dakkar-battery" `Exec /home/dakkar/src/battery/battery`)
+
 *FvwmButtons-Panel: (7x1, Size 154 24, \
 Swallow (Close, Respawn, FvwmModule) "FvwmScript-Clock" 'Script components/scripts/FvwmScript-Clock', \
 Action (Mouse 3) SendToModule *FvwmScript-Clock SendString 1 1 str)
@@ -102,3 +104,11 @@ AddToFunc StartFunction
 + I All (gkrellm) Move -0 -0
 + I Style mwatch FixedPosition
 + I Style gkrellm FixedPosition
+
+DestroyMenu /Keymap
+AddToMenu /Keymap
++ 'Dvorak' Exec /home/dakkar/bin/kbd-dakkar
++ 'QWERTY' Exec /home/dakkar/bin/kbd-qw
+
+AddToMenu /FVWM-Crystal
++ 'Keymap' Popup /Keymap
-- 
cgit v1.2.3