]> git.madduck.net Git - etc/awesome.git/blobdiff - .config/awesome/rc.lua

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:

move battery widget to better context
[etc/awesome.git] / .config / awesome / rc.lua
index 5176f4de51c4458fbcb4cafb1cd836f6a09ad0fc..5a4db6934974182ac822b3522d3658825278ab76 100644 (file)
@@ -22,9 +22,8 @@ local has_fdo, freedesktop = pcall(require, "freedesktop")
 -- Other libraries
 local tblutils = require("tblutils")
 local lain = require("lain")
-local dkjson = require("lain.util").dkjson
-local math = require("math")
-local luatz = require("luatz")
+local ccwidgets = require("cryptocoin_widgets")
+local clocksarray = require("clocksarray")
 -- }}}
 
 -- {{{ Error handling
@@ -124,48 +123,6 @@ local function set_wallpaper(s)
         gears.wallpaper.maximized(wallpaper, s, true)
     end
 end
-
-local lain_bat = lain.widget.bat({
-    batteries = {"BAT0", "BAT1"},
-    settings = function()
-        local delim = "↓"
-        if bat_now.status == "Charging" then delim = "↑"
-        elseif bat_now.status == "Unknown" then delim = "٭" end
-        widget:set_text(bat_now.perc .. "% " .. delim .. " " .. bat_now.time)
-    end,
-})
-
-local function poloniex_price(output, pair, prec)
-    local xc, pos, err = dkjson.decode(output, 1, nil)
-    if not prec then prec = 4 end
-    val = (xc and xc[pair]["last"]) or 0
-    val = math.floor(val*10^prec+0.5)/10^prec
-    return (not err and val) or "n/a"
-end
-
-local eth_widget = lain.widget.watch({
-    cmd = "curl -m5 -s 'https://poloniex.com/public?command=returnTicker'",
-    timeout = 600,
-    settings = function()
-        widget:set_text(poloniex_price(output, 'BTC_ETH') .. " Ƀ/Ξ")
-    end
-})
-
-local function coindesk_price(output, base, prec)
-    local xc, pos, err = dkjson.decode(output, 1, nil)
-    if not prec then prec = 4 end
-    val = (xc and xc["bpi"][base]["rate_float"]) or 0
-    val = math.floor(val*10^prec+0.5)/10^prec
-    return (not err and val) or "n/a"
-end
-
-local btc_widget = lain.widget.watch({
-    cmd = "curl -m5 -Ls 'https://api.coindesk.com/v1/bpi/currentprice/EUR.json'",
-    timeout = 600,
-    settings = function()
-        widget:set_text(coindesk_price(output, "EUR", 2) .. " €/Ƀ")
-    end
-})
 -- }}}
 
 -- {{{ Menu
@@ -211,22 +168,21 @@ spacer:set_text(' │ ')
 -- Keyboard map indicator and switcher
 mykeyboardlayout = awful.widget.keyboardlayout()
 
--- Create a textclock widget
-clocks = { wibox.widget.textclock("%a %d %b %H:%M:%S %Z", 1) }
+local lain_bat = lain.widget.bat({
+    batteries = {"BAT0", "BAT1"},
+    settings = function()
+        local delim = "↓"
+        if bat_now.status == "Charging" then delim = "↑"
+        elseif bat_now.status == "Unknown" then delim = "٭" end
+        widget:set_text(bat_now.perc .. "% " .. delim .. " " .. bat_now.time)
+    end,
+})
 
-ZONES = {
-  ["NZ"] = "Pacific/Auckland",
-  ["DE"] = "Europe/Berlin"
-}
-local now = luatz.time_in(nil)
-for c, tz in tblutils.sorted_pairs(ZONES) do
-    local t = luatz.time_in(tz)
-    if math.abs(os.difftime(t, now)) > 10 then
-        local widget = wibox.widget.textclock(c .. ": %H:%M (%a)", 60, tz)
-        table.insert(clocks, 1, spacer)
-        table.insert(clocks, 1, widget)
-    end
-end
+-- Create a textclock widget
+clocksarray = clocksarray.get_clocksarray("%a %d %b %H:%M:%S %Z", {
+        ["NZ"] = "Pacific/Auckland",
+        ["DE"] = "Europe/Berlin"
+    }, spacer)
 
 -- Create a wibox for each screen and add it
 local taglist_buttons = gears.table.join(
@@ -358,12 +314,14 @@ awful.screen.connect_for_each_screen(function(s)
                 layout = wibox.layout.fixed.horizontal,
                 mykeyboardlayout,
                 wibox.widget.systray(),
-                btc_widget,
+                ccwidgets.btc_widget,
+                spacer,
+                ccwidgets.eth_widget,
                 spacer,
                 lain_bat.widget,
                 spacer,
             },
-            clocks,
+            clocksarray,
             {
                 mylayoutbox[s],
             }