X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/24a405f945240eaa04abf95b747ceeb3ad8cde59..fd2e16fc92dd7a33908ceff1e31f03e05a78fda9:/awesome/tags.lua diff --git a/awesome/tags.lua b/awesome/tags.lua index bb1e318..145e1f2 100644 --- a/awesome/tags.lua +++ b/awesome/tags.lua @@ -1,73 +1,81 @@ --- {{{ Layouts --- Table of layouts to cover with awful.layout.inc, order matters. -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, - awful.layout.suit.max, - awful.layout.suit.max.fullscreen, - --awful.layout.suit.magnifier -} --- }}} - --- {{{ Tags +-- Tags {{{1 local mytags = {} --- {{{ single screen +local theme = beautiful.get() + +--TODO create a list of tag objects and place them according to number of screens (sb:20170130) +-- single screen {{{2 mytags[1] = {} mytags[1][1] = { - { name = "1-main", layout = awful.layout.suit.floating, mwfact=0.87 }, - { name = "2-www", layout = awful.layout.suit.tile.left, mwfact=0.6 }, - { name = "3-im", layout = awful.layout.suit.tile.left, mwfact=0.6 }, - { name = "4-media", layout = awful.layout.suit.tile.left, mwfact=0.6 }, - { name = "5", layout = awful.layout.suit.tile, mwfact=0.3 }, - { name = "6", layout = awful.layout.suit.tile, mwfact=0.88 }, - { name = "7", layout = awful.layout.suit.tile.bottom, mwfact=0.84 }, - { name = "8", layout = awful.layout.suit.max, mwfact=0.7 }, - { name = "9", layout = awful.layout.suit.max, mwfact=0.5 }, + { name = "1", layout = awful.layout.suit.tile.left, master_width_factor=0.50, icon = theme.taglist_icon_01}, + { name = "2", layout = awful.layout.suit.tile, master_width_factor=0.60, icon = theme.taglist_icon_02}, + { name = "3", layout = awful.layout.suit.max, master_width_factor=0.50, icon = theme.taglist_icon_03}, + { name = "4", layout = awful.layout.suit.tile.left, master_width_factor=0.60, icon = theme.taglist_icon_04}, + { name = "5", layout = awful.layout.suit.tile, master_width_factor=0.30, icon = theme.taglist_icon_05}, + { name = "6", layout = awful.layout.suit.tile, master_width_factor=0.50, icon = theme.taglist_icon_06}, + { name = "7", layout = awful.layout.suit.tile.bottom, master_width_factor=0.80, icon = theme.taglist_icon_07}, + { name = "8", layout = awful.layout.suit.tile, master_width_factor=0.50, icon = theme.taglist_icon_08}, + { name = "9", layout = awful.layout.suit.floating, master_width_factor=0.50, icon = theme.taglist_icon_09}, } --- }}} --- {{{ Dual screen +-- Dual screen {{{2 mytags[2] = {} mytags[2][1] = { - { name = "1-test", layout = awful.layout.suit.tile, mwfact=0.87 }, - { name = "2", layout = awful.layout.suit.tile.left, mwfact=0.6 }, - { name = "3", layout = awful.layout.suit.tile.left, mwfact=0.6 }, - { name = "4", layout = awful.layout.suit.tile.left, mwfact=0.6 }, - { name = "5", layout = awful.layout.suit.tile, mwfact=0.3 }, - { name = "6", layout = awful.layout.suit.tile, mwfact=0.88 }, - { name = "7", layout = awful.layout.suit.tile.bottom, mwfact=0.84 }, - { name = "8", layout = awful.layout.suit.max, mwfact=0.7 }, - { name = "9", layout = awful.layout.suit.max, mwfact=0.5 }, + { name = "1", layout = awful.layout.suit.tile.left, master_width_factor=0.50, icon = theme.taglist_icon_01}, + { name = "2", layout = awful.layout.suit.tile.left, master_width_factor=0.60, icon = theme.taglist_icon_02}, + { name = "3", layout = awful.layout.suit.tile.left, master_width_factor=0.60, icon = theme.taglist_icon_03}, + { name = "4", layout = awful.layout.suit.tile.left, master_width_factor=0.60, icon = theme.taglist_icon_04}, + { name = "5", layout = awful.layout.suit.tile.left, master_width_factor=0.30, icon = theme.taglist_icon_05}, + { name = "6", layout = awful.layout.suit.tile.left, master_width_factor=0.70, icon = theme.taglist_icon_06}, + { name = "7", layout = awful.layout.suit.tile.left, master_width_factor=0.88, icon = theme.taglist_icon_07}, + { name = "8", layout = awful.layout.suit.tile.left, master_width_factor=0.84, icon = theme.taglist_icon_08}, + { name = "9", layout = awful.layout.suit.floating, master_width_factor=0.50, icon = theme.taglist_icon_09}, } mytags[2][2] = { - { name = "1-www", layout = awful.layout.suit.tile.right, mwfact=0.6 }, - { name = "2-im", layout = awful.layout.suit.tile, mwfact=0.88 }, - { name = "3-music", layout = awful.layout.suit.tile.bottom, mwfact=0.1 }, - { name = "4", layout = awful.layout.suit.tile.bottom, mwfact=0.9 }, - { name = "5", layout = awful.layout.suit.max, mwfact=0.5 }, - { name = "6", layout = awful.layout.suit.floating, mwfact=0.5 }, - { name = "7", layout = awful.layout.suit.floating, mwfact=0.5 }, - { name = "8", layout = awful.layout.suit.floating, mwfact=0.5 }, - { name = "9", layout = awful.layout.suit.floating, mwfact=0.5 }, + { name = "1", layout = awful.layout.suit.tile, master_width_factor=0.60, icon = theme.taglist_icon_10}, + { name = "2", layout = awful.layout.suit.max, master_width_factor=0.88, icon = theme.taglist_icon_11}, + { name = "3", layout = awful.layout.suit.tile, master_width_factor=0.50, icon = theme.taglist_icon_12}, + { name = "4", layout = awful.layout.suit.tile.left, master_width_factor=0.80, icon = theme.taglist_icon_13}, + { name = "5", layout = awful.layout.suit.tile, master_width_factor=0.50, icon = theme.taglist_icon_14}, + { name = "6", layout = awful.layout.suit.tile, master_width_factor=0.50, icon = theme.taglist_icon_15}, + { name = "7", layout = awful.layout.suit.tile, master_width_factor=0.50, icon = theme.taglist_icon_16}, + { name = "8", layout = awful.layout.suit.tile, master_width_factor=0.50, icon = theme.taglist_icon_17}, + { name = "9", layout = awful.layout.suit.max, master_width_factor=0.50, icon = theme.taglist_icon_18}, } --- }}} +-- Wallpaper {{{2 +local function set_wallpaper(s) + -- Wallpaper + if beautiful.wallpaper then + local wallpaper = beautiful.wallpaper + -- If wallpaper is a function, call it with the screen + if type(wallpaper) == "function" then + wallpaper = wallpaper(s) + end + gears.wallpaper.maximized(wallpaper, s, true) + end +end + +-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution) +screen.connect_signal("property::geometry", set_wallpaper) + +-- Tags {{{2 tags = {} local sc = screen.count() -for s = 1, sc do +awful.screen.connect_for_each_screen(function(s) + -- Wallpaper + set_wallpaper(s) + + local s = s.index 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 + props['icon_only'] = theme.taglist_icon_only + end + tags[s][i] = awful.tag.add(p.name, props) end tags[s][1].selected = true -end --- }}} +end)