X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/6e47dea8d0771e753f5c0eec0c830bb6287a4ba0..bfd2f3d9e50c286c22a745816828a33c157a7487:/.config/awesome/rc.lua diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 9abf49f..5a4db69 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -7,10 +7,23 @@ require("awful.autofocus") local wibox = require("wibox") -- Theme handling library local beautiful = require("beautiful") +local xrdb = beautiful.xresources -- Notification library local naughty = require("naughty") local menubar = require("menubar") local hotkeys_popup = require("awful.hotkeys_popup").widget +-- Enable hotkeys help widget for VIM and other apps +-- when client with a matching name is opened: +require("awful.hotkeys_popup.keys") + +-- Load Debian menu entries +local debian = require("debian.menu") +local has_fdo, freedesktop = pcall(require, "freedesktop") +-- Other libraries +local tblutils = require("tblutils") +local lain = require("lain") +local ccwidgets = require("cryptocoin_widgets") +local clocksarray = require("clocksarray") -- }}} -- {{{ Error handling @@ -39,12 +52,16 @@ end -- }}} -- {{{ Variable definitions --- Themes define colours, icons, and wallpapers -beautiful.init(awful.util.get_themes_dir() .. "default/theme.lua") +--xrdb.set_dpi(95, screen[1]) +--xrdb.set_dpi(120, screen[2]) + +-- Themes define colours, icons, font and wallpapers. +beautiful.init(gears.filesystem.get_themes_dir() .. "default/theme.lua") +beautiful.font = 'Sans 10' -- This is used later as the default terminal and editor to run. terminal = "x-terminal-emulator" -editor = "sensible-editor" +editor = os.getenv("EDITOR") or "editor" editor_cmd = terminal .. " -e " .. editor -- Default modkey. @@ -57,27 +74,28 @@ cmdkey = "Mod3" -- Table of layouts to cover with awful.layout.inc, order matters. awful.layout.layouts = { - awful.layout.suit.fair, + awful.layout.suit.floating, awful.layout.suit.tile, - -- awful.layout.suit.tile.left, - -- awful.layout.suit.tile.bottom, + awful.layout.suit.tile.left, + awful.layout.suit.tile.bottom, awful.layout.suit.tile.top, - -- awful.layout.suit.spiral, - -- awful.layout.suit.spiral.dwindle, + awful.layout.suit.fair, + awful.layout.suit.fair.horizontal, + awful.layout.suit.spiral, + awful.layout.suit.spiral.dwindle, awful.layout.suit.max, - -- awful.layout.suit.max.fullscreen, - -- awful.layout.suit.magnifier, - -- awful.layout.suit.corner.nw, + awful.layout.suit.max.fullscreen, + awful.layout.suit.magnifier, + awful.layout.suit.corner.nw, -- awful.layout.suit.corner.ne, -- awful.layout.suit.corner.sw, -- awful.layout.suit.corner.se, - awful.layout.suit.floating, } -layout_default = awful.layout.layouts[1] +layout_default = awful.layout.layouts[6] layout_tiled = awful.layout.layouts[2] -layout_maximised = awful.layout.layouts[4] -layout_floating = awful.layout.layouts[5] +layout_maximised = awful.layout.layouts[10] +layout_floating = awful.layout.layouts[1] -- }}} -- {{{ Helper functions @@ -94,30 +112,15 @@ local function client_menu_toggle_fn() end end -local function sorted_pairs(t, f) - local a = {} - for n in pairs(t) do table.insert(a, n) end - table.sort(a, f) - local i = 0 -- iterator variable - local iter = function () -- iterator function - i = i + 1 - if a[i] == nil then return nil - else return a[i], t[a[i]] - end - end - return iter -end - -local function print_table(tbl, indent) - if not indent then indent = 0 end - for k, v in pairs(tbl) do - formatting = string.rep(" ", indent) .. k .. ": " - if type(v) == "table" then - print(formatting) - print_table(v, indent+1) - else - print(formatting .. tostring(v)) +local function set_wallpaper(s) + -- Wallpaper + if beautiful.wallpaper then + local wallpaper = beautiful.wallpaper + -- If wallpaper is a function, call it with the screen + if type(wallpaper) == "function" then + wallpaper = wallpaper(s) end + gears.wallpaper.maximized(wallpaper, s, true) end end -- }}} @@ -129,32 +132,60 @@ myawesomemenu = { { "manual", terminal .. " -e man awesome" }, { "edit config", editor_cmd .. " " .. awesome.conffile }, { "restart", awesome.restart }, - { "quit", awesome.quit } + { "quit", function() awesome.quit() end} } -mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, - { "open terminal", terminal } - } - }) +local menu_awesome = { "awesome", myawesomemenu, beautiful.awesome_icon } +local menu_terminal = { "open terminal", terminal } + +if has_fdo then + mymainmenu = freedesktop.menu.build({ + before = { menu_awesome }, + after = { menu_terminal } + }) +else + mymainmenu = awful.menu({ + items = { + menu_awesome, + { "Debian", debian.menu.Debian_menu.Debian }, + menu_terminal, + } + }) +end + mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, menu = mymainmenu }) --- }}} --- {{{ Menubar configuration +-- Menubar configuration menubar.utils.terminal = terminal -- Set the terminal for applications that require it -- }}} --- {{{ Wibox +-- {{{ Wibar +local spacer = wibox.widget.textbox() +spacer:set_text(' │ ') + +-- Keyboard map indicator and switcher +mykeyboardlayout = awful.widget.keyboardlayout() + +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, +}) + -- Create a textclock widget -mytextclock = wibox.widget.textclock("%a %d %b %H:%M:%S", 1) +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 -mywibox = {} -mypromptbox = {} -mylayoutbox = {} -mytaglist = {} -mytaglist.buttons = awful.util.table.join( +local taglist_buttons = gears.table.join( awful.button({ }, 1, function(t) t:view_only() end), awful.button({ modkey }, 1, function(t) if client.focus then @@ -171,8 +202,7 @@ mytaglist.buttons = awful.util.table.join( awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end) ) -mytasklist = {} -mytasklist.buttons = awful.util.table.join( +local tasklist_buttons = gears.table.join( awful.button({ }, 1, function (c) if c == client.focus then -- I don't like click-minimising @@ -199,6 +229,9 @@ mytasklist.buttons = awful.util.table.join( end)) -- }}} +-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution) +screen.connect_signal("property::geometry", set_wallpaper) + -- {{{ Tags tags = {} tags.config = {} @@ -235,20 +268,13 @@ elseif screen.count() == 3 then -- main screen is still #1 in the middle end awful.screen.connect_for_each_screen(function(s) - -- Wallpaper - --DISABLED--if beautiful.wallpaper then - --DISABLED-- local wallpaper = beautiful.wallpaper - --DISABLED-- -- If wallpaper is a function, call it with the screen - --DISABLED-- if type(wallpaper) == "function" then - --DISABLED-- wallpaper = wallpaper(s) - --DISABLED-- end - --DISABLED-- gears.wallpaper.maximized(wallpaper, s, true) - --DISABLED--end + -- local fontsize = math.floor(250 * xrdb.get_dpi(s)/s.geometry.width) + -- beautiful.font = "Sans " .. tostring(fontsize) if not tags[s.index] then tags[s.index] = {} end - for n,p in sorted_pairs(screentags[s.index]) do + for n,p in tblutils.sorted_pairs(screentags[s.index]) do p["screen"] = s n = string.sub(n, 2) -- remove leading 't' needed for syntax in table table.insert(tags[s.index], awful.tag.add(n, p)) @@ -283,19 +309,29 @@ 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(), + ccwidgets.btc_widget, + spacer, + ccwidgets.eth_widget, + spacer, + lain_bat.widget, + spacer, + }, + clocksarray, + { + mylayoutbox[s], + } + ), } end) -- }}} -- {{{ Mouse bindings -root.buttons(awful.util.table.join( +root.buttons(gears.table.join( awful.button({ }, 3, function () mymainmenu:toggle() end), awful.button({ }, 4, awful.tag.viewnext), awful.button({ }, 5, awful.tag.viewprev) @@ -303,7 +339,7 @@ root.buttons(awful.util.table.join( -- }}} -- {{{ Key bindings -globalkeys = awful.util.table.join( +globalkeys = gears.table.join( awful.key({ modkey, }, "s", hotkeys_popup.show_help, {description="show help", group="awesome"}), awful.key({ modkey, }, "Left", awful.tag.viewprev, @@ -385,15 +421,17 @@ globalkeys = awful.util.table.join( {description = "restore minimized", group = "client"}), -- Prompt - awful.key({ modkey }, "r", function () mypromptbox[awful.screen.focused()]:run() end, + awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end, {description = "run prompt", group = "launcher"}), awful.key({ modkey }, "x", function () - awful.prompt.run({ prompt = "Run Lua code: " }, - mypromptbox[awful.screen.focused()].widget, - awful.util.eval, nil, - awful.util.get_cache_dir() .. "/history_eval") + awful.prompt.run { + prompt = "Run Lua code: ", + textbox = awful.screen.focused().mypromptbox.widget, + exe_callback = awful.util.eval, + history_path = awful.util.get_cache_dir() .. "/history_eval" + } end, {description = "lua execute prompt", group = "awesome"}), -- Menubar @@ -401,7 +439,7 @@ globalkeys = awful.util.table.join( {description = "show the menubar", group = "launcher"}) ) -clientkeys = awful.util.table.join( +clientkeys = gears.table.join( awful.key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen @@ -428,16 +466,30 @@ 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 = "(un)maximize", group = "client"}), + awful.key({ modkey, "Control" }, "m", + function (c) + c.maximized_vertical = not c.maximized_vertical c:raise() end , - {description = "maximize", group = "client"}) + {description = "(un)maximize vertically", group = "client"}), + awful.key({ modkey, "Shift" }, "m", + function (c) + c.maximized_horizontal = not c.maximized_horizontal + c:raise() + end , + {description = "(un)maximize horizontally", group = "client"}) ) -- Bind all key numbers to tags. --- Be careful: we use keycodes to make it works on any keyboard layout. +-- Be careful: we use keycodes to make it work on any keyboard layout. -- This should map on the top row of your keyboard, usually 1 to 9. for i = 1, 9 do - globalkeys = awful.util.table.join(globalkeys, + globalkeys = gears.table.join(globalkeys, -- View tag only. awful.key({ modkey }, "#" .. i + 9, function () @@ -448,7 +500,7 @@ for i = 1, 9 do end end, {description = "view tag #"..i, group = "tag"}), - -- Toggle tag. + -- Toggle tag display. awful.key({ modkey, "Control" }, "#" .. i + 9, function () local screen = awful.screen.focused() @@ -483,7 +535,7 @@ for i = 1, 9 do ) end -clientbuttons = awful.util.table.join( +clientbuttons = gears.table.join( awful.button({ }, 1, function (c) client.focus = c; c:raise() end), awful.button({ modkey }, 1, awful.mouse.client.move), awful.button({ modkey }, 3, awful.mouse.client.resize)) @@ -491,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 -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), @@ -547,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 }, }, @@ -557,11 +609,14 @@ 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" }, @@ -576,19 +631,28 @@ 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, }, 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 .*" }, @@ -601,6 +665,21 @@ awful.rules.rules = { floating = false, }, }, + { rule = { class = "MuPDF", instance = "mupdf" }, + properties = { + floating = true, + }, + }, + { rule = { class = "Pinentry", instance = "pinentry" }, + properties = { + floating = true, + }, + }, + { rule = { class = "Gxmessage" }, + properties = { + floating = true, + }, + }, } -- }}} @@ -609,7 +688,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 @@ -617,12 +696,15 @@ 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. client.connect_signal("request::titlebars", function(c) -- buttons for the titlebar - local buttons = awful.util.table.join( + local buttons = gears.table.join( awful.button({ }, 1, function() client.focus = c c:raise() @@ -661,7 +743,7 @@ client.connect_signal("request::titlebars", function(c) } end) --- Enable sloppy focus +-- Enable sloppy focus, so that focus follows mouse. client.connect_signal("mouse::enter", function(c) if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier and awful.client.focus.filter(c) then @@ -672,6 +754,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-esr" or c.class == "Firefox") then return false end +end) -- vim:ft=lua:sw=4:sts=4:ts=4:et