This commit is contained in:
luke bonham 2014-10-04 12:10:56 +02:00
commit 27617b1544
39 changed files with 45 additions and 41 deletions

View File

@ -452,22 +452,22 @@ globalkeys = awful.util.table.join(
-- MPD control -- MPD control
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",
function () function ()
awful.util.spawn_with_shell("mpc stop || ncmpcpp stop || ncmpc stop || pms stop") awful.util.spawn_with_shell("mpc stop || ncmpc stop || pms stop")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Left", awful.key({ altkey, "Control" }, "Left",
function () function ()
awful.util.spawn_with_shell("mpc prev || ncmpcpp prev || ncmpc prev || pms prev") awful.util.spawn_with_shell("mpc prev || ncmpc prev || pms prev")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Right", awful.key({ altkey, "Control" }, "Right",
function () function ()
awful.util.spawn_with_shell("mpc next || ncmpcpp next || ncmpc next || pms next") awful.util.spawn_with_shell("mpc next || ncmpc next || pms next")
mpdwidget.update() mpdwidget.update()
end), end),

View File

@ -118,6 +118,8 @@ mymainmenu = awful.menu.new({ items = require("menugen").build_menu(),
-- {{{ Wibox -- {{{ Wibox
markup = lain.util.markup markup = lain.util.markup
blue = beautiful.fg_focus blue = beautiful.fg_focus
red = "#EB8F8F"
green = "#8FEB8F"
-- Textclock -- Textclock
mytextclock = awful.widget.textclock("<span font='Tamsyn 5'> </span>%H:%M ") mytextclock = awful.widget.textclock("<span font='Tamsyn 5'> </span>%H:%M ")
@ -186,18 +188,18 @@ batupd = lain.widgets.bat({
baticon:set_image(beautiful.ac) baticon:set_image(beautiful.ac)
else else
bat_perc = tonumber(bat_now.perc) bat_perc = tonumber(bat_now.perc)
if bat_perc > 50 then if bat_perc >= 98 then
batbar:set_color(green)
elseif bat_perc > 50 then
batbar:set_color(beautiful.fg_normal) batbar:set_color(beautiful.fg_normal)
baticon:set_image(beautiful.bat) baticon:set_image(beautiful.bat)
elseif bat_perc > 15 then elseif bat_perc > 15 then
batbar:set_color(beautiful.fg_normal) batbar:set_color(beautiful.fg_normal)
baticon:set_image(beautiful.bat_low) baticon:set_image(beautiful.bat_low)
else else
batbar:set_color("#EB8F8F") batbar:set_color(red)
baticon:set_image(beautiful.bat_no) baticon:set_image(beautiful.bat_no)
end end
end end
batbar:set_value(bat_perc / 100) batbar:set_value(bat_perc / 100)
end end
@ -247,7 +249,7 @@ end,
colors = colors =
{ {
background = beautiful.bg_normal, background = beautiful.bg_normal,
mute = "#EB8F8F", mute = red,
unmute = beautiful.fg_normal unmute = beautiful.fg_normal
}}) }})
volmargin = wibox.layout.margin(volume.bar, 2, 7) volmargin = wibox.layout.margin(volume.bar, 2, 7)
@ -505,22 +507,22 @@ globalkeys = awful.util.table.join(
-- MPD control -- MPD control
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",
function () function ()
awful.util.spawn_with_shell("mpc stop || ncmpcpp stop || ncmpc stop || pms stop") awful.util.spawn_with_shell("mpc stop || ncmpc stop || pms stop")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Left", awful.key({ altkey, "Control" }, "Left",
function () function ()
awful.util.spawn_with_shell("mpc prev || ncmpcpp prev || ncmpc prev || pms prev") awful.util.spawn_with_shell("mpc prev || ncmpc prev || pms prev")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Right", awful.key({ altkey, "Control" }, "Right",
function () function ()
awful.util.spawn_with_shell("mpc next || ncmpcpp next || ncmpc next || pms next") awful.util.spawn_with_shell("mpc next || ncmpc next || pms next")
mpdwidget.update() mpdwidget.update()
end), end),

View File

@ -452,22 +452,22 @@ globalkeys = awful.util.table.join(
-- MPD control -- MPD control
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",
function () function ()
awful.util.spawn_with_shell("mpc stop || ncmpcpp stop || ncmpc stop || pms stop") awful.util.spawn_with_shell("mpc stop || ncmpc stop || pms stop")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Left", awful.key({ altkey, "Control" }, "Left",
function () function ()
awful.util.spawn_with_shell("mpc prev || ncmpcpp prev || ncmpc prev || pms prev") awful.util.spawn_with_shell("mpc prev || ncmpc prev || pms prev")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Right", awful.key({ altkey, "Control" }, "Right",
function () function ()
awful.util.spawn_with_shell("mpc next || ncmpcpp next || ncmpc next || pms next") awful.util.spawn_with_shell("mpc next || ncmpc next || pms next")
mpdwidget.update() mpdwidget.update()
end), end),

View File

@ -199,23 +199,23 @@ mpd_icon:buttons(awful.util.table.join(awful.button({ }, 1,
function () awful.util.spawn_with_shell(musicplr) end))) function () awful.util.spawn_with_shell(musicplr) end)))
prev_icon:buttons(awful.util.table.join(awful.button({}, 1, prev_icon:buttons(awful.util.table.join(awful.button({}, 1,
function () function ()
awful.util.spawn_with_shell("mpc prev || ncmpcpp prev || ncmpc prev || pms prev") awful.util.spawn_with_shell("mpc prev || ncmpc prev || pms prev")
mpdwidget.update() mpdwidget.update()
end))) end)))
next_icon:buttons(awful.util.table.join(awful.button({}, 1, next_icon:buttons(awful.util.table.join(awful.button({}, 1,
function () function ()
awful.util.spawn_with_shell("mpc next || ncmpcpp next || ncmpc next || pms next") awful.util.spawn_with_shell("mpc next || ncmpc next || pms next")
mpdwidget.update() mpdwidget.update()
end))) end)))
stop_icon:buttons(awful.util.table.join(awful.button({}, 1, stop_icon:buttons(awful.util.table.join(awful.button({}, 1,
function () function ()
play_pause_icon:set_image(beautiful.play) play_pause_icon:set_image(beautiful.play)
awful.util.spawn_with_shell("mpc stop || ncmpcpp stop || ncmpc stop || pms stop") awful.util.spawn_with_shell("mpc stop || ncmpc stop || pms stop")
mpdwidget.update() mpdwidget.update()
end))) end)))
play_pause_icon:buttons(awful.util.table.join(awful.button({}, 1, play_pause_icon:buttons(awful.util.table.join(awful.button({}, 1,
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end))) end)))
@ -584,22 +584,22 @@ globalkeys = awful.util.table.join(
-- MPD control -- MPD control
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",
function () function ()
awful.util.spawn_with_shell("mpc stop || ncmpcpp stop || ncmpc stop || pms stop") awful.util.spawn_with_shell("mpc stop || ncmpc stop || pms stop")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Left", awful.key({ altkey, "Control" }, "Left",
function () function ()
awful.util.spawn_with_shell("mpc prev || ncmpcpp prev || ncmpc prev || pms prev") awful.util.spawn_with_shell("mpc prev || ncmpc prev || pms prev")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Right", awful.key({ altkey, "Control" }, "Right",
function () function ()
awful.util.spawn_with_shell("mpc next || ncmpcpp next || ncmpc next || pms next") awful.util.spawn_with_shell("mpc next || ncmpc next || pms next")
mpdwidget.update() mpdwidget.update()
end), end),

View File

@ -516,22 +516,22 @@ globalkeys = awful.util.table.join(
-- MPD control -- MPD control
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",
function () function ()
awful.util.spawn_with_shell("mpc stop || ncmpcpp stop || ncmpc stop || pms stop") awful.util.spawn_with_shell("mpc stop || ncmpc stop || pms stop")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Left", awful.key({ altkey, "Control" }, "Left",
function () function ()
awful.util.spawn_with_shell("mpc prev || ncmpcpp prev || ncmpc prev || pms prev") awful.util.spawn_with_shell("mpc prev || ncmpc prev || pms prev")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Right", awful.key({ altkey, "Control" }, "Right",
function () function ()
awful.util.spawn_with_shell("mpc next || ncmpcpp next || ncmpc next || pms next") awful.util.spawn_with_shell("mpc next || ncmpc next || pms next")
mpdwidget.update() mpdwidget.update()
end), end),

View File

@ -330,6 +330,8 @@ for s = 1, screen.count() do
left_layout:add(spr) left_layout:add(spr)
-- Widgets that are aligned to the upper right -- Widgets that are aligned to the upper right
-- If you are moving widgets from a section with light grey background to dark grey or vice versa,
-- use a replacement icon as appropriate from themes/powerarrow-darker/alticons so your icons match the bg.
local right_layout = wibox.layout.fixed.horizontal() local right_layout = wibox.layout.fixed.horizontal()
if s == 1 then right_layout:add(wibox.widget.systray()) end if s == 1 then right_layout:add(wibox.widget.systray()) end
right_layout:add(spr) right_layout:add(spr)
@ -505,22 +507,22 @@ globalkeys = awful.util.table.join(
-- MPD control -- MPD control
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",
function () function ()
awful.util.spawn_with_shell("mpc stop || ncmpcpp stop || ncmpc stop || pms stop") awful.util.spawn_with_shell("mpc stop || ncmpc stop || pms stop")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Left", awful.key({ altkey, "Control" }, "Left",
function () function ()
awful.util.spawn_with_shell("mpc prev || ncmpcpp prev || ncmpc prev || pms prev") awful.util.spawn_with_shell("mpc prev || ncmpc prev || pms prev")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Right", awful.key({ altkey, "Control" }, "Right",
function () function ()
awful.util.spawn_with_shell("mpc next || ncmpcpp next || ncmpc next || pms next") awful.util.spawn_with_shell("mpc next || ncmpc next || pms next")
mpdwidget.update() mpdwidget.update()
end), end),

View File

@ -450,22 +450,22 @@ globalkeys = awful.util.table.join(
-- MPD control -- MPD control
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",
function () function ()
awful.util.spawn_with_shell("mpc stop || ncmpcpp stop || ncmpc stop || pms stop") awful.util.spawn_with_shell("mpc stop || ncmpc stop || pms stop")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Left", awful.key({ altkey, "Control" }, "Left",
function () function ()
awful.util.spawn_with_shell("mpc prev || ncmpcpp prev || ncmpc prev || pms prev") awful.util.spawn_with_shell("mpc prev || ncmpc prev || pms prev")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Right", awful.key({ altkey, "Control" }, "Right",
function () function ()
awful.util.spawn_with_shell("mpc next || ncmpcpp next || ncmpc next || pms next") awful.util.spawn_with_shell("mpc next || ncmpc next || pms next")
mpdwidget.update() mpdwidget.update()
end), end),

View File

@ -459,22 +459,22 @@ globalkeys = awful.util.table.join(
-- MPD control -- MPD control
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",
function () function ()
awful.util.spawn_with_shell("mpc stop || ncmpcpp stop || ncmpc stop || pms stop") awful.util.spawn_with_shell("mpc stop || ncmpc stop || pms stop")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Left", awful.key({ altkey, "Control" }, "Left",
function () function ()
awful.util.spawn_with_shell("mpc prev || ncmpcpp prev || ncmpc prev || pms prev") awful.util.spawn_with_shell("mpc prev || ncmpc prev || pms prev")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Right", awful.key({ altkey, "Control" }, "Right",
function () function ()
awful.util.spawn_with_shell("mpc next || ncmpcpp next || ncmpc next || pms next") awful.util.spawn_with_shell("mpc next || ncmpc next || pms next")
mpdwidget.update() mpdwidget.update()
end), end),

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 169 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 169 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 203 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 198 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 229 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 213 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 213 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 229 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 156 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 193 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 212 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 199 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 220 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 206 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 190 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 193 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 199 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 196 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 210 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 B