From a9c8b6fa2f7f121c5b8cc9092de4d5eacab8a837 Mon Sep 17 00:00:00 2001 From: Eric Blanchette Date: Thu, 8 May 2014 10:30:36 -0400 Subject: [PATCH 1/6] Fixed crashes with missing program names --- freedesktop/utils.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freedesktop/utils.lua b/freedesktop/utils.lua index c5247c3..f9358e7 100644 --- a/freedesktop/utils.lua +++ b/freedesktop/utils.lua @@ -190,7 +190,7 @@ function parse_desktop_file(arg) end end - if program.Exec then + if program.Exec and program.Name then local cmdline = program.Exec:gsub('%%c', program.Name) cmdline = cmdline:gsub('%%[fmuFMU]', '') cmdline = cmdline:gsub('%%k', program.file) From 7e995b60354dbfb36dc168efcc766eb0817e4363 Mon Sep 17 00:00:00 2001 From: Eric Blanchette Date: Thu, 8 May 2014 11:54:19 -0400 Subject: [PATCH 2/6] Added weather --- rc.lua.powerarrow-darker | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker index 95e09b7..7baad1c 100644 --- a/rc.lua.powerarrow-darker +++ b/rc.lua.powerarrow-darker @@ -117,6 +117,15 @@ mytextclock = awful.widget.textclock(" %a %d %b %H:%M") -- calendar lain.widgets.calendar:attach(mytextclock, { font_size = 10 }) +-- Weather +weathericon = wibox.widget.imagebox(beautiful.widget_weather) +yawn = lain.widgets.yawn(3534, { + settings = function() + widget:set_markup(markup("#eca4c4", forecast:lower() .. " @ " .. units .. "°C ")) + end +}) + + -- Mail IMAP check mailicon = wibox.widget.imagebox(beautiful.widget_mail) mailicon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.util.spawn(mail) end))) @@ -342,6 +351,12 @@ for s = 1, screen.count() do right_layout:add(arrl_ld) right_layout:add(mailicon) --right_layout:add(mailwidget) + + right_layout:add(arrl_dl) + right_layout:add(weathericon) + right_layout:add(yawn.widget) + + right_layout:add(arrl_dl) right_layout:add(memicon) right_layout:add(memwidget) From 4f2a74e8e8d38cff85cd716c5f28621ee1ea8896 Mon Sep 17 00:00:00 2001 From: kelpine Date: Thu, 8 May 2014 11:21:08 -0500 Subject: [PATCH 3/6] added weather --- rc.lua.powerarrow-darker | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker index 95e09b7..3a1b698 100644 --- a/rc.lua.powerarrow-darker +++ b/rc.lua.powerarrow-darker @@ -74,6 +74,7 @@ graphics = "gimp" mail = terminal .. " -e mutt " iptraf = terminal .. " -g 180x54-20+34 -e sudo iptraf-ng -i all " musicplr = terminal .. " -g 130x34-320+16 -e ncmpcpp " +yahoo_oid = "2972" local layouts = { awful.layout.suit.floating, @@ -117,6 +118,15 @@ mytextclock = awful.widget.textclock(" %a %d %b %H:%M") -- calendar lain.widgets.calendar:attach(mytextclock, { font_size = 10 }) +-- Weather +weathericon = wibox.widget.imagebox(beautiful.widget_weather) +yawn = lain.widgets.yawn(yahoo_oid, { + settings = function() + widget:set_markup(markup("#eca4c4", forecast:lower() .. " @ " .. units .. "°C ")) + end +}) + + -- Mail IMAP check mailicon = wibox.widget.imagebox(beautiful.widget_mail) mailicon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.util.spawn(mail) end))) @@ -342,6 +352,12 @@ for s = 1, screen.count() do right_layout:add(arrl_ld) right_layout:add(mailicon) --right_layout:add(mailwidget) + + right_layout:add(arrl_dl) + right_layout:add(weathericon) + right_layout:add(yawn.widget) + + right_layout:add(arrl_dl) right_layout:add(memicon) right_layout:add(memwidget) From 8f23cd6edbe20e494cb8151d5f4756ab4cd222e3 Mon Sep 17 00:00:00 2001 From: Eric Blanchette Date: Thu, 8 May 2014 12:27:33 -0400 Subject: [PATCH 4/6] Fixed layout --- rc.lua.powerarrow-darker | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker index 7baad1c..2a58035 100644 --- a/rc.lua.powerarrow-darker +++ b/rc.lua.powerarrow-darker @@ -351,12 +351,9 @@ for s = 1, screen.count() do right_layout:add(arrl_ld) right_layout:add(mailicon) --right_layout:add(mailwidget) - - right_layout:add(arrl_dl) - right_layout:add(weathericon) - right_layout:add(yawn.widget) - - + right_layout:add(arrl_dl) + right_layout:add(weathericon) + right_layout:add(yawn.widget) right_layout:add(arrl_dl) right_layout:add(memicon) right_layout:add(memwidget) From d446f26b736808e3952278e3a966a16cfae5ce36 Mon Sep 17 00:00:00 2001 From: kelpine Date: Thu, 8 May 2014 13:42:46 -0500 Subject: [PATCH 5/6] packed arrowbar --- rc.lua.powerarrow-darker | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker index 3a1b698..63eb0f1 100644 --- a/rc.lua.powerarrow-darker +++ b/rc.lua.powerarrow-darker @@ -122,7 +122,7 @@ lain.widgets.calendar:attach(mytextclock, { font_size = 10 }) weathericon = wibox.widget.imagebox(beautiful.widget_weather) yawn = lain.widgets.yawn(yahoo_oid, { settings = function() - widget:set_markup(markup("#eca4c4", forecast:lower() .. " @ " .. units .. "°C ")) + widget:set_markup(markup("#eca4c4", forecast:lower() .. " @ " .. units .. "°C")) end }) @@ -175,7 +175,7 @@ mpdwidgetbg = wibox.widget.background(mpdwidget, "#313131") memicon = wibox.widget.imagebox(beautiful.widget_mem) memwidget = lain.widgets.mem({ settings = function() - widget:set_text(" " .. mem_now.used .. "MB ") + widget:set_text("" .. mem_now.used .. "MB") end }) @@ -183,7 +183,8 @@ memwidget = lain.widgets.mem({ cpuicon = wibox.widget.imagebox(beautiful.widget_cpu) cpuwidget = wibox.widget.background(lain.widgets.cpu({ settings = function() - widget:set_text(" " .. cpu_now.usage .. "% ") + + widget:set_text("" .. cpu_now.usage .. "%") end }), "#313131") @@ -191,7 +192,7 @@ cpuwidget = wibox.widget.background(lain.widgets.cpu({ tempicon = wibox.widget.imagebox(beautiful.widget_temp) tempwidget = lain.widgets.temp({ settings = function() - widget:set_text(" " .. coretemp_now .. "°C ") + widget:set_text("" .. coretemp_now .. "°C") end }) @@ -199,7 +200,7 @@ tempwidget = lain.widgets.temp({ fsicon = wibox.widget.imagebox(beautiful.widget_hdd) fswidget = lain.widgets.fs({ settings = function() - widget:set_text(" " .. fs_now.used .. "% ") + widget:set_text("" .. fs_now.used .. "%") end }) fswidgetbg = wibox.widget.background(fswidget, "#313131") @@ -219,7 +220,7 @@ batwidget = lain.widgets.bat({ else baticon:set_image(beautiful.widget_battery) end - widget:set_markup(" " .. bat_now.perc .. "% ") + widget:set_markup(bat_now.perc .. "%") end }) @@ -237,7 +238,7 @@ volumewidget = lain.widgets.alsa({ volicon:set_image(beautiful.widget_vol) end - widget:set_text(" " .. volume_now.level .. "% ") + widget:set_text("" .. volume_now.level .. "%") end }) @@ -246,9 +247,9 @@ neticon = wibox.widget.imagebox(beautiful.widget_net) neticon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.util.spawn_with_shell(iptraf) end))) netwidget = wibox.widget.background(lain.widgets.net({ settings = function() - widget:set_markup(markup("#7AC82E", " " .. net_now.received) + widget:set_markup(markup("#7AC82E", "" .. net_now.received) .. " " .. - markup("#46A8C3", " " .. net_now.sent .. " ")) + markup("#46A8C3", "" .. net_now.sent .. "")) end }), "#313131") From 7861db85f7bfa009410a22d546b7022d04cb351c Mon Sep 17 00:00:00 2001 From: kelpine Date: Fri, 9 May 2014 11:31:37 -0500 Subject: [PATCH 6/6] Battery status fix --- rc.lua.powerarrow-darker | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker index 63eb0f1..ba9d5db 100644 --- a/rc.lua.powerarrow-darker +++ b/rc.lua.powerarrow-darker @@ -208,7 +208,11 @@ fswidgetbg = wibox.widget.background(fswidget, "#313131") -- Battery baticon = wibox.widget.imagebox(beautiful.widget_battery) batwidget = lain.widgets.bat({ + timeout=5, settings = function() + + + if bat_now.perc == "N/A" then widget:set_markup(" AC ") baticon:set_image(beautiful.widget_ac) @@ -221,6 +225,11 @@ batwidget = lain.widgets.bat({ baticon:set_image(beautiful.widget_battery) end widget:set_markup(bat_now.perc .. "%") + + --Fix for battery charging ;) + if bat_now.status == "Charging" or bat_now.status == "Unknown" then + baticon:set_image(beautiful.widget_ac) + end end })