From 9fc4f451e44a61751f05921d03a099efd01ef74c Mon Sep 17 00:00:00 2001 From: ache Date: Mon, 17 Jul 2017 00:30:20 +0200 Subject: New design for the systray --- rc.lua | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/rc.lua b/rc.lua index f8fb5a1..4ccc60e 100644 --- a/rc.lua +++ b/rc.lua @@ -127,7 +127,12 @@ lain.widgets.calendar:attach(mytextclock) -- CPU cpuwidget = lain.widgets.cpu({ settings = function() - widget:set_markup(markup("#cbcbcb", "") .. cpu_now.usage .. "%") + int_cpu_usage = tonumber(cpu_now.usage) + if int_cpu_usage <= 9 then + widget:set_markup(markup("#cbcbcb", "") .. "⋅" .. cpu_now.usage .. "%") + else + widget:set_markup(markup("#cbcbcb", "") .. cpu_now.usage .. "%") + end end }) @@ -159,7 +164,16 @@ vicious.register(mpdwidget, vicious.widgets.mpd, -- MEM memwidget = lain.widgets.mem({ settings = function() - widget:set_markup(markup("#cbcbcb", " ⌥ ") .. mem_now.used .. " Mb") + int_mem_now_used = tonumber(mem_now.used) + if int_mem_now_used <= 99 then + widget:set_markup(markup("#cbcbcb", " ⚠") .. "⋅⋅" .. mem_now.used .. " ☣") + else + if int_mem_now_used <= 999 then + widget:set_markup(markup("#cbcbcb", " ⚠") .. "⋅" .. mem_now.used .. " ☣") + else + widget:set_markup(markup("#cbcbcb", " ⚠") .. mem_now.used .. " ☣") + end + end end }) @@ -167,10 +181,22 @@ memwidget = lain.widgets.mem({ -- ALSA volume volumewidget = lain.widgets.alsa({ settings = function() - header = " ⌘ " - vlevel = volume_now.level + header = " " + + int_volume_level = tonumber(volume_now.level) + + if int_volume_level == 100 then + vlevel = "MX" + else + if int_volume_level <= 9 then + vlevel = "⋅" .. volume_now.level + else + vlevel = volume_now.level + end + end + if volume_now.status == "off" then - vlevel = vlevel .. "%🔇" + vlevel = vlevel .. "#" else vlevel = vlevel .. "% " end @@ -237,7 +263,7 @@ function act() if res == "0\n" then myemailwidget:set_text ( "" ) elseif res == "" then - myemailwidget:set_text ( "❌" ) + myemailwidget:set_text ( "☠" ) else myemailwidget:set_text ( "📧" ) naughty.notify({ preset = naughty.config.presets.normal, -- cgit v1.2.3