X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/97e2ca7178dcb412782ff4a6127b16076e98124f..c74cd69b97199337dbc946ceb568e9c3f48cd216:/.config/awesome/rc.lua

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 2294136..ac0676b 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -11,6 +11,8 @@ local beautiful = require("beautiful")
 local naughty = require("naughty")
 local menubar = require("menubar")
 local hotkeys_popup = require("awful.hotkeys_popup").widget
+local lain = require("lain")
+local math = require("math")
 -- }}}
 
 -- {{{ Error handling
@@ -120,6 +122,32 @@ local function print_table(tbl, indent)
         end
     end
 end
+
+local lain_bat = lain.widgets.bat({
+    batteries = {"BAT0", "BAT1"},
+    settings = function()
+        local delim = "↓"
+        if bat_now.status == "1" 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)
+    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({
+    cmd = "curl -m5 -s 'https://poloniex.com/public?command=returnTicker'",
+    timeout = 600,
+    settings = function()
+        widget:set_text(poloniex_price(output, 'BTC_ETH') .. " Ƀ/Ξ")
+    end
+})
+
 -- }}}
 
 -- {{{ Menu
@@ -146,6 +174,8 @@ menubar.utils.terminal = terminal -- Set the terminal for applications that requ
 -- }}}
 
 -- {{{ Wibox
+local spacer = wibox.widget.textbox()
+spacer:set_text(' | ')
 -- Create a textclock widget
 mytextclock = wibox.widget.textclock("%a %d %b %H:%M:%S", 1)
 
@@ -175,7 +205,8 @@ mytasklist = {}
 mytasklist.buttons = awful.util.table.join(
                      awful.button({ }, 1, function (c)
                                               if c == client.focus then
-                                                  c.minimized = true
+                                                  -- I don't like click-minimising
+                                                  -- c.minimized = true
                                               else
                                                   -- Without this, the following
                                                   -- :isvisible() makes no sense
@@ -286,6 +317,10 @@ awful.screen.connect_for_each_screen(function(s)
             layout = wibox.layout.fixed.horizontal,
             mykeyboardlayout,
             wibox.widget.systray(),
+            xc_widget,
+            spacer,
+            lain_bat.widget,
+            spacer,
             mytextclock,
             mylayoutbox[s],
         },
@@ -505,9 +540,13 @@ awful.key({ cmdkey, "Shift" }, "x", function () awful.spawn("xscreensaver-comman
 -- function keys
 awful.key(nil, "XF86ScreenSaver", function () awful.spawn("xset dpms force off") end),
 awful.key(nil, "XF86AudioMute", function () awful.spawn("pactl set-sink-mute 0 toggle") end),
+awful.key({ cmdkey }, "End", function () awful.spawn("pactl set-sink-mute 0 toggle") end),
 awful.key(nil, "XF86AudioLowerVolume", function () awful.spawn("pactl set-sink-volume 0 -2%") end),
+awful.key({ cmdkey }, "Next", function () awful.spawn("pactl set-sink-volume 0 -2%") end),
 awful.key(nil, "XF86AudioRaiseVolume", function () awful.spawn("pactl set-sink-volume 0 +2%") end),
+awful.key({ cmdkey }, "Prior", function () awful.spawn("pactl set-sink-volume 0 +2%") end),
 awful.key(nil, "XF86AudioMicMute", function () awful.spawn("pactl set-source-mute 1 toggle") end),
+awful.key({ cmdkey }, "Home", function () awful.spawn("pactl set-source-mute 1 toggle") end),
 awful.key(nil, "XF86MonBrightnessDown", function () awful.spawn("xbacklight -dec 5%") end),
 awful.key(nil, "XF86MonBrightnessUp", function () awful.spawn("xbacklight -inc 5%") end),
 awful.key(nil, "XF86Display", function () awful.spawn("") end),
@@ -577,13 +616,16 @@ awful.rules.rules = {
                },
                callback = move_to_tag(screen.count() == 1 and 1 or 2, 8)
            },
-    { rule = { class = "chromium", instance = "chromium" },
+    { rule = { class = "Chromium", instance = "chromium" },
                properties = {
                    floating = false,
                },
                callback = move_to_tag(screen.count() == 1 and 1 or 2, 9)
            },
     { rule = { class = "Gscan2pdf" },
+               properties = {
+                   switchtotag = true
+               },
                callback = move_to_tag(1, 5)
            },
     { rule = { name = "gscan2pdf .*" },
@@ -667,6 +709,8 @@ end)
 client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 
-awful.ewmh.add_activate_filter(function(c) if c.class == "Firefox" then return false end end)
+awful.ewmh.add_activate_filter(function(c, context, hints)
+    if context == "ewmh" and c.class == "Firefox" then return false end
+end)
 
 -- vim:ft=lua:sw=4:sts=4:ts=4:et