X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/bdbe521d8157a81bdf1af88bd31223c1d8caf9f1..6944fa282424926b1124edfddbbaa89bc759a74f:/.config/awesome/rc.lua diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index f844e8e..26d66cc 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -11,6 +11,11 @@ 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 dkjson = require("lain.util").dkjson +local math = require("math") +local freedesktop = require("freedesktop") +local luatz = require("luatz") -- }}} -- {{{ Error handling @@ -120,6 +125,49 @@ local function print_table(tbl, indent) end 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 @@ -132,10 +180,14 @@ myawesomemenu = { { "quit", awesome.quit } } -mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, - { "open terminal", terminal } - } - }) +mymainmenu = freedesktop.menu.build({ + before = { + { "awesome", myawesomemenu, beautiful.awesome_icon }, + { "terminal", terminal }, + }, + after = { + } +}) mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, menu = mymainmenu }) @@ -146,8 +198,24 @@ 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) +clocks = { wibox.widget.textclock("%a %d %b %H:%M:%S", 1) } + +ZONES = { + ["NZ"] = "Pacific/Auckland", + ["DE"] = "Europe/Berlin" +} +local now = luatz.time_in(nil) +for c, tz in 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, spacer) + table.insert(clocks, widget) + end +end -- Create a wibox for each screen and add it mywibox = {} @@ -175,7 +243,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 @@ -282,13 +351,21 @@ awful.screen.connect_for_each_screen(function(s) mypromptbox[s], }, mytasklist[s], -- Middle widget - { -- Right widgets - layout = wibox.layout.fixed.horizontal, - mykeyboardlayout, - wibox.widget.systray(), - mytextclock, - mylayoutbox[s], - }, + awful.util.table.join( -- Right widgets + { + layout = wibox.layout.fixed.horizontal, + mykeyboardlayout, + wibox.widget.systray(), + btc_widget, + spacer, + lain_bat.widget, + spacer, + }, + clocks, + { + mylayoutbox[s], + } + ), } end) -- }}} @@ -427,6 +504,8 @@ clientkeys = awful.util.table.join( awful.key({ modkey, }, "m", function (c) c.maximized = not c.maximized + c.maximized_horizontal = false + c.maximized_vertical = false c:raise() end , {description = "maximize", group = "client"}) @@ -490,23 +569,28 @@ 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 }, "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 }, "f", function () awful.spawn("thunar") end), +awful.key({ cmdkey }, "i", function () awful.spawn(terminal .. " -name irc -e env MOSH_TITLE_NOPREFIX=true mosh -4 -- irc-host tmux new -As 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), -- 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), @@ -523,6 +607,13 @@ root.keys(globalkeys) -- {{{ Rules -- Rules to apply to new clients (through the "manage" signal). + +local function move_to_tag(s, t) + return function(c) + c:move_to_tag(tags[s][t]) + end +end + awful.rules.rules = { -- All clients will match this rule. { rule = { }, @@ -532,10 +623,10 @@ awful.rules.rules = { raise = true, keys = clientkeys, buttons = clientbuttons, + screen = awful.screen.preferred, placement = awful.placement.no_overlap+awful.placement.no_offscreen, - -- https://github.com/awesomeWM/awesome/issues/1091#issuecomment-246933520 - screen = function (c) return awesome.startup and c.screen or awful.screen.focused() end, - } + floating = false + }, }, -- Add titlebars to normal clients and dialogs @@ -544,56 +635,76 @@ awful.rules.rules = { --DISABLED-- }, { rule = { type = "dialog" }, - properties = { placement = awful.placement.centered }}, + properties = { floating = true, + placement = awful.placement.centered + } + }, { rule = { class = "URxvt" }, properties = { - floating = false, + -- floating = false, size_hints_honor = false } }, { rule = { class = "URxvt", instance = "irc" }, properties = { --- screen = screen.count(), --- tag = screen.count() == 1 and "2" or "1" + switchtotag = true + }, + callback = move_to_tag(screen.count(), screen.count() == 1 and 2 or 1) + }, + { rule = { class = "Firefox", instance = "Navigator" }, + properties = { + floating = false, }, - callback = function(c) c:move_to_tag(tags[1][2]) end + callback = move_to_tag(screen.count() == 1 and 1 or 2, 9) }, - { rule = { class = "Firefox" }, + { rule = { class = "Firefox-esr", instance = "Navigator" }, properties = { floating = false, --- screen = screen.count(), --- tag = screen.count() == 1 and "2" or "1" }, - callback = function(c) c:move_to_tag(tags[1][9]) end + callback = move_to_tag(screen.count() == 1 and 1 or 2, 9) }, - { rule = { class = "Icedove" }, + { rule = { class = "Thunderbird", instance = "Mail" }, properties = { floating = false, --- screen = screen.count(), --- tag = screen.count() == 1 and "2" or "1" }, - callback = function(c) c:move_to_tag(tags[1][8]) end + callback = move_to_tag(screen.count() == 1 and 1 or 2, 8) }, - { rule = { class = "chromium" }, + { rule = { class = "Chromium", instance = "chromium" }, properties = { floating = false, --- screen = screen.count(), --- tag = screen.count() == 1 and "2" or "1" }, - callback = function(c) c:move_to_tag(tags[1][9]) end + callback = move_to_tag(screen.count() == 1 and 1 or 2, 9) }, { rule = { class = "Gscan2pdf" }, properties = { - screen = 1, - tag = "5" + switchtotag = true }, --- callback = function(c) c:move_to_tag(tags[1][9]) end + callback = move_to_tag(1, 5) }, { rule = { name = "gscan2pdf .*" }, properties = { floating = false, }, --- callback = function(c) c:move_to_tag(tags[1][9]) end + }, + { rule = { class = "Thunar", type = "normal" }, + properties = { + floating = false, + }, + }, + { rule = { class = "MuPDF", instance = "mupdf" }, + properties = { + floating = true, + }, + }, + { rule = { class = "Pinentry", instance = "pinentry" }, + properties = { + floating = true, + }, + }, + { rule = { class = "Gxmessage" }, + properties = { + floating = true, + }, }, } -- }}} @@ -603,7 +714,7 @@ awful.rules.rules = { client.connect_signal("manage", function (c) -- Set the windows at the slave, -- i.e. put it at the end of others instead of setting it master. - -- if not awesome.startup then awful.client.setslave(c) end + if not awesome.startup then awful.client.setslave(c) end if awesome.startup and not c.size_hints.user_position @@ -611,6 +722,9 @@ client.connect_signal("manage", function (c) -- Prevent clients from being unreachable after screen count changes. awful.placement.no_offscreen(c) end + + c.maximized_horizontal = false + c.maximized_vertical = false end) -- Add a titlebar if titlebars_enabled is set to true in the rules. @@ -666,14 +780,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) --- https://www.mail-archive.com/awesome@naquadah.org/msg08285.html -client.disconnect_signal("request::activate", awful.ewmh.activate) -client.connect_signal("request::activate", function(c, context, hints) - if c.class == "Firefox" and context == "ewmh" then - return - end - return awful.ewmh.activate(c, context, hints) +awful.ewmh.add_activate_filter(function(c, context, hints) + 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