]> 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:

Fix up BTC/ETH widget
authormartin f. krafft <madduck@madduck.net>
Tue, 17 Jan 2017 23:46:28 +0000 (10:46 +1100)
committermartin f. krafft <madduck@madduck.net>
Tue, 17 Jan 2017 23:46:28 +0000 (10:46 +1100)
.config/awesome/rc.lua

index ac0676b9c4604faf30c49f9f8f76d543a81eb0a6..478f3f75f76dfc23c74e886f5d10847ebb4925e6 100644 (file)
@@ -12,6 +12,7 @@ local naughty = require("naughty")
 local menubar = require("menubar")
 local hotkeys_popup = require("awful.hotkeys_popup").widget
 local lain = require("lain")
+local dkjson = require("lain.util").dkjson
 local math = require("math")
 -- }}}
 
@@ -127,20 +128,20 @@ local lain_bat = lain.widgets.bat({
     batteries = {"BAT0", "BAT1"},
     settings = function()
         local delim = "↓"
-        if bat_now.status == "1" then delim = "↑" end
+        if bat_now.status == "Charging" 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 = require("lain.util").dkjson.decode(output, 1, nil)
+    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 xc_widget = lain.widgets.abase({
+local eth_widget = lain.widgets.abase({
     cmd = "curl -m5 -s 'https://poloniex.com/public?command=returnTicker'",
     timeout = 600,
     settings = function()
@@ -148,6 +149,23 @@ local xc_widget = lain.widgets.abase({
     end
 })
 
+local function coindesk_price(output, base, prec)
+    print(output)
+    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.widgets.abase({
+    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
@@ -317,7 +335,9 @@ awful.screen.connect_for_each_screen(function(s)
             layout = wibox.layout.fixed.horizontal,
             mykeyboardlayout,
             wibox.widget.systray(),
-            xc_widget,
+            btc_widget,
+            spacer,
+            eth_widget,
             spacer,
             lain_bat.widget,
             spacer,