1
0
Fork 0
mirror of https://github.com/lcpz/awesome-copycats.git synced 2024-12-23 03:32:30 +00:00

lain: new commit

This commit is contained in:
copycat-killer 2017-01-26 21:01:07 +01:00
parent 536a90729e
commit f9c166cce7
9 changed files with 126 additions and 123 deletions

2
lain

@ -1 +1 @@
Subproject commit bf3a9ba5efb874ad6370a3083afd409361e2912a Subproject commit 229d2545dd399b52c6128a823657c6266fbbe8a9

View file

@ -151,7 +151,7 @@ lain.widgets.calendar.attach(mytextclock, {
--[[ Mail IMAP check --[[ Mail IMAP check
-- commented because it needs to be set before use -- commented because it needs to be set before use
local mailwidget = lain.widgets.imap({ local mail = lain.widgets.imap({
timeout = 180, timeout = 180,
server = "server", server = "server",
mail = "mail", mail = "mail",
@ -168,10 +168,10 @@ local mailwidget = lain.widgets.imap({
widget:set_markup(markup(gray, mail) .. count) widget:set_markup(markup(gray, mail) .. count)
end end
}) })
]] --]]
-- MPD -- MPD
local mpdwidget = lain.widgets.mpd({ local mpd = lain.widgets.mpd({
settings = function() settings = function()
artist = mpd_now.artist .. " " artist = mpd_now.artist .. " "
title = mpd_now.title .. " " title = mpd_now.title .. " "
@ -207,7 +207,7 @@ local fshome = lain.widgets.fs({
}) })
-- Battery -- Battery
local batwidget = lain.widgets.bat({ local bat = lain.widgets.bat({
settings = function() settings = function()
bat_header = " Bat " bat_header = " Bat "
bat_p = bat_now.perc .. " " bat_p = bat_now.perc .. " "
@ -366,12 +366,12 @@ awful.screen.connect_for_each_screen(function(s)
layout = wibox.layout.fixed.horizontal, layout = wibox.layout.fixed.horizontal,
wibox.widget.systray(), wibox.widget.systray(),
first, first,
mpdwidget, mpd.widget,
--mailwidget, --mail,
myweather.icon, myweather.icon,
myweather, myweather.widget,
fshome, fshome,
batwidget, bat,
volume, volume,
mytextclock, mytextclock,
}, },
@ -562,22 +562,22 @@ globalkeys = awful.util.table.join(
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle") awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",
function () function ()
awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop") awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Left", awful.key({ altkey, "Control" }, "Left",
function () function ()
awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev") awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Right", awful.key({ altkey, "Control" }, "Right",
function () function ()
awful.spawn.with_shell("mpc next || ncmpc next || pms next") awful.spawn.with_shell("mpc next || ncmpc next || pms next")
mpdwidget.update() mpd.update()
end), end),
--]] --]]

View file

@ -155,7 +155,7 @@ lain.widgets.calendar.attach(mytextclock, {
--[[ Mail IMAP check --[[ Mail IMAP check
-- commented because it needs to be set before use -- commented because it needs to be set before use
local mailwidget = lain.widgets.imap({ local mail = lain.widgets.imap({
timeout = 180, timeout = 180,
server = "server", server = "server",
mail = "mail", mail = "mail",
@ -172,11 +172,11 @@ local mailwidget = lain.widgets.imap({
widget:set_markup(markup(blue, mail) .. count) widget:set_markup(markup(blue, mail) .. count)
end end
}) })
]] --]]
-- MPD -- MPD
local mpdicon = wibox.widget.imagebox() local mpdicon = wibox.widget.imagebox()
local mpdwidget = lain.widgets.mpd({ local mpd = lain.widgets.mpd({
settings = function() settings = function()
if mpd_now.state == "play" then if mpd_now.state == "play" then
title = mpd_now.title title = mpd_now.title
@ -415,9 +415,9 @@ awful.screen.connect_for_each_screen(function(s)
layout = wibox.layout.fixed.horizontal, layout = wibox.layout.fixed.horizontal,
wibox.widget.systray(), wibox.widget.systray(),
small_spr, small_spr,
--mailwidget, --mail.widget,
mpdicon, mpdicon,
mpdwidget, mpd,
baticon, baticon,
batwidget, batwidget,
bar_spr, bar_spr,
@ -616,22 +616,22 @@ globalkeys = awful.util.table.join(
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle") awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",
function () function ()
awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop") awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Left", awful.key({ altkey, "Control" }, "Left",
function () function ()
awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev") awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Right", awful.key({ altkey, "Control" }, "Right",
function () function ()
awful.spawn.with_shell("mpc next || ncmpc next || pms next") awful.spawn.with_shell("mpc next || ncmpc next || pms next")
mpdwidget.update() mpd.update()
end), end),
--]] --]]

View file

@ -153,7 +153,7 @@ lain.widgets.calendar.attach(mytextclock, {
--[[ Mail IMAP check --[[ Mail IMAP check
-- commented because it needs to be set before use -- commented because it needs to be set before use
local mailwidget = lain.widgets.imap({ local mail = lain.widgets.imap({
timeout = 180, timeout = 180,
server = "server", server = "server",
mail = "mail", mail = "mail",
@ -171,10 +171,10 @@ local mailwidget = lain.widgets.imap({
widget:set_markup(markup(gray, mail) .. markup(white, count)) widget:set_markup(markup(gray, mail) .. markup(white, count))
end end
}) })
]] --]]
-- MPD -- MPD
local mpdwidget = lain.widgets.mpd({ local mpd = lain.widgets.mpd({
settings = function() settings = function()
mpd_notification_preset.fg = white mpd_notification_preset.fg = white
artist = mpd_now.artist .. " " artist = mpd_now.artist .. " "
@ -211,7 +211,7 @@ local fshome = lain.widgets.fs({
}) })
-- Battery -- Battery
local batwidget = lain.widgets.bat({ local bat = lain.widgets.bat({
settings = function() settings = function()
bat_header = " Bat " bat_header = " Bat "
bat_p = bat_now.perc .. " " bat_p = bat_now.perc .. " "
@ -353,11 +353,11 @@ awful.screen.connect_for_each_screen(function(s)
layout = wibox.layout.fixed.horizontal, layout = wibox.layout.fixed.horizontal,
wibox.widget.systray(), wibox.widget.systray(),
first, first,
mpdwidget, mpd.widget,
--mailwidget, --mail.widget,
fshome, fshome.widget,
batwidget, bat.widget,
volume, volume.widget,
mytextclock, mytextclock,
}, },
} }
@ -547,22 +547,22 @@ globalkeys = awful.util.table.join(
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle") awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",
function () function ()
awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop") awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Left", awful.key({ altkey, "Control" }, "Left",
function () function ()
awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev") awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Right", awful.key({ altkey, "Control" }, "Right",
function () function ()
awful.spawn.with_shell("mpc next || ncmpc next || pms next") awful.spawn.with_shell("mpc next || ncmpc next || pms next")
mpdwidget.update() mpd.update()
end), end),
--]] --]]

View file

@ -157,7 +157,7 @@ lain.widgets.calendar.attach(calendarwidget, { notification_preset = { fg = "#FF
--[[ Mail IMAP check --[[ Mail IMAP check
-- commented because it needs to be set before use -- commented because it needs to be set before use
local mailwidget = lain.widgets.imap({ local mail = lain.widgets.imap({
timeout = 180, timeout = 180,
server = "server", server = "server",
mail = "mail", mail = "mail",
@ -175,7 +175,7 @@ local mailwidget = lain.widgets.imap({
widget:set_markup(markup(blue, mail) .. markup("#FFFFFF", count)) widget:set_markup(markup(blue, mail) .. markup("#FFFFFF", count))
end end
}) })
]] --]]
-- MPD -- MPD
local mpd_icon = awful.widget.launcher({ image = beautiful.mpd, command = musicplr }) local mpd_icon = awful.widget.launcher({ image = beautiful.mpd, command = musicplr })
@ -184,7 +184,7 @@ local next_icon = wibox.widget.imagebox(beautiful.nex)
local stop_icon = wibox.widget.imagebox(beautiful.stop) local stop_icon = wibox.widget.imagebox(beautiful.stop)
local pause_icon = wibox.widget.imagebox(beautiful.pause) local pause_icon = wibox.widget.imagebox(beautiful.pause)
local play_pause_icon = wibox.widget.imagebox(beautiful.play) local play_pause_icon = wibox.widget.imagebox(beautiful.play)
local mpdwidget = lain.widgets.mpd({ local mpd = lain.widgets.mpd({
settings = function () settings = function ()
if mpd_now.state == "play" then if mpd_now.state == "play" then
mpd_now.artist = mpd_now.artist:upper():gsub("&.-;", string.lower) mpd_now.artist = mpd_now.artist:upper():gsub("&.-;", string.lower)
@ -206,7 +206,7 @@ local mpdwidget = lain.widgets.mpd({
end end
end end
}) })
local musicbg = wibox.container.background(mpdwidget, beautiful.bg_focus, shape.rectangle) local musicbg = wibox.container.background(mpd.widget, beautiful.bg_focus, shape.rectangle)
local musicwidget = wibox.container.margin(musicbg, 0, 0, 5, 5) local musicwidget = wibox.container.margin(musicbg, 0, 0, 5, 5)
musicwidget:buttons(awful.util.table.join(awful.button({ }, 1, musicwidget:buttons(awful.util.table.join(awful.button({ }, 1,
@ -214,28 +214,28 @@ function () awful.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.spawn.with_shell("mpc prev || ncmpc prev || pms prev") awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
mpdwidget.update() mpd.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.spawn.with_shell("mpc next || ncmpc next || pms next") awful.spawn.with_shell("mpc next || ncmpc next || pms next")
mpdwidget.update() mpd.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.spawn.with_shell("mpc stop || ncmpc stop || pms stop") awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
mpdwidget.update() mpd.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.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle") awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpd.update()
end))) end)))
-- Battery -- Battery
--[[ --[[
local batwidget = lain.widgets.bat({ local bat = lain.widgets.bat({
settings = function() settings = function()
bat_header = " Bat " bat_header = " Bat "
bat_p = bat_now.perc .. " " bat_p = bat_now.perc .. " "
@ -269,31 +269,31 @@ volumewidget.shape_border_color = beautiful.tasklist_bg_normal
-- CPU -- CPU
local cpu_icon = wibox.widget.imagebox(beautiful.cpu) local cpu_icon = wibox.widget.imagebox(beautiful.cpu)
local cpu_widget = lain.widgets.cpu({ local cpu = lain.widgets.cpu({
settings = function() settings = function()
widget:set_markup(space3 .. "CPU " .. cpu_now.usage widget:set_markup(space3 .. "CPU " .. cpu_now.usage
.. "% " .. markup.font("Tamsyn 5", " ")) .. "% " .. markup.font("Tamsyn 5", " "))
end end
}) })
local cpubg = wibox.container.background(cpu_widget, beautiful.bg_focus, shape.rectangle) local cpubg = wibox.container.background(cpu.widget, beautiful.bg_focus, shape.rectangle)
local cpuwidget = wibox.container.margin(cpubg, 0, 0, 5, 5) local cpuwidget = wibox.container.margin(cpubg, 0, 0, 5, 5)
-- Net -- Net
local netdown_icon = wibox.widget.imagebox(beautiful.net_down) local netdown_icon = wibox.widget.imagebox(beautiful.net_down)
local netup_icon = wibox.widget.imagebox(beautiful.net_up) local netup_icon = wibox.widget.imagebox(beautiful.net_up)
local netwidget = lain.widgets.net({ local net = lain.widgets.net({
settings = function() settings = function()
widget:set_markup(markup.font("Tamsyn 1", " ") .. net_now.received .. " - " widget:set_markup(markup.font("Tamsyn 1", " ") .. net_now.received .. " - "
.. net_now.sent .. markup.font("Tamsyn 2", " ")) .. net_now.sent .. markup.font("Tamsyn 2", " "))
end end
}) })
local netbg = wibox.container.background(netwidget, beautiful.bg_focus, shape.rectangle) local netbg = wibox.container.background(net.widget, beautiful.bg_focus, shape.rectangle)
local networkwidget = wibox.container.margin(netbg, 0, 0, 5, 5) local networkwidget = wibox.container.margin(netbg, 0, 0, 5, 5)
-- Weather -- Weather
local myweather = lain.widgets.weather({ local myweather = lain.widgets.weather({
city_id = 2643743, -- placeholder (London) city_id = 2643743, -- placeholder (London)
notification_preset = { font = "Monospace 9" }, notification_preset = { font = "Monospace 9", position = "bottom_right" },
}) })
-- Separators -- Separators
@ -419,8 +419,8 @@ awful.screen.connect_for_each_screen(function(s)
{ -- Right widgets { -- Right widgets
layout = wibox.layout.fixed.horizontal, layout = wibox.layout.fixed.horizontal,
wibox.widget.systray(), wibox.widget.systray(),
--mailwidget, --mail,
--batwidget, --bat,
spr_right, spr_right,
musicwidget, musicwidget,
bar, bar,
@ -652,22 +652,22 @@ globalkeys = awful.util.table.join(
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle") awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",
function () function ()
awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop") awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Left", awful.key({ altkey, "Control" }, "Left",
function () function ()
awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev") awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Right", awful.key({ altkey, "Control" }, "Right",
function () function ()
awful.spawn.with_shell("mpc next || ncmpc next || pms next") awful.spawn.with_shell("mpc next || ncmpc next || pms next")
mpdwidget.update() mpd.update()
end), end),
--]] --]]

View file

@ -188,7 +188,7 @@ local fsroot = lain.widgets.fs({
--[[ Mail IMAP check --[[ Mail IMAP check
-- commented because it needs to be set before use -- commented because it needs to be set before use
local mailicon = wibox.widget.imagebox() local mailicon = wibox.widget.imagebox()
local mailwidget = lain.widgets.imap({ local mail = lain.widgets.imap({
timeout = 180, timeout = 180,
server = "server", server = "server",
mail = "mail", mail = "mail",
@ -206,11 +206,11 @@ local mailwidget = lain.widgets.imap({
end end
end end
}) })
]] --]]
-- CPU -- CPU
local cpuicon = wibox.widget.imagebox(beautiful.widget_cpu) local cpuicon = wibox.widget.imagebox(beautiful.widget_cpu)
local cpuwidget = lain.widgets.cpu({ local cpu = lain.widgets.cpu({
settings = function() settings = function()
widget:set_markup(markup("#e33a6e", cpu_now.usage .. "% ")) widget:set_markup(markup("#e33a6e", cpu_now.usage .. "% "))
end end
@ -218,7 +218,7 @@ local cpuwidget = lain.widgets.cpu({
-- Coretemp -- Coretemp
local tempicon = wibox.widget.imagebox(beautiful.widget_temp) local tempicon = wibox.widget.imagebox(beautiful.widget_temp)
local tempwidget = lain.widgets.temp({ local temp = lain.widgets.temp({
settings = function() settings = function()
widget:set_markup(markup("#f1af5f", coretemp_now .. "°C ")) widget:set_markup(markup("#f1af5f", coretemp_now .. "°C "))
end end
@ -226,7 +226,7 @@ local tempwidget = lain.widgets.temp({
-- Battery -- Battery
local baticon = wibox.widget.imagebox(beautiful.widget_batt) local baticon = wibox.widget.imagebox(beautiful.widget_batt)
local batwidget = lain.widgets.bat({ local bat = lain.widgets.bat({
settings = function() settings = function()
if bat_now.perc ~= "N/A" then if bat_now.perc ~= "N/A" then
bat_now.perc = bat_now.perc .. "%" bat_now.perc = bat_now.perc .. "%"
@ -270,7 +270,7 @@ local netupinfo = lain.widgets.net({
-- MEM -- MEM
local memicon = wibox.widget.imagebox(beautiful.widget_mem) local memicon = wibox.widget.imagebox(beautiful.widget_mem)
local memwidget = lain.widgets.mem({ local memory = lain.widgets.mem({
settings = function() settings = function()
widget:set_markup(markup("#e0da37", mem_now.used .. "M ")) widget:set_markup(markup("#e0da37", mem_now.used .. "M "))
end end
@ -407,26 +407,26 @@ awful.screen.connect_for_each_screen(function(s)
{ -- Right widgets { -- Right widgets
layout = wibox.layout.fixed.horizontal, layout = wibox.layout.fixed.horizontal,
wibox.widget.systray(), wibox.widget.systray(),
mailicon, --mailicon,
mailwidget, --mail.widget,
netdownicon, netdownicon,
netdowninfo, netdowninfo,
netupicon, netupicon,
netupinfo, netupinfo.widget,
volicon, volicon,
volume, volume,
memicon, memicon,
memwidget, memory.widget,
cpuicon, cpuicon,
cpuwidget, cpu.widget,
fsicon, fsicon,
fsroot, fsroot.widget,
weathericon, weathericon,
myweather, myweather.widget,
tempicon, tempicon,
tempwidget, temp.widget,
baticon, baticon,
batwidget, bat.widget,
clockicon, clockicon,
mytextclock, mytextclock,
}, },

View file

@ -139,8 +139,7 @@ local separators = lain.util.separators
local clockicon = wibox.widget.imagebox(beautiful.widget_clock) local clockicon = wibox.widget.imagebox(beautiful.widget_clock)
--local mytextclock = wibox.widget.textclock(" %a %d %b %H:%M") --local mytextclock = wibox.widget.textclock(" %a %d %b %H:%M")
local clock = lain.widgets.abase({
local mytextclock = lain.widgets.abase({
timeout = 60, timeout = 60,
cmd = " date +'%a %d %b %R'", cmd = " date +'%a %d %b %R'",
settings = function() settings = function()
@ -159,9 +158,9 @@ lain.widgets.calendar.attach(mytextclock, {
-- Mail IMAP check -- Mail IMAP check
local mailicon = wibox.widget.imagebox(beautiful.widget_mail) local mailicon = wibox.widget.imagebox(beautiful.widget_mail)
mailicon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.util.spawn(mail) end)))
--[[ commented because it needs to be set before use --[[ commented because it needs to be set before use
local mailwidget = lain.widgets.imap({ mailicon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.util.spawn(mail) end)))
local mail = lain.widgets.imap({
timeout = 180, timeout = 180,
server = "server", server = "server",
mail = "mail", mail = "mail",
@ -176,12 +175,12 @@ local mailwidget = lain.widgets.imap({
end end
end end
}) })
]] --]]
-- MPD -- MPD
local mpdicon = wibox.widget.imagebox(beautiful.widget_music) local mpdicon = wibox.widget.imagebox(beautiful.widget_music)
mpdicon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.util.spawn_with_shell(musicplr) end))) mpdicon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.util.spawn_with_shell(musicplr) end)))
local mpdwidget = lain.widgets.mpd({ local mpd = lain.widgets.mpd({
settings = function() settings = function()
if mpd_now.state == "play" then if mpd_now.state == "play" then
artist = " " .. mpd_now.artist .. " " artist = " " .. mpd_now.artist .. " "
@ -202,7 +201,7 @@ local mpdwidget = lain.widgets.mpd({
-- MEM -- MEM
local memicon = wibox.widget.imagebox(beautiful.widget_mem) local memicon = wibox.widget.imagebox(beautiful.widget_mem)
local memwidget = lain.widgets.mem({ local mem = lain.widgets.mem({
settings = function() settings = function()
widget:set_text(" " .. mem_now.used .. "MB ") widget:set_text(" " .. mem_now.used .. "MB ")
end end
@ -210,7 +209,7 @@ local memwidget = lain.widgets.mem({
-- CPU -- CPU
local cpuicon = wibox.widget.imagebox(beautiful.widget_cpu) local cpuicon = wibox.widget.imagebox(beautiful.widget_cpu)
local cpuwidget = lain.widgets.cpu({ local cpu = lain.widgets.cpu({
settings = function() settings = function()
widget:set_text(" " .. cpu_now.usage .. "% ") widget:set_text(" " .. cpu_now.usage .. "% ")
end end
@ -218,7 +217,7 @@ local cpuwidget = lain.widgets.cpu({
-- Coretemp -- Coretemp
local tempicon = wibox.widget.imagebox(beautiful.widget_temp) local tempicon = wibox.widget.imagebox(beautiful.widget_temp)
local tempwidget = lain.widgets.temp({ local temp = lain.widgets.temp({
settings = function() settings = function()
widget:set_text(" " .. coretemp_now .. "°C ") widget:set_text(" " .. coretemp_now .. "°C ")
end end
@ -236,7 +235,7 @@ local fsroot = lain.widgets.fs({
-- Battery -- Battery
local baticon = wibox.widget.imagebox(beautiful.widget_battery) local baticon = wibox.widget.imagebox(beautiful.widget_battery)
local batwidget = lain.widgets.bat({ local bat = lain.widgets.bat({
settings = function() settings = function()
if bat_now.status ~= "N/A" then if bat_now.status ~= "N/A" then
if bat_now.ac_status == 1 then if bat_now.ac_status == 1 then
@ -278,7 +277,7 @@ local volume = lain.widgets.alsa({
-- Net -- Net
local neticon = wibox.widget.imagebox(beautiful.widget_net) local neticon = wibox.widget.imagebox(beautiful.widget_net)
neticon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.util.spawn_with_shell(iptraf) end))) neticon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.util.spawn_with_shell(iptraf) end)))
local netwidget = lain.widgets.net({ local net = lain.widgets.net({
settings = function() settings = function()
widget:set_markup(markup("#7AC82E", " " .. net_now.received) widget:set_markup(markup("#7AC82E", " " .. net_now.received)
.. " " .. .. " " ..
@ -395,33 +394,34 @@ awful.screen.connect_for_each_screen(function(s)
spr, spr,
arrl_ld, arrl_ld,
wibox.container.background(mpdicon, beautiful.bg_focus), wibox.container.background(mpdicon, beautiful.bg_focus),
wibox.container.background(mpdwidget, beautiful.bg_focus), wibox.container.background(mpd.widget, beautiful.bg_focus),
arrl_dl, arrl_dl,
volicon, volicon,
volume, volume.widget,
arrl_ld, arrl_ld,
wibox.container.background(mailicon, beautiful.bg_focus), wibox.container.background(mailicon, beautiful.bg_focus),
--wibox.container.background(mailwidget, beautiful.bg_focus), --wibox.container.background(mail.widget, beautiful.bg_focus),
arrl_dl, arrl_dl,
memicon, memicon,
memwidget, mem.widget,
arrl_ld, arrl_ld,
wibox.container.background(cpuicon, beautiful.bg_focus), wibox.container.background(cpuicon, beautiful.bg_focus),
wibox.container.background(cpuwidget, beautiful.bg_focus), wibox.container.background(cpu.widget, beautiful.bg_focus),
arrl_dl, arrl_dl,
tempicon, tempicon,
tempwidget, temp.widget,
arrl_ld, arrl_ld,
wibox.container.background(fsicon, beautiful.bg_focus), wibox.container.background(fsicon, beautiful.bg_focus),
wibox.container.background(fsroot, beautiful.bg_focus), wibox.container.background(fsroot.widget, beautiful.bg_focus),
arrl_dl, arrl_dl,
baticon, baticon,
batwidget, bat.widget,
arrl_ld, arrl_ld,
wibox.container.background(neticon, beautiful.bg_focus), wibox.container.background(neticon, beautiful.bg_focus),
wibox.container.background(netwidget, beautiful.bg_focus), wibox.container.background(net.widget, beautiful.bg_focus),
arrl_dl, arrl_dl,
mytextclock, clock.widget,
--mytextclock,
spr, spr,
arrl_ld, arrl_ld,
wibox.container.background(s.mylayoutbox, beautiful.bg_focus), wibox.container.background(s.mylayoutbox, beautiful.bg_focus),
@ -612,22 +612,22 @@ globalkeys = awful.util.table.join(
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle") awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",
function () function ()
awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop") awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Left", awful.key({ altkey, "Control" }, "Left",
function () function ()
awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev") awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Right", awful.key({ altkey, "Control" }, "Right",
function () function ()
awful.spawn.with_shell("mpc next || ncmpc next || pms next") awful.spawn.with_shell("mpc next || ncmpc next || pms next")
mpdwidget.update() mpd.update()
end), end),
--]] --]]

View file

@ -152,7 +152,7 @@ lain.widgets.calendar.attach(mytextclock, {
--[[ Mail IMAP check --[[ Mail IMAP check
-- commented because it needs to be set before use -- commented because it needs to be set before use
local mailwidget = lain.widgets.imap({ local mail = lain.widgets.imap({
timeout = 180, timeout = 180,
server = "server", server = "server",
mail = "mail", mail = "mail",
@ -174,7 +174,7 @@ local mailwidget = lain.widgets.imap({
]] ]]
-- MPD -- MPD
local mpdwidget = lain.widgets.mpd({ local mpd = lain.widgets.mpd({
settings = function() settings = function()
mpd_notification_preset.fg = white mpd_notification_preset.fg = white
@ -356,9 +356,9 @@ awful.screen.connect_for_each_screen(function(s)
layout = wibox.layout.fixed.horizontal, layout = wibox.layout.fixed.horizontal,
wibox.widget.systray(), wibox.widget.systray(),
spr, spr,
mpdwidget, mpd.widget,
mailwidget, --mail.widget,
fshome, fshome.widget,
volumewidget, volumewidget,
mytextclock, mytextclock,
}, },
@ -549,22 +549,22 @@ globalkeys = awful.util.table.join(
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle") awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",
function () function ()
awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop") awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Left", awful.key({ altkey, "Control" }, "Left",
function () function ()
awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev") awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Right", awful.key({ altkey, "Control" }, "Right",
function () function ()
awful.spawn.with_shell("mpc next || ncmpc next || pms next") awful.spawn.with_shell("mpc next || ncmpc next || pms next")
mpdwidget.update() mpd.update()
end), end),
--]] --]]

View file

@ -144,12 +144,13 @@ local mytextclock = wibox.widget.textclock(" %H:%M ")
lain.widgets.calendar.attach(mytextclock, { lain.widgets.calendar.attach(mytextclock, {
notification_preset = { notification_preset = {
font = "Tamsyn 10.5", font = "Tamsyn 10.5",
fg = white, fg = gray,
bg = beautiful.bg_normal bg = beautiful.bg_normal
}}) }})
-- Mail IMAP check --[[ Mail IMAP check
local mailwidget = lain.widgets.imap({ -- commented because it needs to be set before use
local mail = lain.widgets.imap({
timeout = 180, timeout = 180,
server = "server", server = "server",
mail = "mail", mail = "mail",
@ -166,9 +167,10 @@ local mailwidget = lain.widgets.imap({
widget:set_markup(markup(gray, mail) .. count) widget:set_markup(markup(gray, mail) .. count)
end end
}) })
--]]
-- MPD -- MPD
local mpdwidget = lain.widgets.mpd({ local mpd = lain.widgets.mpd({
settings = function() settings = function()
artist = mpd_now.artist .. " " artist = mpd_now.artist .. " "
title = mpd_now.title .. " " title = mpd_now.title .. " "
@ -186,14 +188,14 @@ local mpdwidget = lain.widgets.mpd({
}) })
-- CPU -- CPU
local cpuwidget = lain.widgets.sysload({ local cpu = lain.widgets.sysload({
settings = function() settings = function()
widget:set_markup(markup(gray, " Cpu ") .. load_1 .. " ") widget:set_markup(markup(gray, " Cpu ") .. load_1 .. " ")
end end
}) })
-- MEM -- MEM
local memwidget = lain.widgets.mem({ local mem = lain.widgets.mem({
settings = function() settings = function()
widget:set_markup(markup(gray, " Mem ") .. mem_now.used .. " ") widget:set_markup(markup(gray, " Mem ") .. mem_now.used .. " ")
end end
@ -201,12 +203,13 @@ local memwidget = lain.widgets.mem({
-- /home fs -- /home fs
local fshome = lain.widgets.fs({ local fshome = lain.widgets.fs({
options = "--exclude-type=tmpfs",
partition = "/home", partition = "/home",
notification_preset = { fg = beautiful.fg_normal, bg = beautiful.bg_normal, font = "Tamsyn 10.5" }, notification_preset = { fg = beautiful.fg_normal, bg = beautiful.bg_normal, font = "Tamsyn 10.5" },
}) })
-- Battery -- Battery
local batwidget = lain.widgets.bat({ local bat = lain.widgets.bat({
settings = function() settings = function()
bat_perc = bat_now.perc bat_perc = bat_now.perc
if bat_now.ac_status == 1 then bat_perc = "Plug" end if bat_now.ac_status == 1 then bat_perc = "Plug" end
@ -215,7 +218,7 @@ local batwidget = lain.widgets.bat({
}) })
-- Net checker -- Net checker
local netwidget = lain.widgets.net({ local net = lain.widgets.net({
settings = function() settings = function()
if net_now.state == "up" then net_state = "On" if net_now.state == "up" then net_state = "On"
else net_state = "Off" end else net_state = "Off" end
@ -373,13 +376,13 @@ awful.screen.connect_for_each_screen(function(s)
layout = wibox.layout.fixed.horizontal, layout = wibox.layout.fixed.horizontal,
wibox.widget.systray(), wibox.widget.systray(),
spr, spr,
mpdwidget, mpd.widget,
mailwidget, --mail.widget,
cpuwidget, cpu.widget,
memwidget, mem.widget,
batwidget, bat.widget,
netwidget, net.widget,
volume, volume.widget,
mytextclock mytextclock
}, },
} }
@ -569,22 +572,22 @@ globalkeys = awful.util.table.join(
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle") awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",
function () function ()
awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop") awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Left", awful.key({ altkey, "Control" }, "Left",
function () function ()
awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev") awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
mpdwidget.update() mpd.update()
end), end),
awful.key({ altkey, "Control" }, "Right", awful.key({ altkey, "Control" }, "Right",
function () function ()
awful.spawn.with_shell("mpc next || ncmpc next || pms next") awful.spawn.with_shell("mpc next || ncmpc next || pms next")
mpdwidget.update() mpd.update()
end), end),
--]] --]]