X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/d86e7b0c1a72975b5a846f9329f53b0c5e238049..8b4070b51e98191e73b51fc28c42b8a10e0d92dc:/awesome/tags.lua

diff --git a/awesome/tags.lua b/awesome/tags.lua
index ebfdb7d..b3216ee 100644
--- a/awesome/tags.lua
+++ b/awesome/tags.lua
@@ -9,55 +9,57 @@ layouts =
     awful.layout.suit.tile.top,
     awful.layout.suit.fair,
     awful.layout.suit.fair.horizontal,
-    awful.layout.suit.spiral,
-    awful.layout.suit.spiral.dwindle,
+    --awful.layout.suit.spiral,
+    --awful.layout.suit.spiral.dwindle,
     awful.layout.suit.max,
     awful.layout.suit.max.fullscreen,
-    awful.layout.suit.magnifier
+    --awful.layout.suit.magnifier
 }
 -- }}}
 
 -- {{{ Tags
 local mytags = {}
+local path = beautiful.path
+local icon_only = true
 -- {{{ single screen
 mytags[1] = {}
 mytags[1][1] = {
-    { name = "1-test",  layout = awful.layout.suit.magnifier,           wmfact=0.87 },
-    { name = "2",       layout = awful.layout.suit.tile.left,           wmfact=0.6 },
-    { name = "3",       layout = awful.layout.suit.tile.left,           wmfact=0.6 },
-    { name = "4",       layout = awful.layout.suit.tile.left,           wmfact=0.6 },
-    { name = "5",       layout = awful.layout.suit.tile,                wmfact=0.3 },
-    { name = "6",       layout = awful.layout.suit.magnifier,           wmfact=0.88 },
-    { name = "7",       layout = awful.layout.suit.tile.bottom,         wmfact=0.84 },
-    { name = "8",       layout = awful.layout.suit.max,                 wmfact=0.7 },
-    { name = "9",       layout = awful.layout.suit.max,                 wmfact=0.5 },
+    { name = "α", layout = awful.layout.suit.tile.left,   mwfact=0.50 },
+    { name = "ω", layout = awful.layout.suit.tile,        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.50 },
+    { name = "κ", layout = awful.layout.suit.floating,    mwfact=0.50 },
 }
 -- }}}
 
 -- {{{ Dual screen
 mytags[2] = {}
 mytags[2][1] = {
-    { name = "1-test",  layout = awful.layout.suit.magnifier,           wmfact=0.87 },
-    { name = "2",       layout = awful.layout.suit.tile.left,           wmfact=0.6 },
-    { name = "3",       layout = awful.layout.suit.tile.left,           wmfact=0.6 },
-    { name = "4",       layout = awful.layout.suit.tile.left,           wmfact=0.6 },
-    { name = "5",       layout = awful.layout.suit.tile,                wmfact=0.3 },
-    { name = "6",       layout = awful.layout.suit.magnifier,           wmfact=0.88 },
-    { name = "7",       layout = awful.layout.suit.tile.bottom,         wmfact=0.84 },
-    { name = "8",       layout = awful.layout.suit.max,                 wmfact=0.7 },
-    { name = "9",       layout = awful.layout.suit.max,                 wmfact=0.5 },
+    { name = "1", layout = awful.layout.suit.tile.left,   mwfact=0.50, icon = path.."/cutiemarks/pinkie_pie.png"},
+    { name = "2", layout = awful.layout.suit.tile.left,   mwfact=0.60, icon = path.."/cutiemarks/rainbow_dash.png"},
+    { name = "3", layout = awful.layout.suit.tile.left,   mwfact=0.60, icon = path.."/cutiemarks/twilight_sparkle.png"},
+    { name = "4", layout = awful.layout.suit.tile.left,   mwfact=0.60, icon = path.."/cutiemarks/doctor_whooves.png"},
+    { name = "5", layout = awful.layout.suit.tile.left,   mwfact=0.30, icon = path.."/cutiemarks/derpy_hooves.png"},
+    { name = "6", layout = awful.layout.suit.tile.left,   mwfact=0.70, icon = path.."/cutiemarks/trixie.png"},
+    { name = "7", layout = awful.layout.suit.tile.left,   mwfact=0.88, icon = path.."/cutiemarks/soarin.png"},
+    { name = "8", layout = awful.layout.suit.tile.bottom, mwfact=0.84, icon = path.."/cutiemarks/princess_celestia.png"},
+    { name = "9", layout = awful.layout.suit.floating,    mwfact=0.50, icon = path.."/cutiemarks/princess_luna.png"},
 }
 
 mytags[2][2] = {
-    { name = "1-www",   layout = awful.layout.suit.max,                 wmfact=0.5 },
-    { name = "2-im",    layout = awful.layout.suit.max,                 wmfact=0.5 },
-    { name = "3-music", layout = awful.layout.suit.tile.bottom,         wmfact=0.1 },
-    { name = "4",       layout = awful.layout.suit.tile.bottom,         wmfact=0.9 },
-    { name = "5",       layout = awful.layout.suit.max,                 wmfact=0.5 },
-    { name = "6",       layout = awful.layout.suit.floating,            wmfact=0.5 },
-    { name = "7",       layout = awful.layout.suit.floating,            wmfact=0.5 },
-    { name = "8",       layout = awful.layout.suit.floating,            wmfact=0.5 },
-    { name = "9",       layout = awful.layout.suit.floating,            wmfact=0.5 },
+    { name = "1", layout = awful.layout.suit.tile,        mwfact=0.60, icon = path.."/cutiemarks/snails.png"},
+    { name = "2", layout = awful.layout.suit.max,         mwfact=0.88, icon = path.."/cutiemarks/snips.png"},
+    { name = "3", layout = awful.layout.suit.tile,        mwfact=0.50, icon = path.."/cutiemarks/lyra_heartstrings.png"},
+    { name = "4", layout = awful.layout.suit.tile,        mwfact=0.90, icon = path.."/cutiemarks/rarity.png"},
+    { name = "5", layout = awful.layout.suit.tile,        mwfact=0.50, icon = path.."/cutiemarks/fluttershy.png"},
+    { name = "6", layout = awful.layout.suit.tile,        mwfact=0.50, icon = path.."/cutiemarks/applejack.png"},
+    { name = "7", layout = awful.layout.suit.tile,        mwfact=0.50, icon = path.."/cutiemarks/snowflake.png"},
+    { name = "8", layout = awful.layout.suit.tile,        mwfact=0.50, icon = path.."/cutiemarks/thunderlane.png"},
+    { name = "9", layout = awful.layout.suit.max,         mwfact=0.50, icon = path.."/cutiemarks/bon_bon.png"},
 }
 -- }}}
 
@@ -65,18 +67,15 @@ tags = {}
 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 })
+    for i,p in ipairs(mytags[sc][s]) do
+        local props = {}
+        props.screen = s
+        for k,v in pairs(p) do
+            props[k] = v
+            props['icon_only'] = icon_only
+        end
+        tags[s][i] = awful.tag.add(p.name, props)
     end
     tags[s][1].selected = true
 end
---if screen.count() == 2 then
---    for s = 1, screen.count() do
---        tags[s] = {}
---        for i,v in ipairs(mytags[s]) do
---            tags[s][i] = awful.tag.add(v.name, { layout = v.layout, screen = s })
---        end 
---        tags[s][1].selected = true
---    end
---end
 -- }}}