X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/04a974edf28b4a61889ef44791d9d425f268e27d..b1c404a519975a2f0e98aaa5781a5d1c23436abe:/.config/awesome/rc.lua?ds=inline

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 478f3f7..5fa82cb 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -124,11 +124,12 @@ local function print_table(tbl, indent)
     end
 end
 
-local lain_bat = lain.widgets.bat({
+local lain_bat = lain.widget.bat({
     batteries = {"BAT0", "BAT1"},
     settings = function()
         local delim = "↓"
-        if bat_now.status == "Charging" then delim = "↑" end
+        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,
 })
@@ -141,7 +142,7 @@ local function poloniex_price(output, pair, prec)
     return (not err and val) or "n/a"
 end
 
-local eth_widget = lain.widgets.abase({
+local eth_widget = lain.widget.watch({
     cmd = "curl -m5 -s 'https://poloniex.com/public?command=returnTicker'",
     timeout = 600,
     settings = function()
@@ -150,7 +151,6 @@ local eth_widget = lain.widgets.abase({
 })
 
 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
@@ -158,7 +158,7 @@ local function coindesk_price(output, base, prec)
     return (not err and val) or "n/a"
 end
 
-local btc_widget = lain.widgets.abase({
+local btc_widget = lain.widget.watch({
     cmd = "curl -m5 -Ls 'https://api.coindesk.com/v1/bpi/currentprice/EUR.json'",
     timeout = 600,
     settings = function()
@@ -337,8 +337,6 @@ awful.screen.connect_for_each_screen(function(s)
             wibox.widget.systray(),
             btc_widget,
             spacer,
-            eth_widget,
-            spacer,
             lain_bat.widget,
             spacer,
             mytextclock,
@@ -545,15 +543,15 @@ clientbuttons = awful.util.table.join(
 -- misc apps
 globalkeys = awful.util.table.join(globalkeys,
 awful.key({ cmdkey }, "n", function () awful.spawn("firefox") end),
-awful.key({ cmdkey }, "m", function () awful.spawn("chromium") end),
+awful.key({ cmdkey }, "m", function () awful.spawn("chromium --enable-remote-extensions") end),
 awful.key({ cmdkey }, "y", function () awful.spawn(terminal .. " -e python") end),
-awful.key({ cmdkey }, "c", function () awful.spawn("icedove") end),
+awful.key({ cmdkey }, "c", function () awful.spawn("thunderbird") end),
 awful.key({ cmdkey }, "r", function () mypromptbox[mouse.screen]:run() end),
 awful.key({ cmdkey }, "g", function () awful.spawn("gscan2pdf") end),
 awful.key({ cmdkey }, "v", function () awful.spawn("virt-manager") end),
 awful.key({ cmdkey }, "l", function () awful.spawn("libreoffice") end),
 awful.key({ cmdkey }, "f", function () awful.spawn("thunar") end),
-awful.key({ cmdkey }, "i", function () awful.spawn(terminal .. " -title irc -name irc -e env MOSH_TITLE_NOPREFIX=true mosh -4 -- irc-host screen -dr irc") end),
+awful.key({ cmdkey }, "i", function () awful.spawn(terminal .. " -name irc -e env MOSH_TITLE_NOPREFIX=true mosh -4 -- irc-host tmux new -DAs irc irssi") end),
 awful.key({ cmdkey }, "x", function () awful.spawn.with_shell("/sbin/start-stop-daemon --start --background --exec /usr/bin/xscreensaver -- -no-capture-stderr; sleep 2; xscreensaver-command -lock") end),
 awful.key({ cmdkey, "Shift" }, "x", function () awful.spawn("xscreensaver-command -exit") end),
 
@@ -601,7 +599,7 @@ awful.rules.rules = {
                      buttons = clientbuttons,
                      screen = awful.screen.preferred,
                      placement = awful.placement.no_overlap+awful.placement.no_offscreen,
-                     floating = true
+                     floating = false
                  },
     },
 
@@ -611,7 +609,10 @@ awful.rules.rules = {
     --DISABLED-- },
 
     { rule = { type = "dialog" },
-      properties = { placement = awful.placement.centered }},
+      properties = { floating = true,
+                     placement = awful.placement.centered
+                 }
+    },
 
     { rule = { class = "URxvt" },
                properties = {
@@ -630,7 +631,13 @@ awful.rules.rules = {
                },
                callback = move_to_tag(screen.count() == 1 and 1 or 2, 9)
            },
-    { rule = { class = "Icedove", instance = "Mail" },
+    { rule = { class = "Firefox-esr", instance = "Navigator" },
+               properties = {
+                   floating = false,
+               },
+               callback = move_to_tag(screen.count() == 1 and 1 or 2, 9)
+           },
+    { rule = { class = "Thunderbird", instance = "Mail" },
                properties = {
                    floating = false,
                },
@@ -658,6 +665,11 @@ awful.rules.rules = {
                    floating = false,
                },
            },
+    { rule = { class = "MuPDF", instance = "mupdf" },
+               properties = {
+                   floating = true,
+               },
+           },
 }
 -- }}}
 
@@ -730,7 +742,7 @@ client.connect_signal("focus", function(c) c.border_color = beautiful.border_foc
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 
 awful.ewmh.add_activate_filter(function(c, context, hints)
-    if context == "ewmh" and c.class == "Firefox" then return false end
+    if context == "ewmh" and c.class == "Firefox-esr" or c.class == "Firefox" then return false end
 end)
 
 -- vim:ft=lua:sw=4:sts=4:ts=4:et