too many pinkie pies

diff --git a/awesome/tags.lua b/awesome/tags.lua
index ab48bcf80a8b6a35cabeae625ffb32a81a44ec5c..ceb4e0f89ec16905253bcb23cb44f145b78fa950 100644 (file)
--- a/awesome/tags.lua
+++ b/awesome/tags.lua
@@ -19,45 +19,46 @@ layouts =
 
 -- {{{ Tags
 local mytags = {}
 
 -- {{{ Tags
 local mytags = {}

+local path = beautiful.path

 -- {{{ single screen
 mytags[1] = {}
 mytags[1][1] = {
 -- {{{ single screen
 mytags[1] = {}
 mytags[1][1] = {

-    { name = "α", layout = awful.layout.suit.tile.left,           mwfact=0.5  },
-    { name = "ω", layout = awful.layout.suit.tile.left,           mwfact=0.6  },
-    { name = "ι", layout = awful.layout.suit.tile,                mwfact=0.88 },
-    { name = "δ", layout = awful.layout.suit.tile.left,           mwfact=0.6  },
-    { name = "ε", layout = awful.layout.suit.tile,                mwfact=0.3  },
-    { name = "ζ", layout = awful.layout.suit.tile,                mwfact=0.88 },
-    { name = "θ", layout = awful.layout.suit.tile.bottom,         mwfact=0.84 },
-    { name = "ι", layout = awful.layout.suit.max,                 mwfact=0.7  },
-    { name = "κ", layout = awful.layout.suit.max,                 mwfact=0.5  },
+    { name = "α", layout = awful.layout.suit.tile.left,   mwfact=0.50 },
+    { name = "ω", layout = awful.layout.suit.tile.left,   mwfact=0.60 },
+    { name = "ι", layout = awful.layout.suit.tile,        mwfact=0.88 },
+    { name = "δ", layout = awful.layout.suit.tile.left,   mwfact=0.60 },
+    { name = "ε", layout = awful.layout.suit.tile,        mwfact=0.30 },
+    { name = "ζ", layout = awful.layout.suit.tile,        mwfact=0.88 },
+    { name = "θ", layout = awful.layout.suit.tile.bottom, mwfact=0.84 },
+    { name = "ι", layout = awful.layout.suit.max,         mwfact=0.70 },
+    { name = "κ", layout = awful.layout.suit.max,         mwfact=0.50 },

 }
 -- }}}
 
 -- {{{ Dual screen
 mytags[2] = {}
 mytags[2][1] = {
 }
 -- }}}
 
 -- {{{ Dual screen
 mytags[2] = {}
 mytags[2][1] = {

-    { name = "α", layout = awful.layout.suit.tile,                mwfact=0.87 },
-    { name = "β", layout = awful.layout.suit.tile.left,           mwfact=0.6  },
-    { name = "γ", layout = awful.layout.suit.tile.left,           mwfact=0.6  },
-    { name = "δ", layout = awful.layout.suit.tile.left,           mwfact=0.6  },
-    { name = "ε", layout = awful.layout.suit.tile,                mwfact=0.3  },
-    { name = "ζ", layout = awful.layout.suit.tile,                mwfact=0.88 },
-    { name = "θ", layout = awful.layout.suit.tile.bottom,         mwfact=0.84 },
-    { name = "ι", layout = awful.layout.suit.max,                 mwfact=0.7  },
-    { name = "σ", layout = awful.layout.suit.floating,            mwfact=0.5  },
+    { name = "α", layout = awful.layout.suit.tile,        mwfact=0.50, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },
+    { name = "β", layout = awful.layout.suit.tile.left,   mwfact=0.60, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },
+    { name = "γ", layout = awful.layout.suit.tile.left,   mwfact=0.60, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },
+    { name = "δ", layout = awful.layout.suit.tile.left,   mwfact=0.60, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },
+    { name = "ε", layout = awful.layout.suit.tile,        mwfact=0.30, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },
+    { name = "ζ", layout = awful.layout.suit.tile,        mwfact=0.88, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },
+    { name = "θ", layout = awful.layout.suit.tile.bottom, mwfact=0.84, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },
+    { name = "ι", layout = awful.layout.suit.max,         mwfact=0.70, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },
+    { name = "σ", layout = awful.layout.suit.floating,    mwfact=0.50, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },

 }
 
 mytags[2][2] = {
 }
 
 mytags[2][2] = {

-    { name = "ω", layout = awful.layout.suit.tile.right,          mwfact=0.6  },
-    { name = "ι", layout = awful.layout.suit.tile,                mwfact=0.88 },
-    { name = "μ", layout = awful.layout.suit.tile.bottom,         mwfact=0.1  },
-    { name = "δ", layout = awful.layout.suit.tile.bottom,         mwfact=0.9  },
-    { name = "ε", layout = awful.layout.suit.max,                 mwfact=0.5  },
-    { name = "ζ", layout = awful.layout.suit.floating,            mwfact=0.5  },
-    { name = "θ", layout = awful.layout.suit.floating,            mwfact=0.5  },
-    { name = "β", layout = awful.layout.suit.floating,            mwfact=0.5  },
-    { name = "κ", layout = awful.layout.suit.floating,            mwfact=0.5  },
+    { name = "ω", layout = awful.layout.suit.tile.right,  mwfact=0.60, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },
+    { name = "ι", layout = awful.layout.suit.tile,        mwfact=0.88, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },
+    { name = "μ", layout = awful.layout.suit.tile.bottom, mwfact=0.10, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },
+    { name = "δ", layout = awful.layout.suit.tile.bottom, mwfact=0.90, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },
+    { name = "ε", layout = awful.layout.suit.max,         mwfact=0.50, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },
+    { name = "ζ", layout = awful.layout.suit.floating,    mwfact=0.50, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },
+    { name = "θ", layout = awful.layout.suit.floating,    mwfact=0.50, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },
+    { name = "β", layout = awful.layout.suit.floating,    mwfact=0.50, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },
+    { name = "κ", layout = awful.layout.suit.floating,    mwfact=0.50, icon = path.."/cutiemarks/pinkie_pie.png", icon_only = true },

 }
 -- }}}
 
 }
 -- }}}
 


@@ -65,8 +66,13 @@ tags = {}
 local sc = screen.count()
 for s = 1, sc do
     tags[s] = {}
 local sc = screen.count()
 for s = 1, sc do
     tags[s] = {}

-    for i,v in ipairs(mytags[sc][s]) do
-        tags[s][i] = awful.tag.add(v.name, { layout = v.layout, screen = s, mwfact = v.mwfact })
+    for i,p in ipairs(mytags[sc][s]) do
+        local props = {}
+        props.screen = s
+        for k,v in pairs(p) do
+            props[k] = v
+        end
+        tags[s][i] = awful.tag.add(p.name, props)

     end
     tags[s][1].selected = true
 end
     end
     tags[s][1].selected = true
 end