awesome: cleanup some unused stuff

[dotfiles.git] / awesome / rules.lua

diff --git a/awesome/rules.lua b/awesome/rules.lua
index 3696096210f42d24d86b01fed0075d5181d04dc4..e69406562341d4a03b255c1fe13bace7bbdf06dc 100644 (file)
--- a/awesome/rules.lua
+++ b/awesome/rules.lua
@@ -1,17 +1,19 @@
 local utils = require("utils")
 
 -- {{{ Rules
 local utils = require("utils")
 
 -- {{{ Rules

-if utils.host == "shada"   then mediatag = tags[2][3] end
-if utils.host == "chronos" then mediatag = tags[1][4] end
+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.
 
 awful.rules.rules = {
     -- All clients will match this rule.


@@ -19,37 +21,41 @@ awful.rules.rules = {
       properties = { border_width = beautiful.border_width,
                      border_color = beautiful.border_normal,
                      focus = awful.client.focus.filter,
       properties = { border_width = beautiful.border_width,
                      border_color = beautiful.border_normal,
                      focus = awful.client.focus.filter,

+                     raise = true,

                      keys = clientkeys,
                      keys = clientkeys,

-                     buttons = clientbuttons } },
-    { rule = { class = "mpv" },
-      properties = { floating = true } },
-    { rule = { class = "MPlayer" },
-      properties = { floating = true } },
-    { rule = { class = "pinentry" },
-      properties = { floating = true } },
-    { rule = { class = "gimp" },
+                     buttons = clientbuttons,
+                     screen = awful.screen.preferred,
+                     placement = awful.placement.no_overlap+awful.placement.no_offscreen } },
+    { rule_any = {
+        class = {
+            "MPlayer",
+            "pinentry",
+            "mpv",
+            "gimp",
+        } },

       properties = { floating = true } },
       properties = { floating = true } },

-    { rule = { class = "Kmix" },
+    { rule = { class = terminal_class, instance = "pulsemixer" },

       properties = { floating = true,
                      skip_taskbar = true,
                      ontop = true,
       properties = { floating = true,
                      skip_taskbar = true,
                      ontop = true,

-                     x = 1920 - 310, y = mywibox[mouse.screen].height,
-                     height = 100, width = 100 } },
-    { rule = { class = "URxvt", instance = "mutt" },
+                     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.8 } },
+    { rule = { class = terminal_class, instance = "mutt" },

       properties = { tag = wwwtag,
                      function (c) awful.client.setslave(c) end } },
       properties = { tag = wwwtag,
                      function (c) awful.client.setslave(c) end } },

-    { rule = { class = "Dwb", type = "normal", instance = "dwb" },
-      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" },
+    { rule = { class = terminal_class, instance = "ncmpcpp" },

       properties = { tag = mediatag,
                      function (c) awful.client.setmaster(c) end } },
       properties = { tag = mediatag,
                      function (c) awful.client.setmaster(c) end } },

-    { rule = { class = "URxvt", instance = "weechat" },
+    { rule = { class = terminal_class, instance = "weechat" },

       properties = { tag = imtag,
                      function (c) awful.client.setmaster(c) end } },
       properties = { tag = imtag,
                      function (c) awful.client.setmaster(c) end } },

-    { rule = { class = "Steam" },
+    { rule_any = { class = { "Steam", "steam" } },

       properties = { tag = tags[1][9] } },
 }
       properties = { tag = tags[1][9] } },
 }

--- }}}