]> git.madduck.net Git - etc/awesome.git/blobdiff - .config/awesome/rc.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

volume keys now do pulseaudio
[etc/awesome.git] / .config / awesome / rc.lua
index 5eadc2dbb7569ceaa3a23c7fe4a78eb52992940b..a56aab031b0987494830f5b0bea0d79481eb9e89 100644 (file)
@@ -7,7 +7,12 @@ require("beautiful")
 -- Notification library
 require("naughty")
 
-require("vicious")
+--require("vicious")
+
+require("obvious.battery")
+require("obvious.clock")
+
+--require("bashets.bashets")
 
 -- Load Debian menu entries
 require("debian.menu")
@@ -108,8 +113,8 @@ tags.settings = {
     { name = "2", layout = layouts[1] },
     { name = "3", layout = layouts[1] },
     { name = "4", layout = layouts[1] },
-    { name = "5", layout = layouts[5] },
-    { name = "6", layout = layouts[3] },
+    { name = "5", layout = layouts[1] },
+    { name = "6", layout = layouts[1] },
     { name = "7", layout = layouts[3] },
     { name = "8", layout = layouts[3] },
     { name = "9", layout = layouts[3] },
@@ -285,7 +290,8 @@ for s = 1, screen.count() do
         spacer,
         mytextclock,
         spacer, separator, spacer,
-        mybatterybox,
+        obvious.battery.widget,
+--        mybatterybox,
 --        batterywidget,
 --        spacer, separator, spacer,
 --        cpuwidget.widget,
@@ -313,10 +319,8 @@ globalkeys = awful.util.table.join(
     awful.key({ modkey,           }, "Left",   awful.tag.viewprev       ),
     awful.key({ modkey,           }, "Right",  awful.tag.viewnext       ),
     awful.key({ modkey,           }, "Escape", awful.tag.history.restore),
-    awful.key({ modkey, "Shift"   }, "Right", function () awful.screen.focus( 1)       end),
-    awful.key({ modkey, "Shift"   }, "Left", function () awful.screen.focus(-1)       end),
-    awful.key({ modkey, "Shift"   }, "h",   awful.tag.viewprev       ),
-    awful.key({ modkey, "Shift"   }, "l",  awful.tag.viewnext       ),
+    awful.key({ modkey, "Shift"   }, "Right", function () awful.screen.focus_relative( 1)       end),
+    awful.key({ modkey, "Shift"   }, "Left", function () awful.screen.focus_relative(-1)       end),
 
     awful.key({ modkey,           }, "k",
         function ()
@@ -367,7 +371,13 @@ globalkeys = awful.util.table.join(
                   mypromptbox[mouse.screen].widget,
                   awful.util.eval, nil,
                   awful.util.getdir("cache") .. "/history_eval")
-              end)
+              end),
+    awful.key({ modkey }, "F1", function () awful.screen.focus(1) end),
+    awful.key({ modkey }, "F2", function () awful.screen.focus(2) end),
+    awful.key({ modkey }, "F3", function () awful.screen.focus(3) end),
+    awful.key({ modkey, "Shift" }, "F1", function () awful.client.movetoscreen(c, 1) end),
+    awful.key({ modkey, "Shift" }, "F2", function () awful.client.movetoscreen(c, 2) end),
+    awful.key({ modkey, "Shift" }, "F3", function () awful.client.movetoscreen(c, 3) end)
 )
 
 clientkeys = awful.util.table.join(
@@ -375,14 +385,27 @@ clientkeys = awful.util.table.join(
     awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end),
     awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ),
     awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
-    awful.key({ modkey,           }, "o",      awful.client.movetoscreen                        ),
+    awful.key({ modkey,           }, "o",      function (c) awful.client.movetoscreen(c, c.screen-1) end),
+    awful.key({ modkey,           }, "p",      function (c) awful.client.movetoscreen(c, c.screen+1) end),
     awful.key({ modkey, "Shift"   }, "r",      function (c) c:redraw()                       end),
-    awful.key({ modkey            }, "t",      awful.client.togglemarked                        ),
+    awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end),
     awful.key({ modkey,           }, "n",      function (c) c.minimized = not c.minimized    end),
     awful.key({ modkey,           }, "m",
         function (c)
-            c.maximized_horizontal = not c.maximized_horizontal
-            c.maximized_vertical   = not c.maximized_vertical
+            -- silly lua can't do bitwise operations
+            if not c.maximized_horizontal and not c.maximized_vertical then
+                c.maximized_horizontal = true
+                c.maximized_vertical = true
+            elseif c.maximized_horizontal and c.maximized_vertical then
+                c.maximized_horizontal = false
+                c.maximized_vertical = true
+            elseif not c.maximized_horizontal and c.maximized_vertical then
+                c.maximized_horizontal = true
+                c.maximized_vertical = false
+            elseif c.maximized_horizontal and not c.maximized_vertical then
+                c.maximized_horizontal = false
+                c.maximized_vertical = false
+            end
         end)
 )
 
@@ -434,23 +457,23 @@ cmdmodkey = "Mod3"
 
 -- xmms2 & sound
 globalkeys = awful.util.table.join(globalkeys,
-  awful.key({ cmdmodkey }, "Prior", function () awful.util.spawn("amixer set Master 2+") end),
-  awful.key({ cmdmodkey }, "Next", function () awful.util.spawn("amixer set Master 2-") end),
-  awful.key({ cmdmodkey }, "Up", function () awful.util.spawn("amixer set PCM 2+") end),
-  awful.key({ cmdmodkey }, "Down", function () awful.util.spawn("amixer set PCM 2-") end),
-  awful.key({ cmdmodkey }, "Home", function () awful.util.spawn("amixer set Mic toggle") end),
-  awful.key({ cmdmodkey }, "End", function () awful.util.spawn("amixer set Master toggle") end),
-  awful.key({ cmdmodkey }, "Left", function () awful.util.spawn("xmms2 prev") end),
-  awful.key({ cmdmodkey }, "Right", function () awful.util.spawn("xmms2 next") end),
-  awful.key({ cmdmodkey }, "space", function () awful.util.spawn("xmms2 toggleplay") end),
+  awful.key({ cmdmodkey }, "Prior", function () awful.util.spawn("pactl set-sink-volume 0 +2%") end),
+  awful.key({ cmdmodkey }, "Next", function () awful.util.spawn("pactl set-sink-volume 0 -2%") end),
+  awful.key({ cmdmodkey }, "Home", function () awful.util.spawn("pactl set-source-mute 1 toggle") end),
+  awful.key({ cmdmodkey }, "End", function () awful.util.spawn("pactl set-sink-mute 0 toggle") end),
+  awful.key({ cmdmodkey }, "Left", function () awful.util.spawn("nyxmms2 prev") end),
+  awful.key({ cmdmodkey }, "Right", function () awful.util.spawn("nyxmms2 next") end),
+  awful.key({ cmdmodkey }, "space", function () awful.util.spawn("nyxmms2 toggle") end),
   awful.key({ cmdmodkey }, "backslash", function ()
-    local f = io.popen('xmms2 current', 'r')
-    naughty.notify({ title = "Now playing", text = f:read(), timeout = 5 })
+    local f = io.popen('nyxmms2 current', 'r')
+    for s, t in string.gmatch(f:read(), '(%w+):%s+([^:]+)') do
+      naughty.notify({ title = s, text = t, timeout = 5 })
+    end
     f:close()
   end),
   awful.key({ cmdmodkey, "Shift" }, "backslash", function ()
-    local f = io.popen('xmms2 list', 'r')
-    naughty.notify({ title = "Playlist", text = f:read(), timeout = 15 })
+    local f = io.popen('nyxmms2 list', 'r')
+    naughty.notify({ title = "Playlist", text = f:read("*a"), timeout = 15 })
     f:close()
   end)
 )
@@ -460,11 +483,14 @@ globalkeys = awful.util.table.join(globalkeys,
   awful.key({ cmdmodkey }, "n", function () awful.util.spawn("sensible-browser") end),
   awful.key({ cmdmodkey }, "m", function () awful.util.spawn(terminal .. " -e mutt -f =store") end),
   awful.key({ cmdmodkey }, "t", function () awful.util.spawn(terminal) end),
-  awful.key({ cmdmodkey }, "c", function () awful.util.spawn(terminal .. " -e python") end),
+  awful.key({ cmdmodkey }, "y", function () awful.util.spawn(terminal .. " -e python") end),
+  awful.key({ cmdmodkey }, "c", function () awful.util.spawn("icedove") end),
   awful.key({ cmdmodkey }, "r", function () mypromptbox[mouse.screen]:run() end),
-  awful.key({ cmdmodkey }, "j", function () awful.util.spawn("jpilot") end),
-  awful.key({ cmdmodkey }, "i", function () awful.util.spawn(terminal .. " -title irc -name irc -e ssh -t irc screen -dr irc") end),
-  awful.key({ cmdmodkey }, "x", function () awful.util.spawn_with_shell("/sbin/start-stop-daemon --start --background --exec /usr/bin/xscreensaver; xscreensaver-command -lock") end),
+  awful.key({ cmdmodkey }, "g", function () awful.util.spawn("gscan2pdf") end),
+  awful.key({ cmdmodkey }, "o", function () awful.util.spawn("okular") end),
+  awful.key({ cmdmodkey }, "l", function () awful.util.spawn("libreoffice") end),
+  awful.key({ cmdmodkey }, "i", function () awful.util.spawn(terminal .. " -title irc -name irc -e env MOSH_TITLE_NOPREFIX=true mosh -- irc screen -dr irc") end),
+  awful.key({ cmdmodkey }, "x", function () awful.util.spawn_with_shell("/sbin/start-stop-daemon --start --background --exec /usr/bin/xscreensaver -- -no-capture-stderr -log ~/.tmp/xscreensaver.log; xscreensaver-command -lock") end),
   awful.key({ cmdmodkey, "Shift" }, "x", function () awful.util.spawn("xscreensaver-command -exit") end),
   awful.key(nil, "XF86ScreenSaver", function () awful.util.spawn("xset dpms force off") end)
 )
@@ -482,17 +508,17 @@ awful.rules.rules = {
                      focus = true,
                      floating = true,
                      keys = clientkeys,
-                     buttons = clientbuttons } },
+                     buttons = clientbuttons },
+      callback = awful.placement.centered
+    },
     { rule = { class = "URxvt" },
       properties = { floating = false } },
     { rule = { class = "URxvt", instance = "irc" },
       properties = { floating = false, tag = tags[screen.count()][screen.count() == 1 and 2 or 1], switchtotag = true } },
-    { rule = { class = "Iceweasel" },
+    { rule = { class = "Iceweasel", instance = "Navigator" },
       properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][9], switchtotag = false, floating = false } },
-    { rule = { class = "Iceweasel", instance = "Dialog" },
-      properties = { floating = true }, callback = awful.placement.centered },
-    { rule = { class = "Jpilot" },
-      properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][8], switchtotag = true, floating = false } },
+    { rule = { class = "Icedove", instance = "Mail" },
+      properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][8], switchtotag = false, floating = false } },
 }
 -- }}}
 
@@ -523,11 +549,24 @@ client.add_signal("manage", function (c, startup)
             awful.placement.no_offscreen(c)
         end
     end
+    c.size_hints_honor = false
 end)
 
 client.add_signal("focus", function(c) c.border_color = beautiful.border_focus end)
 client.add_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 
+function clear_urgency_flag(c)
+    print("property::urgent received for client: ", c)
+    io.flush ()
+--    if c.urgent then
+--        c.urgent = false
+--    end
+end
+
+client.add_signal("new", function (c)
+  c:add_signal("property::urgent", clear_urgency_flag)
+end)
+
 -- Hook called every sixty seconds
 function hook_battery()
     mybatterybox.text = " " .. get_acpibatt() .. " "
@@ -571,26 +610,10 @@ function get_acpibatt()
       return '';
     end
 end
-t = timer({ timeout = 20 })
-t:add_signal('timeout', hook_battery)
-t:start()
-hook_battery()
+--t = timer({ timeout = 20 })
+--t:add_signal('timeout', hook_battery)
+--t:start()
+--hook_battery()
+--bashets.register_lua(mybatterybox, get_acpibatt, '%1', 30)
+--bashets.start()
 -- }}}
-
---{{{ batt hook
-local function get_bat()
-  local a = io.open("/sys/class/power_supply/BAT1/charge_full")
-  for line in a:lines() do
-    full = line
-  end
-  a:close()
-  local b = io.open("/sys/class/power_supply/BAT1/charge_now")
-  for line in b:lines() do
-    now = line
-  end
-  b:close()
-  batt=math.floor(now*100/full)
-  batterywidget:bar_data_add("bat",batt )
-end
--- awful.hooks.timer.register(5, get_bat)
---}}}