X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/de9a9ae0e351f6f058065d0b76da2a443c89d48f..dbb4bef242959221f958df1080e0613f891b972e:/.config/awesome/rc.lua

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 881af05..a240d54 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -461,7 +461,7 @@ globalkeys = awful.util.table.join(globalkeys,
   awful.key({ cmdmodkey }, "c", function () awful.util.spawn(terminal .. " -e python") 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 vera screen -dr irc") 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, "Shift" }, "x", function () awful.util.spawn("xscreensaver-command -exit") end),
   awful.key(nil, "XF86ScreenSaver", function () awful.util.spawn("xset dpms force off") end)
@@ -472,39 +472,6 @@ root.keys(globalkeys)
 -- }}}
 
 -- {{{ Rules
-awful.rules.rules = {
-    -- All clients will match this rule.
-    { rule = { },
-      properties = { border_width = beautiful.border_width,
-                     border_color = beautiful.border_normal,
-                     focus = true,
-                     keys = clientkeys,
-                     buttons = clientbuttons } },
-    { rule = { class = "MPlayer" },
-      properties = { floating = true } },
-    { rule = { class = "pinentry" },
-      properties = { floating = true } },
-    { rule = { class = "gimp" },
-      properties = { floating = true } },
-    { rule = { class = "twinkle" },
-      properties = { floating = true } },
-    { rule = { class = "Play stream" },
-      properties = { floating = true } },
-    { rule = { class = "gscan2pdf" },
-      properties = { floating = true } },
-    { rule = { class = "Gxmessage" },
-      properties = { floating = true } },
-    { rule = { class = "Add-ons" },
-      properties = { floating = true } },
-    { rule = { class = "Okular" },
-      properties = { maximised = true } },
-    { rule = { class = "Iceweasel" },
-      properties = { tag = tags[1][9], switchtotag = false } },
-    { rule = { class = "Iceweasel", role = "Dialog" },
-      properties = { floating = true } },
-    { rule = { class = "Jpilot" },
-      properties = { tag = screen.count()>1 and tags[3][2] or tags[1][8], switchtotag = false } },
-}
 awful.rules.rules = {
     -- All clients will match this rule.
     { rule = { },
@@ -517,21 +484,13 @@ awful.rules.rules = {
     { rule = { class = "URxvt" },
       properties = { floating = false } },
     { rule = { class = "URxvt", instance = "irc" },
-      properties = { tag = screen.count()>1 and tags[3][1] or tags[1][4], switchtotag = true, floating = false } },
-    { rule = { class = "Okular" },
-      properties = { tag = tags[1][7], switchtotag = true, floating = false } },
-    { rule = { class = "Evince" },
-      properties = { tag = tags[1][7], switchtotag = true, floating = false } },
-    { rule = { class = "OpenOffice.org 3.1" },
-      properties = { tag = tags[1][7], switchtotag = true, floating = false } },
-    { rule = { class = "Vinagre" },
-      properties = { tag = tags[1][6], switchtotag = false, floating = false } },
+      properties = { floating = false, tag = tags[screen.count()][screen.count() == 1 and 2 or 1], switchtotag = true } },
     { rule = { class = "Iceweasel" },
-      properties = { tag = tags[1][9], switchtotag = false, floating = false } },
+      properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][9], switchtotag = false, floating = false } },
     { rule = { class = "Iceweasel", instance = "Dialog" },
-      properties = { floating = true } },
+      properties = { floating = true }, callback = awful.placement.centered },
     { rule = { class = "Jpilot" },
-      properties = { tag = tags[1][8], switchtotag = false, floating = false } },
+      properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][8], switchtotag = true, floating = false } },
 }
 -- }}}