]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

bat: replaced tabs with spaces and removed whitespaces
authorLuke Bonham <dada@archlinux.info>
Thu, 31 Mar 2016 09:54:37 +0000 (11:54 +0200)
committerLuke Bonham <dada@archlinux.info>
Thu, 31 Mar 2016 09:54:37 +0000 (11:54 +0200)
widgets/bat.lua

index 61ad6a33ebb5b8a722e18d5329887fe81b1741c6..d84883e81d31cee3454dbc178a2e96e34851b770 100644 (file)
@@ -34,19 +34,19 @@ local function worker(args)
        bat.widget = wibox.widget.textbox('')
 
        bat_notification_low_preset = {
        bat.widget = wibox.widget.textbox('')
 
        bat_notification_low_preset = {
-               title = "Battery low",
-               text = "Plug the cable!",
+        title   = "Battery low",
+               text    = "Plug the cable!",
                timeout = 15,
                timeout = 15,
-               fg = "#202020",
-               bg = "#CDCDCD"
+               fg      = "#202020",
+               bg      = "#CDCDCD"
        }
 
        bat_notification_critical_preset = {
        }
 
        bat_notification_critical_preset = {
-               title = "Battery exhausted",
-               text = "Shutdown imminent",
+               title   = "Battery exhausted",
+               text    = "Shutdown imminent",
                timeout = 15,
                timeout = 15,
-               fg = "#000000",
-               bg = "#FFFFFF"
+               fg      = "#000000",
+               bg      = "#FFFFFF"
        }
 
        function update()
        }
 
        function update()
@@ -69,20 +69,20 @@ local function worker(args)
                        local rate_voltage      = tonumber(first_line(bstr .. "/voltage_now"))
                        local rate_power        = tonumber(first_line(bstr .. "/power_now"))
 
                        local rate_voltage      = tonumber(first_line(bstr .. "/voltage_now"))
                        local rate_power        = tonumber(first_line(bstr .. "/power_now"))
 
-                       -- energy_now(P)[uWh], charge_now(I)[uAh] 
+                       -- energy_now(P)[uWh], charge_now(I)[uAh]
                        local energy_now        = tonumber(first_line(bstr .. "/energy_now") or
                        local energy_now        = tonumber(first_line(bstr .. "/energy_now") or
-                                                                               first_line(bstr .. "/charge_now"))
-                                                 
-                       -- energy_full(P)[uWh], charge_full(I)[uAh],                       
+                                      first_line(bstr .. "/charge_now"))
+
+                       -- energy_full(P)[uWh], charge_full(I)[uAh],
                        local energy_full       = tonumber(first_line(bstr .. "/energy_full") or
                        local energy_full       = tonumber(first_line(bstr .. "/energy_full") or
-                                                                               first_line(bstr .. "/charge_full"))
+                                      first_line(bstr .. "/charge_full"))
 
 
                        local energy_percentage = tonumber(first_line(bstr .. "/capacity")) or
 
 
                        local energy_percentage = tonumber(first_line(bstr .. "/capacity")) or
-                                                                               math.floor((energy_now / energy_full) * 100)
+                                      math.floor((energy_now / energy_full) * 100)
 
 
-                       bat_now.status = first_line(bstr .. "/status") or "N/A"
-                       bat_now.ac_status     = first_line(astr .. "/online") or "N/A"
+                       bat_now.status    = first_line(bstr .. "/status") or "N/A"
+                       bat_now.ac_status = first_line(astr .. "/online") or "N/A"
 
                        -- if rate = 0 or rate not defined skip the round
                        if      not (rate_power and rate_power > 0) and
 
                        -- if rate = 0 or rate not defined skip the round
                        if      not (rate_power and rate_power > 0) and
@@ -91,13 +91,11 @@ local function worker(args)
                        then
                                return
                        end
                        then
                                return
                        end
-                       
+
                        local rate_time = 0
                        local rate_time = 0
-                       if bat_now.status == "Charging"
-                       then
+                       if bat_now.status == "Charging" then
                                rate_time = (energy_full - energy_now) / rate_power or rate_current
                                rate_time = (energy_full - energy_now) / rate_power or rate_current
-                       elseif bat_now.status == "Discharging"
-                       then
+                       elseif bat_now.status == "Discharging" then
                                rate_time = energy_now / rate_power or rate_current
                        end
 
                                rate_time = energy_now / rate_power or rate_current
                        end
 
@@ -107,23 +105,20 @@ local function worker(args)
                        bat_now.perc = string.format("%d", energy_percentage)
                        bat_now.time = string.format("%02d:%02d", hours, minutes)
                        bat_now.watt = string.format("%.2fW", rate_power / 1e6 or (rate_voltage * rate_current)  / 1e12)
                        bat_now.perc = string.format("%d", energy_percentage)
                        bat_now.time = string.format("%02d:%02d", hours, minutes)
                        bat_now.watt = string.format("%.2fW", rate_power / 1e6 or (rate_voltage * rate_current)  / 1e12)
-               
                end
                end
+
                widget = bat.widget
                settings()
 
                -- notifications for low and critical states
                widget = bat.widget
                settings()
 
                -- notifications for low and critical states
-               if bat_now.status == "Discharging" and notify == "on" and bat_now.perc
-               then
+               if bat_now.status == "Discharging" and notify == "on" and bat_now.perc then
                        local nperc = tonumber(bat_now.perc) or 100
                        local nperc = tonumber(bat_now.perc) or 100
-                       if nperc <= 5
-                       then
+                       if nperc <= 5 then
                                bat.id = naughty.notify({
                                        preset = bat_notification_critical_preset,
                                        replaces_id = bat.id,
                                }).id
                                bat.id = naughty.notify({
                                        preset = bat_notification_critical_preset,
                                        replaces_id = bat.id,
                                }).id
-                       elseif nperc <= 15
-                       then
+                       elseif nperc <= 15 then
                                bat.id = naughty.notify({
                                        preset = bat_notification_low_preset,
                                        replaces_id = bat.id,
                                bat.id = naughty.notify({
                                        preset = bat_notification_low_preset,
                                        replaces_id = bat.id,