awesome: switch to lain uselessgaps

diff --git a/awesome/rc.lua b/awesome/rc.lua
index 826b9089ba3cd4516d629f8dbd2c4fdd1d60a726..d29c6285fadb9c79105110edc22979ce4fc41a6f 100644 (file)
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -6,6 +6,7 @@ require("awful.autofocus")
 beautiful = require("beautiful")
 naughty = require("naughty")
 menubar = require("menubar")
+lain = require("lain")
 
 -- Error handling {{{1
 -- Check if awesome encountered an error during startup and fell back to

diff --git a/awesome/tags.lua b/awesome/tags.lua
index cefc22a38b00131fefe623029c5f06134e750664..d6cf2967941fc9348dca7ecbb5844b6de012df01 100644 (file)
--- a/awesome/tags.lua
+++ b/awesome/tags.lua
@@ -3,17 +3,22 @@
 layouts =
 {
     awful.layout.suit.floating,
-    awful.layout.suit.tile,
-    awful.layout.suit.tile.left,
-    awful.layout.suit.tile.bottom,
-    awful.layout.suit.tile.top,
-    awful.layout.suit.fair,
-    awful.layout.suit.fair.horizontal,
-    --awful.layout.suit.spiral,
-    --awful.layout.suit.spiral.dwindle,
+    lain.layout.uselesstile,
+    lain.layout.uselesstile.left,
+    lain.layout.uselesstile.bottom,
+    lain.layout.uselesstile.top,
+    lain.layout.uselessfair,
+    lain.layout.uselessfair.horizontal,
+    -- lain.layout.uselesspiral,
+    -- lain.layout.uselesspiral.dwindle,
     awful.layout.suit.max,
-    awful.layout.suit.max.fullscreen,
-    --awful.layout.suit.magnifier
+    -- awful.layout.suit.max.fullscreen,
+    -- awful.layout.suit.magnifier
+    -- lain.layout.termfair,
+    -- lain.layout.centerfair,
+    -- lain.layout.cascade,
+    -- lain.layout.cascadetile,
+    -- lain.layout.centerwork,
 }
 
 -- Tags {{{1
@@ -38,27 +43,27 @@ mytags[1][1] = {
 -- Dual screen {{{2
 mytags[2] = {}
 mytags[2][1] = {
-    { 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"},
+    { name = "1", layout = lain.layout.uselesstile.left,   mwfact=0.50, icon = path.."/cutiemarks/pinkie_pie.png"},
+    { name = "2", layout = lain.layout.uselesstile.left,   mwfact=0.60, icon = path.."/cutiemarks/rainbow_dash.png"},
+    { name = "3", layout = lain.layout.uselesstile.left,   mwfact=0.60, icon = path.."/cutiemarks/twilight_sparkle.png"},
+    { name = "4", layout = lain.layout.uselesstile.left,   mwfact=0.60, icon = path.."/cutiemarks/doctor_whooves.png"},
+    { name = "5", layout = lain.layout.uselesstile.left,   mwfact=0.30, icon = path.."/cutiemarks/derpy_hooves.png"},
+    { name = "6", layout = lain.layout.uselesstile.left,   mwfact=0.70, icon = path.."/cutiemarks/trixie.png"},
+    { name = "7", layout = lain.layout.uselesstile.left,   mwfact=0.88, icon = path.."/cutiemarks/soarin.png"},
+    { name = "8", layout = lain.layout.uselesstile.left,   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", 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"},
+    { name = "1", layout = lain.layout.uselesstile,        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 = lain.layout.uselesstile,        mwfact=0.50, icon = path.."/cutiemarks/lyra_heartstrings.png"},
+    { name = "4", layout = lain.layout.uselesstile.left,   mwfact=0.80, icon = path.."/cutiemarks/rarity.png"},
+    { name = "5", layout = lain.layout.uselesstile,        mwfact=0.50, icon = path.."/cutiemarks/fluttershy.png"},
+    { name = "6", layout = lain.layout.uselesstile,        mwfact=0.50, icon = path.."/cutiemarks/applejack.png"},
+    { name = "7", layout = lain.layout.uselesstile,        mwfact=0.50, icon = path.."/cutiemarks/snowflake.png"},
+    { name = "8", layout = lain.layout.uselesstile,        mwfact=0.50, icon = path.."/cutiemarks/thunderlane.png"},
+    { name = "9", layout = awful.layout.suit.max,          mwfact=0.50, icon = path.."/cutiemarks/bon_bon.png"},
 }
 
 -- Tags {{{2

diff --git a/awesome/themes/mlp/theme.lua b/awesome/themes/mlp/theme.lua
index 726ff1e430f26fa20aa9518ad6f9dfc0b056fa8b..5f0ccf7d3751da3b69411219ab75dc9721eae080 100644 (file)
--- a/awesome/themes/mlp/theme.lua
+++ b/awesome/themes/mlp/theme.lua
@@ -89,6 +89,21 @@ theme.layout_tile = theme.path.."/layouts/tilew.png"
 theme.layout_tiletop = theme.path.."/layouts/tiletopw.png"
 theme.layout_spiral  = theme.path.."/layouts/spiralw.png"
 theme.layout_dwindle = theme.path.."/layouts/dwindlew.png"
+-- lain stuff
+theme.useless_gap_width = 20
+theme.lain_icons               = "/usr/share/awesome/lib/lain/icons/layout/default/"
+theme.layout_uselessfairh      = theme.path.."/layouts/fairhw.png"
+theme.layout_uselessfair       = theme.path.."/layouts/fairvw.png"
+theme.layout_uselesstilebottom = theme.path.."/layouts/tilebottomw.png"
+theme.layout_uselesstileleft   = theme.path.."/layouts/tileleftw.png"
+theme.layout_uselesstile       = theme.path.."/layouts/tilew.png"
+theme.layout_uselesstiletop    = theme.path.."/layouts/tiletopw.png"
+theme.layout_uselessspiral     = theme.path.."/layouts/spiralw.png"
+theme.layout_uselessdwindle    = theme.path.."/layouts/dwindlew.png"
+theme.layout_termfair          = theme.lain_icons .. "termfairw.png"
+theme.layout_cascade           = theme.lain_icons .. "cascadew.png"
+theme.layout_cascadetile       = theme.lain_icons .. "cascadetilew.png"
+theme.layout_centerwork        = theme.lain_icons .. "centerworkw.png"
 
 theme.awesome_icon = "/usr/share/awesome/icons/awesome16.png"