new tag names, second vertical bar
This commit is contained in:
parent
2611116b01
commit
99f978902d
66
rc.lua
66
rc.lua
|
@ -8,8 +8,8 @@ require("beautiful")
|
||||||
require("naughty")
|
require("naughty")
|
||||||
require("teardrop")
|
require("teardrop")
|
||||||
require("obvious.battery")
|
require("obvious.battery")
|
||||||
require("obvious.wlan")
|
|
||||||
require("obvious.popup_run_prompt")
|
require("obvious.popup_run_prompt")
|
||||||
|
require("vicious")
|
||||||
|
|
||||||
-- {{{ Variable definitions
|
-- {{{ Variable definitions
|
||||||
-- Themes define colours, icons, and wallpapers
|
-- Themes define colours, icons, and wallpapers
|
||||||
|
@ -45,15 +45,15 @@ layouts =
|
||||||
-- {{{ Tags
|
-- {{{ Tags
|
||||||
local tags = {}
|
local tags = {}
|
||||||
tags.setup = {
|
tags.setup = {
|
||||||
{ name = "term", layout = layouts[1] },
|
{ name = "1:⚙", layout = layouts[1] },
|
||||||
{ name = "web", layout = layouts[7] },
|
{ name = "2:⌘", layout = layouts[7] },
|
||||||
{ name = "im", layout = layouts[1], mwfact = 0.80 },
|
{ name = "3:☻", layout = layouts[1], mwfact = 0.80 },
|
||||||
{ name = "mail", layout = layouts[7] },
|
{ name = "4:✉", layout = layouts[7] },
|
||||||
{ name = "music", layout = layouts[7] },
|
{ name = "5:☑", layout = layouts[7] },
|
||||||
{ name = "6", layout = layouts[1] },
|
{ name = "6:♫", layout = layouts[1] },
|
||||||
{ name = "7", layout = layouts[1] },
|
{ name = "7:☣", layout = layouts[1] },
|
||||||
{ name = "8", layout = layouts[1] },
|
{ name = "8:☕", layout = layouts[1] },
|
||||||
{ name = "9", layout = layouts[1] }
|
{ name = "9:⚂", layout = layouts[1] }
|
||||||
}
|
}
|
||||||
|
|
||||||
for s = 1, screen.count() do
|
for s = 1, screen.count() do
|
||||||
|
@ -69,7 +69,6 @@ for s = 1, screen.count() do
|
||||||
end
|
end
|
||||||
-- }}}
|
-- }}}
|
||||||
|
|
||||||
|
|
||||||
-- {{{ Reusable separators
|
-- {{{ Reusable separators
|
||||||
spacer = widget({ type = "textbox", name = "spacer" })
|
spacer = widget({ type = "textbox", name = "spacer" })
|
||||||
spacer.text = " "
|
spacer.text = " "
|
||||||
|
@ -83,12 +82,15 @@ separator.text = "·"
|
||||||
--popup run
|
--popup run
|
||||||
|
|
||||||
-- Create a textclock widget
|
-- Create a textclock widget
|
||||||
clock = awful.widget.textclock({ align = "right" })
|
--clock = awful.widget.textclock({ align = "right" })
|
||||||
mysystray = widget({ type = "systray" })
|
mysystray = widget({ type = "systray" })
|
||||||
|
|
||||||
|
clock = widget({ type = "textbox" })
|
||||||
|
vicious.register(clock, vicious.widgets.date, "%b %d, %R", 60)
|
||||||
|
|
||||||
-- Create a wibox for each screen and add it
|
-- Create a wibox for each screen and add it
|
||||||
mywibox = {}
|
leftwibox = {}
|
||||||
mypromptbox = {}
|
rightwibox = {}
|
||||||
mylayoutbox = {}
|
mylayoutbox = {}
|
||||||
mytaglist = {}
|
mytaglist = {}
|
||||||
mytaglist.buttons = awful.util.table.join(
|
mytaglist.buttons = awful.util.table.join(
|
||||||
|
@ -101,8 +103,6 @@ mytaglist.buttons = awful.util.table.join(
|
||||||
)
|
)
|
||||||
|
|
||||||
for s = 1, screen.count() do
|
for s = 1, screen.count() do
|
||||||
-- Create a promptbox for each screen
|
|
||||||
mypromptbox[s] = awful.widget.prompt({ layout = awful.widget.layout.horizontal.leftright })
|
|
||||||
-- Create an imagebox widget which will contains an icon indicating which layout we're using.
|
-- Create an imagebox widget which will contains an icon indicating which layout we're using.
|
||||||
-- We need one layoutbox per screen.
|
-- We need one layoutbox per screen.
|
||||||
mylayoutbox[s] = awful.widget.layoutbox(s)
|
mylayoutbox[s] = awful.widget.layoutbox(s)
|
||||||
|
@ -118,21 +118,28 @@ for s = 1, screen.count() do
|
||||||
batmon = obvious.battery();
|
batmon = obvious.battery();
|
||||||
|
|
||||||
-- Create the wibox
|
-- Create the wibox
|
||||||
mywibox[s] = awful.wibox({ position = "left", screen = s })
|
leftwibox[s] = awful.wibox({ position = "left", screen = s })
|
||||||
|
rightwibox[s] = awful.wibox({ position = "right", screen = s })
|
||||||
-- Add widgets to the wibox - order matters
|
-- Add widgets to the wibox - order matters
|
||||||
mywibox[s].widgets = {
|
leftwibox[s].widgets = {
|
||||||
{
|
mytaglist[s],
|
||||||
mytaglist[s],
|
|
||||||
mypromptbox[s],
|
|
||||||
layout = awful.widget.layout.horizontal.leftright
|
|
||||||
},
|
|
||||||
mylayoutbox[s],
|
mylayoutbox[s],
|
||||||
clock,
|
clock,
|
||||||
separator, spacer, batmon,
|
separator, spacer, batmon,
|
||||||
spacer,
|
spacer,
|
||||||
s == 1 and mysystray or nil,
|
|
||||||
layout = awful.widget.layout.horizontal.rightleft
|
layout = awful.widget.layout.horizontal.rightleft
|
||||||
}
|
}
|
||||||
|
rightwibox[s].widgets = {
|
||||||
|
{
|
||||||
|
mylayoutbox[s],
|
||||||
|
clock,
|
||||||
|
separator, spacer, batmon,
|
||||||
|
spacer,
|
||||||
|
layout = awful.widget.layout.horizontal.leftright
|
||||||
|
},
|
||||||
|
separator, spacer, s == 1 and mysystray or nil,
|
||||||
|
layout = awful.widget.layout.horizontal.leftright
|
||||||
|
}
|
||||||
end
|
end
|
||||||
-- }}}
|
-- }}}
|
||||||
|
|
||||||
|
@ -200,15 +207,8 @@ globalkeys = awful.util.table.join(
|
||||||
awful.key({ modkey }, "F9", function () teardrop("xterm -e alsamixer","top","center", 0.99, 0.4)end ),
|
awful.key({ modkey }, "F9", function () teardrop("xterm -e alsamixer","top","center", 0.99, 0.4)end ),
|
||||||
|
|
||||||
-- Prompt
|
-- Prompt
|
||||||
awful.key({ modkey }, "r", function () obvious.popup_run_prompt.run_prompt() end),
|
awful.key({ modkey }, "r", function () obvious.popup_run_prompt.run_prompt() end)
|
||||||
|
|
||||||
awful.key({ modkey }, "x",
|
|
||||||
function ()
|
|
||||||
awful.prompt.run({ prompt = "Run Lua code: " },
|
|
||||||
mypromptbox[mouse.screen].widget,
|
|
||||||
awful.util.eval, nil,
|
|
||||||
awful.util.getdir("cache") .. "/history_eval")
|
|
||||||
end)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
clientkeys = awful.util.table.join(
|
clientkeys = awful.util.table.join(
|
||||||
|
@ -296,6 +296,8 @@ awful.rules.rules = {
|
||||||
properties = { tag = tags[1][3] } },
|
properties = { tag = tags[1][3] } },
|
||||||
{ rule = { class = "Thunderbird-bin" },
|
{ rule = { class = "Thunderbird-bin" },
|
||||||
properties = { tag = tags[1][4] } },
|
properties = { tag = tags[1][4] } },
|
||||||
|
{ rule = { class = "Sunbird-bin" },
|
||||||
|
properties = { tag = tags[1][5] } },
|
||||||
}
|
}
|
||||||
-- }}}
|
-- }}}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue