diff --git a/layouts.lua b/layouts.lua deleted file mode 100644 index 0297cde..0000000 --- a/layouts.lua +++ /dev/null @@ -1,22 +0,0 @@ -local awful = require("awful") -local conf = conf - -local layouts={ mt={} } -local list = { - awful.layout.suit.fair, - awful.layout.suit.fair.horizontal, - awful.layout.suit.tile, - awful.layout.suit.tile.bottom, - awful.layout.suit.max, - awful.layout.suit.max.fullscreen, - awful.layout.suit.floating -} - -function layouts.set_list(layout_list) - list = layout_list -end - - -layouts.mt.__index = list -layouts.mt.__newindex = list -return setmetatable(layouts, layouts.mt) diff --git a/rc.lua b/rc.lua index 5247476..315764c 100644 --- a/rc.lua +++ b/rc.lua @@ -9,8 +9,6 @@ conf = require("localconf") inspect = require("inspect") -- }}} -layouts = require('layouts') - -- {{{ Logging log = require("simplelog") log.add_logger(log.loggers.stdio, log.level.DEBUG) diff --git a/tags.lua b/tags.lua index 0f41338..15ad5d5 100644 --- a/tags.lua +++ b/tags.lua @@ -4,7 +4,6 @@ local conf = conf local modkey = conf.modkey or "Mod4" local tags={ mt={} } -local layouts = layouts local function getfunc_viewonly(i) return function () @@ -42,27 +41,27 @@ end local defaultsetup = { {"1:⚙"}, - { name = "2:⌘", layout = layouts[5] }, - { name = "3:☻", layout = layouts[3], mwfact = 0.20, ncol = 2, nmaster = 2}, - { name = "4:✉", layout = layouts[5] }, + { name = "2:⌘", layout = awful.layout.suit.max }, + { name = "3:☻", layout = awful.layout.suit.tile, mwfact = 0.20, ncol = 2, nmaster = 2}, + { name = "4:✉", layout = awful.layout.suit.max }, {"5:☑"}, {"6:♫"}, {"7:☣"}, {"8:☕"}, {"9:⚂"}, {"0:☠"}, - { name = "F1:☭", layout = layouts[5] }, + { name = "F1:☭", layout = awful.layout.suit.max }, {"F2:♚"}, {"F3:♛"}, {"F4:♜"}--, - -- { name = "F5:♝", layout = layouts[1] }, - -- { name = "F6:♞", layout = layouts[1] }, - -- { name = "F7:♟", layout = layouts[1] }, - -- { name = "F8:⚖", layout = layouts[1] }, - -- { name = "F9:⚛", layout = layouts[1] }, - -- { name = "F10:⚡", layout = layouts[1] }, - -- { name = "F11:⚰", layout = layouts[1] }, - -- { name = "F12:⚙", layout = layouts[1] } + -- {"F5:♝"}, + -- {"F6:♞"}, + -- {"F7:♟"}, + -- {"F8:⚖"}, + -- {"F9:⚛"}, + -- {"F10:⚡"}, + -- {"F11:⚰"}, + -- {"F12:⚙"} } local list = {} @@ -72,7 +71,7 @@ function tags.setup(setuptable) for s = 1, screen.count() do list[s] = {} for i, t in ipairs(setup) do - local layout = t.layout or layouts[1] + local layout = t.layout or conf.default_layout or awful.layout.suit.fair local name = t.name or t[1] list[s][i] = awful.tag.new({name}, s, layout)[1]; list[s][i].selected = false