X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/4666dc1fa2364cb7628ef70d17f40b29189dbacf..refs/heads/master:/awesome/rules.lua?ds=sidebyside

diff --git a/awesome/rules.lua b/awesome/rules.lua
index 3fe2c9f..76d59e7 100644
--- a/awesome/rules.lua
+++ b/awesome/rules.lua
@@ -1,16 +1,19 @@
 local utils = require("utils")
 
-if utils.host == "shada"   then mediatag = tags[2][3] end
-if utils.host == "chronos" then mediatag = tags[1][4] end
+-- {{{ Rules
+local sc = screen.count()
 
-if utils.host == "shada"   then wwwtag = tags[2][1] end
-if utils.host == "chronos" then wwwtag = tags[1][2] end
+if sc == 1 then mediatag = tags[1][9] end
+if sc == 2 then mediatag = tags[2][3] end
 
-if utils.host == "shada"   then imtag = tags[2][2] end
-if utils.host == "chronos" then imtag = tags[1][3] end
+if sc == 1 then wwwtag = tags[1][2] end
+if sc == 2 then wwwtag = tags[2][1] end
 
-if utils.host == "shada"   then socialtag = tags[2][4] end
-if utils.host == "chronos" then socialtag = tags[1][5] end
+if sc == 1 then imtag = tags[1][3] end
+if sc == 2 then imtag = tags[2][2] end
+
+if sc == 1 then socialtag = tags[1][4] end
+if sc == 2 then socialtag = tags[2][4] end
 
 awful.rules.rules = {
     -- All clients will match this rule.
@@ -18,39 +21,37 @@ awful.rules.rules = {
       properties = { border_width = beautiful.border_width,
                      border_color = beautiful.border_normal,
                      focus = awful.client.focus.filter,
+                     raise = true,
                      keys = clientkeys,
-                     buttons = clientbuttons } },
-    { rule = { class = "mpv" },
-      properties = { floating = true } },
-    { rule = { class = "MPlayer" },
-      properties = { floating = true } },
-    { rule = { class = "pinentry" },
+                     buttons = clientbuttons,
+                     screen = awful.screen.preferred,
+                     placement = awful.placement.no_overlap+awful.placement.no_offscreen } },
+    { rule_any = {
+        class = {
+            "MPlayer",
+            "pinentry",
+            "gimp",
+        },
+        instance = {
+            "qemu",
+        } },
       properties = { floating = true } },
-    { rule = { class = "gimp" },
-      properties = { floating = true } },
-    { rule = { class = "Kmix" },
+    { rule = { class = "mpv" },
+      properties = { border_width = 0,
+                     floating = true }},
+    { rule = { class = terminal_class, instance = "pulsemixer" },
       properties = { floating = true,
                      skip_taskbar = true,
                      ontop = true,
-                     x = 1920 - 310, y = mywibox[mouse.screen].height,
-                     width = 100, height = 100 } },
-    { rule = { class = "URxvt", instance = "mutt" },
-      properties = { tag = wwwtag,
-                     function (c) awful.client.setslave(c) end } },
-    { rule = { class = "Dwb", type = "normal", instance = "dwb-default" },
-      properties = { tag = wwwtag,
-                     function (c) awful.client.setmaster(c) end } },
-    { rule = { class = "Dwb", type = "normal", instance = "dwb-social" },
-      properties = { tag = socialtag } },
-    { rule = { class = "URxvt", instance = "ncmpcpp" },
-      properties = { tag = mediatag,
-                     function (c) awful.client.setmaster(c) end } },
-    { rule = { class = "URxvt", instance = "mopidy" },
-      properties = { tag = mediatag,
-                     function (c) awful.client.setmaster(c) end } },
-    { rule = { class = "URxvt", instance = "weechat" },
-      properties = { tag = imtag,
-                     function (c) awful.client.setmaster(c) end } },
-    { rule = { class = "Steam" },
+                     placement = awful.placement.top_right,
+                     function (c)
+                         s = awful.screen.focused()
+                         c:connect_signal("unfocus", function (c) c:kill() end)
+                     end } },
+    { rule = { class = "Wine"},
+      properties = { floating = true } },
+    { rule = { class = terminal_class },
+      properties = { opacity = 0.95 } },
+    { rule_any = { class = { "Steam", "steam" } },
       properties = { tag = tags[1][9] } },
 }