lain: new commit

This commit is contained in:
Luca CPZ 2018-02-16 17:56:03 +01:00
parent 269672fd08
commit f7279e9fc9
10 changed files with 18 additions and 32 deletions

2
lain

@ -1 +1 @@
Subproject commit 003beff59fee7b42233326c57f545419c67e592c Subproject commit 24ca5856dcc2995af4662d0c4eedb7f8452da53a

View File

@ -133,16 +133,14 @@ theme.mpd = lain.widget.mpd({
-- /home fs -- /home fs
theme.fs = lain.widget.fs({ theme.fs = lain.widget.fs({
partition = "/home",
options = "--exclude-type=tmpfs",
notification_preset = { fg = white, bg = theme.bg_normal, font = "Misc Tamsyn 10.5" }, notification_preset = { fg = white, bg = theme.bg_normal, font = "Misc Tamsyn 10.5" },
settings = function() settings = function()
fs_header = "" fs_header = ""
fs_p = "" fs_p = ""
if tonumber(fs_now.used) >= 90 then if fs_now["/home"].percentage >= 90 then
fs_header = " Hdd " fs_header = " Hdd "
fs_p = fs_now.used fs_p = fs_now["/home"].percentage
end end
widget:set_markup(markup.font(theme.font, markup(gray, fs_header) .. fs_p)) widget:set_markup(markup.font(theme.font, markup(gray, fs_header) .. fs_p))

View File

@ -215,16 +215,14 @@ local fsbar = wibox.widget {
widget = wibox.widget.progressbar, widget = wibox.widget.progressbar,
} }
theme.fs = lain.widget.fs({ theme.fs = lain.widget.fs({
partition = "/home",
options = "--exclude-type=tmpfs",
notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "Tamzen 10.5" }, notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "Tamzen 10.5" },
settings = function() settings = function()
if tonumber(fs_now.used) < 90 then if fs_now["/home"].percentage < 90 then
fsbar:set_color(theme.fg_normal) fsbar:set_color(theme.fg_normal)
else else
fsbar:set_color("#EB8F8F") fsbar:set_color("#EB8F8F")
end end
fsbar:set_value(fs_now.used / 100) fsbar:set_value(fs_now["/home"].percentage / 100)
end end
}) })
local fsbg = wibox.container.background(fsbar, "#474747", gears.shape.rectangle) local fsbg = wibox.container.background(fsbar, "#474747", gears.shape.rectangle)

View File

@ -134,16 +134,14 @@ theme.mpd = lain.widget.mpd({
-- /home fs -- /home fs
theme.fs = lain.widget.fs({ theme.fs = lain.widget.fs({
partition = "/home",
options = "--exclude-type=tmpfs",
notification_preset = { fg = white, bg = theme.bg_normal, font = "Misc Tamsyn 10.5" }, notification_preset = { fg = white, bg = theme.bg_normal, font = "Misc Tamsyn 10.5" },
settings = function() settings = function()
fs_header = "" fs_header = ""
fs_p = "" fs_p = ""
if tonumber(fs_now.used) >= 90 then if fs_now["/home"].percentage >= 90 then
fs_header = " Hdd " fs_header = " Hdd "
fs_p = fs_now.used fs_p = fs_now["/home"].percentage
end end
widget:set_markup(markup.font(theme.font, markup(gray, fs_header) .. markup(white, fs_p))) widget:set_markup(markup.font(theme.font, markup(gray, fs_header) .. markup(white, fs_p)))

View File

@ -213,11 +213,10 @@ local bat = lain.widget.bat({
end end
}) })
--]] --]]
--
-- fs -- fs
theme.fs = lain.widget.fs({ theme.fs = lain.widget.fs({
options = "--exclude-type=tmpfs", notification_preset = { bg = theme.bg_normal, font = "Monospace 9" },
notification_preset = { bg = theme.bg_normal, font = "Monospace 9, " },
}) })
-- ALSA volume bar -- ALSA volume bar

View File

@ -43,7 +43,6 @@ theme.widget_cpu = theme.confdir .. "/icons/cpu.p
theme.widget_weather = theme.confdir .. "/icons/dish.png" theme.widget_weather = theme.confdir .. "/icons/dish.png"
theme.widget_fs = theme.confdir .. "/icons/fs.png" theme.widget_fs = theme.confdir .. "/icons/fs.png"
theme.widget_mem = theme.confdir .. "/icons/mem.png" theme.widget_mem = theme.confdir .. "/icons/mem.png"
theme.widget_fs = theme.confdir .. "/icons/fs.png"
theme.widget_note = theme.confdir .. "/icons/note.png" theme.widget_note = theme.confdir .. "/icons/note.png"
theme.widget_note_on = theme.confdir .. "/icons/note_on.png" theme.widget_note_on = theme.confdir .. "/icons/note_on.png"
theme.widget_netdown = theme.confdir .. "/icons/net_down.png" theme.widget_netdown = theme.confdir .. "/icons/net_down.png"
@ -125,10 +124,9 @@ theme.weather = lain.widget.weather({
-- / fs -- / fs
local fsicon = wibox.widget.imagebox(theme.widget_fs) local fsicon = wibox.widget.imagebox(theme.widget_fs)
theme.fs = lain.widget.fs({ theme.fs = lain.widget.fs({
options = "--exclude-type=tmpfs",
notification_preset = { font = "xos4 Terminus 10", fg = theme.fg_normal }, notification_preset = { font = "xos4 Terminus 10", fg = theme.fg_normal },
settings = function() settings = function()
widget:set_markup(markup.fontfg(theme.font, "#80d9d8", fs_now.used .. "% ")) widget:set_markup(markup.fontfg(theme.font, "#80d9d8", fs_now["/"].percentage .. "% "))
end end
}) })

View File

@ -193,10 +193,9 @@ local temp = lain.widget.temp({
-- / fs -- / fs
local fsicon = wibox.widget.imagebox(theme.widget_hdd) local fsicon = wibox.widget.imagebox(theme.widget_hdd)
theme.fs = lain.widget.fs({ theme.fs = lain.widget.fs({
options = "--exclude-type=tmpfs",
notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "xos4 Terminus 10" }, notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "xos4 Terminus 10" },
settings = function() settings = function()
widget:set_markup(markup.font(theme.font, " " .. fs_now.used .. "% ")) widget:set_markup(markup.font(theme.font, " " .. fs_now["/"].percentage .. "% "))
end end
}) })

View File

@ -229,10 +229,10 @@ local tempicon = wibox.widget.imagebox(theme.widget_temp)
-- / fs -- / fs
local fsicon = wibox.widget.imagebox(theme.widget_hdd) local fsicon = wibox.widget.imagebox(theme.widget_hdd)
theme.fs = lain.widget.fs({ theme.fs = lain.widget.fs({
options = "--exclude-type=tmpfs",
notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "xos4 Terminus 10" }, notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "xos4 Terminus 10" },
settings = function() settings = function()
widget:set_markup(markup.font(theme.font, " " .. fs_now.available_gb .. "GB ")) local fsp = string.format(" %3.2f %s ", fs_now["/"].free, fs_now["/"].units)
widget:set_markup(markup.font(theme.font, fsp))
end end
}) })

View File

@ -146,19 +146,16 @@ theme.mpd = lain.widget.mpd({
-- /home fs -- /home fs
theme.fs = lain.widget.fs({ theme.fs = lain.widget.fs({
partition = "/home",
options = "--exclude-type=tmpfs",
notification_preset = { fg = white, bg = theme.bg_normal, font = "Misc Tamsyn 10.5" }, notification_preset = { fg = white, bg = theme.bg_normal, font = "Misc Tamsyn 10.5" },
settings = function() settings = function()
hdd = "" local fs_header, fs_p = "", ""
p = ""
if tonumber(fs_now.used) >= 90 then if fs_now["/home"].percentage >= 90 then
hdd = " Hdd " fs_header = " Hdd "
p = fs_now.used .. " " fs_p = fs_now["/home"].percentage
end end
widget:set_markup(markup.font(theme.font, markup(gray, hdd) .. markup(white, p))) widget:set_markup(markup.font(theme.font, markup(gray, fs_header) .. markup(white, fs_p)))
end end
}) })

View File

@ -149,7 +149,6 @@ local mem = lain.widget.mem({
-- /home fs -- /home fs
theme.fs = lain.widget.fs({ theme.fs = lain.widget.fs({
options = "--exclude-type=tmpfs",
partition = "/home", partition = "/home",
notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "Misc Tamsyn 10.5" }, notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "Misc Tamsyn 10.5" },
}) })