X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=config%2Fawesome%2Frc.lua;h=7f42ed3d9abef4638b47772c4cfeb7fdb75f6b06;hb=8ab06d04493004fb0be02d8521628a414a818651;hp=cccf4595a11e90993e008ad3774f4222dd9dfbd0;hpb=5923f706617b966f114656c78bd60108d4ab1dde;p=~madcoder%2Fdotfiles.git

diff --git a/config/awesome/rc.lua b/config/awesome/rc.lua
index cccf459..7f42ed3 100644
--- a/config/awesome/rc.lua
+++ b/config/awesome/rc.lua
@@ -31,7 +31,7 @@ k_a  = {alt}
 k_ac = {alt, control}
 k_c  = {control}
 k_cs = {control, shift}
-k_s = {shift}
+k_s  = {shift}
 
 -- }}}
 
@@ -230,7 +230,7 @@ awful.hooks.timer.register(10, clock_update)
 -- }}}
 
 mymenubox = widget{ type = "textbox", name = "mytextbox", align = "left" }
-mysystray = widget{ type = "systray", name = "mysystray", align = "right" }
+-- mysystray = widget{ type = "systray", name = "mysystray", align = "right" }
 
 -- {{{ Statusbar
 
@@ -318,9 +318,11 @@ globalkeys = {
     key(k_ms, "Tab", function () awful.screen.focus(-1) end),
 
     -- Mod+Enter: Launch a new terminal
+    key(k_m,  "e",      function() awful.util.spawn("firefox") end),
     key(k_m,  "Return", function() awful.util.spawn(terminal) end),
-    key(k_ac, "Delete", awesome.restart),
+    key(k_ac, "r", awesome.restart),
     key(k_m, "F12", function() awful.util.spawn(lock) end),
+    key({}, "#148", function() awful.util.spawn("kcalc") end),
 
     -- Layout manipulation
     key(k_m,  "l", function () awful.tag.incmwfact(0.05) end),
@@ -347,6 +349,12 @@ globalkeys = {
                              awful.prompt.bash,
                              awful.util.getdir("cache").."/lua_commands")
     end),
+
+    key({}, "#192", function() eminent.tag.goto(1, nil, true) end),
+    key({}, "#193", function() eminent.tag.goto(2, nil, true) end),
+    key({}, "#194", function() eminent.tag.goto(3, nil, true) end),
+    key({}, "#195", function() eminent.tag.goto(4, nil, true) end),
+    key({}, "#196", function() eminent.tag.goto(5, nil, true) end),
 }
 
 -- Mod+#: Switch to tag
@@ -444,6 +452,7 @@ awful.hooks.manage.register(function (c, startup)
     -- Make certain windows floating
     local name = c.name:lower()
     if name:find('pinentry')
+    or name:find('kcalc')
     then
         c.floating = true
     end
@@ -458,22 +467,21 @@ end)
 -- (tag switch, new client, etc)
 awful.hooks.arrange.register(function (screen)
     local sel = client.focus
+
     if not sel then
         sel = awful.client.focus.history.get(screen, 0)
-        if sel then client.focus = sel end
+        if not sel then return end
+        client.focus = sel
     end
-    --[[
-    if sel then
-        local m_c = mouse.coords()
-
-        if m_c.x < sel.x - 1 or m_c.x > sel.x + sel.width + 1 or
-            m_c.y < sel.y - 1 or m_c.y > sel.y + sel.height + 1 then
-            if #m_c.buttons == 0 then
-                mouse.coords{x = sel.x + 5, y = sel.y + 5}
-            end
-        end
+
+    local o = mouse.object_under_pointer()
+    if not o or (type(o) == "client" and o ~= sel) then
+        local g = sel:geometry()
+
+        mouse.coords { x = g.x + 5, y = g.y + 5 }
     end
-    ]]--
 end)
 
 -- }}}
+
+awful.util.spawn("xkbcomp -w 0 -R/usr/share/X11/xkb ~/.Xkeyboard :0")