X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/bdbe521d8157a81bdf1af88bd31223c1d8caf9f1..9bce712f191f4cb57ea3d827241f6462cab66cfb:/.config/awesome/rc.lua

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index f844e8e..ee17164 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -523,6 +523,13 @@ root.keys(globalkeys)
 
 -- {{{ Rules
 -- Rules to apply to new clients (through the "manage" signal).
+
+local function move_to_tag(s, t)
+    return function(c)
+        c:move_to_tag(tags[s][t])
+    end
+end
+
 awful.rules.rules = {
     -- All clients will match this rule.
     { rule = { },
@@ -532,10 +539,10 @@ awful.rules.rules = {
                      raise = true,
                      keys = clientkeys,
                      buttons = clientbuttons,
+                     screen = awful.screen.preferred,
                      placement = awful.placement.no_overlap+awful.placement.no_offscreen,
-                     -- https://github.com/awesomeWM/awesome/issues/1091#issuecomment-246933520
-                     screen = function (c) return awesome.startup and c.screen or awful.screen.focused() end,
-     }
+                     floating = true
+                 },
     },
 
     -- Add titlebars to normal clients and dialogs
@@ -553,47 +560,40 @@ awful.rules.rules = {
                } },
     { rule = { class = "URxvt", instance = "irc" },
                properties = {
---                   screen = screen.count(),
---                   tag = screen.count() == 1 and "2" or "1"
+                   switchtotag = true
                },
-               callback = function(c) c:move_to_tag(tags[1][2]) end
+               callback = move_to_tag(screen.count(), screen.count() == 1 and 2 or 1)
            },
-    { rule = { class = "Firefox" },
+    { rule = { class = "Firefox", instance = "Navigator" },
                properties = {
                    floating = false,
---                   screen = screen.count(),
---                   tag = screen.count() == 1 and "2" or "1"
                },
-               callback = function(c) c:move_to_tag(tags[1][9]) end
+               callback = move_to_tag(screen.count() == 1 and 1 or 2, 9)
            },
-    { rule = { class = "Icedove" },
+    { rule = { class = "Icedove", instance = "Mail" },
                properties = {
                    floating = false,
---                   screen = screen.count(),
---                   tag = screen.count() == 1 and "2" or "1"
                },
-               callback = function(c) c:move_to_tag(tags[1][8]) end
+               callback = move_to_tag(screen.count() == 1 and 1 or 2, 8)
            },
-    { rule = { class = "chromium" },
+    { rule = { class = "chromium", instance = "chromium" },
                properties = {
                    floating = false,
---                   screen = screen.count(),
---                   tag = screen.count() == 1 and "2" or "1"
                },
-               callback = function(c) c:move_to_tag(tags[1][9]) end
+               callback = move_to_tag(screen.count() == 1 and 1 or 2, 9)
            },
     { rule = { class = "Gscan2pdf" },
                properties = {
                    screen = 1,
                    tag = "5"
                },
---               callback = function(c) c:move_to_tag(tags[1][9]) end
+               callback = move_to_tag(1, 5)
            },
     { rule = { name = "gscan2pdf .*" },
                properties = {
                    floating = false,
                },
---               callback = function(c) c:move_to_tag(tags[1][9]) end
+               callback = move_to_tag(1, 5)
            },
 }
 -- }}}