From f7279e9fc94c90317224acd37cfc4d841b3cc1d4 Mon Sep 17 00:00:00 2001 From: Luca CPZ Date: Fri, 16 Feb 2018 17:56:03 +0100 Subject: [PATCH] lain: new commit --- lain | 2 +- themes/blackburn/theme.lua | 6 ++---- themes/copland/theme.lua | 6 ++---- themes/dremora/theme.lua | 6 ++---- themes/holo/theme.lua | 5 ++--- themes/multicolor/theme.lua | 4 +--- themes/powerarrow-dark/theme.lua | 3 +-- themes/powerarrow/theme.lua | 4 ++-- themes/rainbow/theme.lua | 13 +++++-------- themes/steamburn/theme.lua | 1 - 10 files changed, 18 insertions(+), 32 deletions(-) diff --git a/lain b/lain index 003beff..24ca585 160000 --- a/lain +++ b/lain @@ -1 +1 @@ -Subproject commit 003beff59fee7b42233326c57f545419c67e592c +Subproject commit 24ca5856dcc2995af4662d0c4eedb7f8452da53a diff --git a/themes/blackburn/theme.lua b/themes/blackburn/theme.lua index cfc209d..26f3187 100644 --- a/themes/blackburn/theme.lua +++ b/themes/blackburn/theme.lua @@ -133,16 +133,14 @@ theme.mpd = lain.widget.mpd({ -- /home 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" }, settings = function() fs_header = "" fs_p = "" - if tonumber(fs_now.used) >= 90 then + if fs_now["/home"].percentage >= 90 then fs_header = " Hdd " - fs_p = fs_now.used + fs_p = fs_now["/home"].percentage end widget:set_markup(markup.font(theme.font, markup(gray, fs_header) .. fs_p)) diff --git a/themes/copland/theme.lua b/themes/copland/theme.lua index 703460d..aaef5cc 100644 --- a/themes/copland/theme.lua +++ b/themes/copland/theme.lua @@ -215,16 +215,14 @@ local fsbar = wibox.widget { widget = wibox.widget.progressbar, } 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" }, settings = function() - if tonumber(fs_now.used) < 90 then + if fs_now["/home"].percentage < 90 then fsbar:set_color(theme.fg_normal) else fsbar:set_color("#EB8F8F") end - fsbar:set_value(fs_now.used / 100) + fsbar:set_value(fs_now["/home"].percentage / 100) end }) local fsbg = wibox.container.background(fsbar, "#474747", gears.shape.rectangle) diff --git a/themes/dremora/theme.lua b/themes/dremora/theme.lua index 4f30a97..c3d8ca0 100644 --- a/themes/dremora/theme.lua +++ b/themes/dremora/theme.lua @@ -134,16 +134,14 @@ theme.mpd = lain.widget.mpd({ -- /home 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" }, settings = function() fs_header = "" fs_p = "" - if tonumber(fs_now.used) >= 90 then + if fs_now["/home"].percentage >= 90 then fs_header = " Hdd " - fs_p = fs_now.used + fs_p = fs_now["/home"].percentage end widget:set_markup(markup.font(theme.font, markup(gray, fs_header) .. markup(white, fs_p))) diff --git a/themes/holo/theme.lua b/themes/holo/theme.lua index 2d28dc0..8f98008 100644 --- a/themes/holo/theme.lua +++ b/themes/holo/theme.lua @@ -213,11 +213,10 @@ local bat = lain.widget.bat({ end }) --]] --- + -- 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 diff --git a/themes/multicolor/theme.lua b/themes/multicolor/theme.lua index d67b985..dc1a496 100644 --- a/themes/multicolor/theme.lua +++ b/themes/multicolor/theme.lua @@ -43,7 +43,6 @@ theme.widget_cpu = theme.confdir .. "/icons/cpu.p theme.widget_weather = theme.confdir .. "/icons/dish.png" theme.widget_fs = theme.confdir .. "/icons/fs.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_on = theme.confdir .. "/icons/note_on.png" theme.widget_netdown = theme.confdir .. "/icons/net_down.png" @@ -125,10 +124,9 @@ theme.weather = lain.widget.weather({ -- / fs local fsicon = wibox.widget.imagebox(theme.widget_fs) theme.fs = lain.widget.fs({ - options = "--exclude-type=tmpfs", notification_preset = { font = "xos4 Terminus 10", fg = theme.fg_normal }, 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 }) diff --git a/themes/powerarrow-dark/theme.lua b/themes/powerarrow-dark/theme.lua index 2e6dec9..af89380 100644 --- a/themes/powerarrow-dark/theme.lua +++ b/themes/powerarrow-dark/theme.lua @@ -193,10 +193,9 @@ local temp = lain.widget.temp({ -- / fs local fsicon = wibox.widget.imagebox(theme.widget_hdd) theme.fs = lain.widget.fs({ - options = "--exclude-type=tmpfs", notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "xos4 Terminus 10" }, settings = function() - widget:set_markup(markup.font(theme.font, " " .. fs_now.used .. "% ")) + widget:set_markup(markup.font(theme.font, " " .. fs_now["/"].percentage .. "% ")) end }) diff --git a/themes/powerarrow/theme.lua b/themes/powerarrow/theme.lua index 547e56f..185d922 100644 --- a/themes/powerarrow/theme.lua +++ b/themes/powerarrow/theme.lua @@ -229,10 +229,10 @@ local tempicon = wibox.widget.imagebox(theme.widget_temp) -- / fs local fsicon = wibox.widget.imagebox(theme.widget_hdd) theme.fs = lain.widget.fs({ - options = "--exclude-type=tmpfs", notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "xos4 Terminus 10" }, 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 }) diff --git a/themes/rainbow/theme.lua b/themes/rainbow/theme.lua index 5b34a68..55243ba 100644 --- a/themes/rainbow/theme.lua +++ b/themes/rainbow/theme.lua @@ -146,19 +146,16 @@ theme.mpd = lain.widget.mpd({ -- /home 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" }, settings = function() - hdd = "" - p = "" + local fs_header, fs_p = "", "" - if tonumber(fs_now.used) >= 90 then - hdd = " Hdd " - p = fs_now.used .. " " + if fs_now["/home"].percentage >= 90 then + fs_header = " Hdd " + fs_p = fs_now["/home"].percentage 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 }) diff --git a/themes/steamburn/theme.lua b/themes/steamburn/theme.lua index 0056979..20073a9 100644 --- a/themes/steamburn/theme.lua +++ b/themes/steamburn/theme.lua @@ -149,7 +149,6 @@ local mem = lain.widget.mem({ -- /home fs theme.fs = lain.widget.fs({ - options = "--exclude-type=tmpfs", partition = "/home", notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "Misc Tamsyn 10.5" }, })