X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/6e7ecc3faa4d31545de17f67efa28b534cb809d9..1895071b65aa44015ad09cf5b08566bfd9a18a34:/.config/awesome/rc.lua

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index f0b2868..4a28c5e 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -383,12 +383,28 @@ clientkeys = awful.util.table.join(
     awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
     awful.key({ modkey,           }, "o",      awful.client.movetoscreen                        ),
     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
+            -- b = c.maximized_horizontal + c.maximized_vertical * 2
+            -- b = (b + 1) % 4
+            -- c.maximized_horizontal = b & 1
+            -- c.maximized_vertical = (b & 2) >>1
         end)
 )
 
@@ -451,7 +467,9 @@ globalkeys = awful.util.table.join(globalkeys,
   awful.key({ cmdmodkey }, "space", function () awful.util.spawn("nyxmms2 toggle") end),
   awful.key({ cmdmodkey }, "backslash", function ()
     local f = io.popen('nyxmms2 current', 'r')
-    naughty.notify({ title = "Now playing", text = string.sub(f:read(), 10), timeout = 5 })
+    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 ()
@@ -467,13 +485,13 @@ globalkeys = awful.util.table.join(globalkeys,
   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 }, "y", function () awful.util.spawn(terminal .. " -e python") end),
-  awful.key({ cmdmodkey }, "c", function () awful.util.spawn(terminal .. " -e wyrd") end),
+  awful.key({ cmdmodkey }, "c", function () awful.util.spawn("icedove") end),
   awful.key({ cmdmodkey }, "r", function () mypromptbox[mouse.screen]:run() 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 ssh -Snone -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 }, "i", function () awful.util.spawn(terminal .. " -title irc -name irc -e 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)
 )
@@ -499,10 +517,10 @@ awful.rules.rules = {
       properties = { floating = false, tag = tags[screen.count()][screen.count() == 1 and 2 or 1], switchtotag = true } },
     { rule = { class = "Iceweasel", instance = "Navigator" },
       properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][9], switchtotag = false, floating = false } },
+    { rule = { class = "Icedove", instance = "Mail" },
+      properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][8], switchtotag = false, floating = false } },
 --    { rule = { class = "Iceweasel", instance = "Dialog" },
 --      properties = { floating = true } },
-    { rule = { class = "Jpilot", instance = "jpilot" },
-      properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][8], switchtotag = true, floating = false } },
    -- { rule = { name = "OpenOffice.org" },
   --    properties = { switchtotag = true, floating = true, maximized_vertical = true, maximized_horizontal = true, callback = awful.placement.no_offscreen } },
  --   { rule = { name = "Okular" },