X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/580c6e590546746c24bb6672e8af076bd523b399..2b19c159535536be04336009fdec4f39937a811a:/.config/awesome/rc.lua?ds=inline;pf=etc diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 713077f..66f5d4b 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -1,30 +1,48 @@ -- Standard awesome library -require("awful") +local gears = require("gears") +local awful = require("awful") require("awful.autofocus") -require("awful.rules") +-- Widget and layout library +local wibox = require("wibox") -- Theme handling library -require("beautiful") +local beautiful = require("beautiful") -- Notification library -require("naughty") - -require("vicious") +local naughty = require("naughty") +local menubar = require("menubar") +local hotkeys_popup = require("awful.hotkeys_popup").widget + +-- {{{ Error handling +-- Check if awesome encountered an error during startup and fell back to +-- another config (This code will only ever execute for the fallback config) +if awesome.startup_errors then + naughty.notify({ preset = naughty.config.presets.critical, + title = "Oops, there were errors during startup!", + text = awesome.startup_errors }) +end --- Load Debian menu entries -require("debian.menu") +-- Handle runtime errors after startup +do + local in_error = false + awesome.connect_signal("debug::error", function (err) + -- Make sure we don't go into an endless error loop + if in_error then return end + in_error = true + + naughty.notify({ preset = naughty.config.presets.critical, + title = "Oops, an error happened!", + text = tostring(err) }) + in_error = false + end) +end +-- }}} -- {{{ Variable definitions -- Themes define colours, icons, and wallpapers --- The default is a dark theme -theme_path = "/usr/share/awesome/themes/default/theme.lua" --- Uncommment this for a lighter theme --- theme_path = "/usr/share/awesome/themes/sky/theme.lua" - --- Actually load theme -beautiful.init(theme_path) +beautiful.init(awful.util.get_themes_dir() .. "default/theme.lua") -- This is used later as the default terminal and editor to run. -terminal = "urxvtc" -editor = os.getenv("EDITOR") or "editor" +terminal = "x-terminal-emulator" +editor = "sensible-editor" editor_cmd = terminal .. " -e " .. editor -- Default modkey. @@ -33,178 +51,76 @@ editor_cmd = terminal .. " -e " .. editor -- I suggest you to remap Mod4 to another key using xmodmap or other tools. -- However, you can use another modifier like Mod1, but it may interact with others. modkey = "Mod4" +cmdkey = "Mod3" -- Table of layouts to cover with awful.layout.inc, order matters. -layouts = -{ --- awful.layout.suit.tile, --- awful.layout.suit.tile.left, --- awful.layout.suit.tile.bottom, --- awful.layout.suit.tile.top, +awful.layout.layouts = { awful.layout.suit.fair, - awful.layout.suit.fair.horizontal, --- awful.layout.suit.spiral, --- awful.layout.suit.spiral.dwindle, + awful.layout.suit.tile, + -- 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.max, --- awful.layout.suit.max.fullscreen, - awful.layout.suit.magnifier, - awful.layout.suit.floating + 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, } ----- Table of clients that should be set floating. The index may be either ----- the application class or instance. The instance is useful when running ----- a console app in a terminal like (Music on Console) ----- xterm -name mocp -e mocp ----- OVERRULED BY TILEDAPPS BELOW ---floatapps = ---{ --- -- by class --- ["MPlayer"] = true, --- ["pinentry"] = true, --- ["GIMP"] = true, --- ["twinkle"] = true, --- ["Add-ons"] = true, --- ["Play stream"] = true, --- ["gscan2pdf"] = true, ---} --- ----- Applications that should never float, assuming everything else floats ----- (by instance) ---tiledapps = ---{ --- ["urxvt"] = true, ---} --- ----- Applications that should be maximised ----- (by instance) ---maxapps = ---{ --- ["Navigator"] = true, --- -- jpilot is -v --- ["-v"] = true, --- ["Xpdf"] = true, --- ["gscan2pdf"] = true ---} --- ----- Applications to be moved to a pre-defined tag by class or instance. ----- Use the screen and tags indices. ---apptags = ---{ --- ["Navigator"] = { screen = 1, tag = 9 }, --- -- jpilot is -v --- ["-v"] = { screen = 1, tag = 8 }, ---} - --- Define if we want to use titlebar on all applications. -use_titlebar = false +layout_default = awful.layout.layouts[1] +layout_tiled = awful.layout.layouts[2] +layout_maximised = awful.layout.layouts[4] +layout_floating = awful.layout.layouts[5] -- }}} --- {{{ Tags -tags = {} -tags.settings = { - { name = "1", layout = layouts[1] }, - { name = "2", layout = layouts[1] }, - { name = "3", layout = layouts[1] }, - { name = "4", layout = layouts[1] }, - { name = "5", layout = layouts[1] }, - { name = "6", layout = layouts[5] }, - { name = "7", layout = layouts[5] }, - { name = "8", layout = layouts[3] }, - { name = "9", layout = layouts[3] }, -} +-- {{{ Helper functions +local function client_menu_toggle_fn() + local instance = nil --- Define a tag table which hold all screen tags. -for s = 1, screen.count() do - tags[s] = {} - for i, v in ipairs(tags.settings) do - tags[s][i] = tag({ name = v.name }) - tags[s][i].screen = s - awful.tag.setproperty(tags[s][i], "layout", v.layout) - awful.tag.setproperty(tags[s][i], "mwfact", v.mwfact) - awful.tag.setproperty(tags[s][i], "hide", v.hide) + return function () + if instance and instance.wibox.visible then + instance:hide() + instance = nil + else + instance = awful.menu.clients({ theme = { width = 250 } }) + end end - tags[s][1].selected = true end -- }}} -- {{{ Menu --- Create a laucher widget and a main menu +-- Create a launcher widget and a main menu myawesomemenu = { + { "hotkeys", function() return false, hotkeys_popup.show_help end}, { "manual", terminal .. " -e man awesome" }, - { "edit config", editor_cmd .. " " .. awful.util.getdir("config") .. "/rc.lua" }, + { "edit config", editor_cmd .. " " .. awesome.conffile }, { "restart", awesome.restart }, { "quit", awesome.quit } } mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, - { "Debian", debian.menu.Debian_menu.Debian }, { "open terminal", terminal } } }) -mylauncher = awful.widget.launcher({ image = image(beautiful.awesome_icon), +mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, menu = mymainmenu }) --- }}} --- {{{ Wibox - --- {{{ Reusable separators -spacer = widget({ type = "textbox", name = "spacer" }) -separator = widget({ type = "textbox", name = "separator" }) -spacer.text = " " -separator.text = "٭" +-- Menubar configuration +menubar.utils.terminal = terminal -- Set the terminal for applications that require it -- }}} ----- {{{ CPU usage and temperature ----- Widget icon ---cpuicon = widget({ type = "imagebox", name = "cpuicon" }) ---cpuicon.image = image(beautiful.widget_cpu) ----- Initialize widgets ---thermalwidget = widget({ type = "textbox", name = "thermalwidget" }) ---cpuwidget = awful.widget.graph({ layout = awful.widget.layout.horizontal.rightleft }) ----- Graph properties ---cpuwidget:set_width(50) -----cpuwidget:set_scale(false) ---cpuwidget:set_max_value(100) ---cpuwidget:set_background_color(beautiful.fg_off_widget) ---cpuwidget:set_border_color(beautiful.border_widget) ---cpuwidget:set_color(beautiful.fg_end_widget) ---cpuwidget:set_gradient_angle(0) ---cpuwidget:set_gradient_colors({ --- beautiful.fg_end_widget, --- beautiful.fg_center_widget, --- beautiful.fg_widget }) ----- Register widgets ---vicious.register(cpuwidget, vicious.widgets.cpu, "$1") ---vicious.register(thermalwidget, vicious.widgets.thermal, "CPU: $1°C", 19, "hwmon0") ----- }}} - --- Battery widget ---batterywidget = widget({ type = 'progressbar', name = 'batterywidget' }) ---batterywidget.width = 100 ---batterywidget.height = 0.8 ---batterywidget.gap = 1 ---batterywidget.border_padding = 1 ---batterywidget.border_width = 1 ---batterywidget.ticks_count = 10 ---batterywidget.ticks_gap = 1 ---batterywidget.vertical = false ---batterywidget:bar_properties_set('bat', { --- bg = 'black', --- fg = 'blue4', --- fg_off = 'red', --- reverse = false, --- min_value = 0, --- max_value = 100 ---}) +-- Keyboard map indicator and switcher +mykeyboardlayout = awful.widget.keyboardlayout() +-- {{{ Wibox -- Create a textclock widget -mytextclock = awful.widget.textclock({ align = "right" }, "%a %d %b %H:%M:%S", 1) - --- Create a systray -mysystray = widget({ type = "systray", align = "right" }) - -mybatterybox = widget({ type = "textbox", name = "mybatterybox", align = "right" }) +mytextclock = wibox.widget.textclock("%a %d %b %H:%M:%S", 1) -- Create a wibox for each screen and add it mywibox = {} @@ -212,85 +128,104 @@ mypromptbox = {} mylayoutbox = {} mytaglist = {} mytaglist.buttons = awful.util.table.join( - awful.button({ }, 1, awful.tag.viewonly), - awful.button({ modkey }, 1, awful.client.movetotag), + awful.button({ }, 1, function(t) t:view_only() end), + awful.button({ modkey }, 1, function(t) + if client.focus then + client.focus:move_to_tag(t) + end + end), awful.button({ }, 3, awful.tag.viewtoggle), - awful.button({ modkey }, 3, awful.client.toggletag), - awful.button({ }, 4, awful.tag.viewnext), - awful.button({ }, 5, awful.tag.viewprev) - ) + awful.button({ modkey }, 3, function(t) + if client.focus then + client.focus:toggle_tag(t) + end + end), + awful.button({ }, 4, function(t) awful.tag.viewnext(t.screen) end), + awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end) + ) + mytasklist = {} mytasklist.buttons = awful.util.table.join( awful.button({ }, 1, function (c) - if not c:isvisible() then - awful.tag.viewonly(c:tags()[1]) - end - client.focus = c - c:raise() - end), - awful.button({ }, 3, function () - if instance then - instance:hide() - instance = nil + if c == client.focus then + c.minimized = true else - instance = awful.menu.clients({ width=250 }) + -- Without this, the following + -- :isvisible() makes no sense + c.minimized = false + if not c:isvisible() and c.first_tag then + c.first_tag:view_only() + end + -- This will also un-minimize + -- the client, if needed + client.focus = c + c:raise() end end), + awful.button({ }, 3, client_menu_toggle_fn()), awful.button({ }, 4, function () awful.client.focus.byidx(1) - if client.focus then client.focus:raise() end end), awful.button({ }, 5, function () awful.client.focus.byidx(-1) - if client.focus then client.focus:raise() end end)) -for s = 1, screen.count() do +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 + + -- Each screen has its own tag table. + tags = awful.tag.new({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, layout_default) + tags[7].layout = layout_maximised + tags[8].layout = layout_maximised + tags[9].layout = layout_maximised + tags[1].selected = true + -- Create a promptbox for each screen - mypromptbox[s] = awful.widget.prompt({ layout = awful.widget.layout.horizontal.leftright }) + mypromptbox[s] = awful.widget.prompt() -- Create an imagebox widget which will contains an icon indicating which layout we're using. -- We need one layoutbox per screen. mylayoutbox[s] = awful.widget.layoutbox(s) mylayoutbox[s]:buttons(awful.util.table.join( - awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end), - awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end), - awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end), - awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end))) + awful.button({ }, 1, function () awful.layout.inc( 1) end), + awful.button({ }, 3, function () awful.layout.inc(-1) end), + awful.button({ }, 4, function () awful.layout.inc( 1) end), + awful.button({ }, 5, function () awful.layout.inc(-1) end))) -- Create a taglist widget - mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.label.all, mytaglist.buttons) + mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons) -- Create a tasklist widget - mytasklist[s] = awful.widget.tasklist(function(c) - return awful.widget.tasklist.label.currenttags(c, s) - end, mytasklist.buttons) + mytasklist[s] = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons) -- Create the wibox - mywibox[s] = awful.wibox({ position = "top", screen = s }) - -- Add widgets to the wibox - order matters - mywibox[s].widgets = { - { --- mylauncher, + mywibox[s] = awful.wibar({ position = "top", screen = s }) + + -- Add widgets to the wibox + mywibox[s]:setup { + layout = wibox.layout.align.horizontal, + { -- Left widgets + layout = wibox.layout.fixed.horizontal, + mylauncher, mytaglist[s], mypromptbox[s], - layout = awful.widget.layout.horizontal.leftright }, - mylayoutbox[s], - spacer, - mytextclock, - spacer, separator, spacer, - mybatterybox, --- batterywidget, --- spacer, separator, spacer, --- cpuwidget.widget, --- spacer, separator, spacer, --- thermalwidget.widget, - spacer, - s == screen.count() and mysystray or nil, - mytasklist[s], - layout = awful.widget.layout.horizontal.rightleft + mytasklist[s], -- Middle widget + { -- Right widgets + layout = wibox.layout.fixed.horizontal, + mykeyboardlayout, + wibox.widget.systray(), + mytextclock, + mylayoutbox[s], + }, } -end - +end) -- }}} -- {{{ Mouse bindings @@ -303,119 +238,183 @@ root.buttons(awful.util.table.join( -- {{{ Key bindings globalkeys = awful.util.table.join( - awful.key({ modkey, }, "Left", awful.tag.viewprev ), - awful.key({ modkey, }, "Right", awful.tag.viewnext ), - awful.key({ modkey, }, "Escape", awful.tag.history.restore), - awful.key({ modkey, "Shift" }, "Right", function () awful.screen.focus( 1) end), - awful.key({ modkey, "Shift" }, "Left", function () awful.screen.focus(-1) end), - awful.key({ modkey, "Shift" }, "h", awful.tag.viewprev ), - awful.key({ modkey, "Shift" }, "l", awful.tag.viewnext ), + awful.key({ modkey, }, "s", hotkeys_popup.show_help, + {description="show help", group="awesome"}), + awful.key({ modkey, }, "Left", awful.tag.viewprev, + {description = "view previous", group = "tag"}), + awful.key({ modkey, }, "Right", awful.tag.viewnext, + {description = "view next", group = "tag"}), + awful.key({ modkey, }, "Escape", awful.tag.history.restore, + {description = "go back", group = "tag"}), - awful.key({ modkey, }, "k", + awful.key({ modkey, }, "j", function () awful.client.focus.byidx( 1) - if client.focus then client.focus:raise() end - end), - awful.key({ modkey, }, "j", + end, + {description = "focus next by index", group = "client"} + ), + awful.key({ modkey, }, "k", function () awful.client.focus.byidx(-1) - if client.focus then client.focus:raise() end - end), - awful.key({ modkey, }, "w", function () mymainmenu:show(true) end), + end, + {description = "focus previous by index", group = "client"} + ), + awful.key({ modkey, }, "w", function () mymainmenu:show() end, + {description = "show main menu", group = "awesome"}), -- Layout manipulation - awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( 1) end), - awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( -1) end), - awful.key({ modkey, "Control" }, "k", function () awful.screen.focus( 1) end), - awful.key({ modkey, "Control" }, "j", function () awful.screen.focus(-1) end), - awful.key({ modkey, }, "u", awful.client.urgent.jumpto), + awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end, + {description = "swap with next client by index", group = "client"}), + awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end, + {description = "swap with previous client by index", group = "client"}), + awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end, + {description = "focus the next screen", group = "screen"}), + awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end, + {description = "focus the previous screen", group = "screen"}), + awful.key({ modkey, }, "u", awful.client.urgent.jumpto, + {description = "jump to urgent client", group = "client"}), awful.key({ modkey, }, "Tab", function () awful.client.focus.history.previous() if client.focus then client.focus:raise() end - end), + end, + {description = "go back", group = "client"}), -- Standard program - awful.key({ modkey, }, "Return", function () awful.util.spawn(terminal) end), - awful.key({ modkey, "Control" }, "r", awesome.restart), - awful.key({ modkey, "Shift" }, "q", awesome.quit), - - awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end), - awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end), - awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1) end), - awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end), - awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1) end), - awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end), - awful.key({ modkey, }, "space", function () awful.layout.inc(layouts, 1) end), - awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end), + awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end, + {description = "open a terminal", group = "launcher"}), + awful.key({ modkey, "Control" }, "r", awesome.restart, + {description = "reload awesome", group = "awesome"}), + awful.key({ modkey, "Shift" }, "q", awesome.quit, + {description = "quit awesome", group = "awesome"}), + + awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end, + {description = "increase master width factor", group = "layout"}), + awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end, + {description = "decrease master width factor", group = "layout"}), + awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1, nil, true) end, + {description = "increase the number of master clients", group = "layout"}), + awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1, nil, true) end, + {description = "decrease the number of master clients", group = "layout"}), + awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1, nil, true) end, + {description = "increase the number of columns", group = "layout"}), + awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1, nil, true) end, + {description = "decrease the number of columns", group = "layout"}), + awful.key({ modkey, }, "space", function () awful.layout.inc( 1) end, + {description = "select next", group = "layout"}), + awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(-1) end, + {description = "select previous", group = "layout"}), + + awful.key({ modkey, "Control" }, "n", + function () + local c = awful.client.restore() + -- Focus restored client + if c then + client.focus = c + c:raise() + end + end, + {description = "restore minimized", group = "client"}), -- Prompt - awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end), + awful.key({ modkey }, "r", function () mypromptbox[awful.screen.focused()]:run() end, + {description = "run prompt", group = "launcher"}), awful.key({ modkey }, "x", function () awful.prompt.run({ prompt = "Run Lua code: " }, - mypromptbox[mouse.screen].widget, + mypromptbox[awful.screen.focused()].widget, awful.util.eval, nil, - awful.util.getdir("cache") .. "/history_eval") - end) + awful.util.get_cache_dir() .. "/history_eval") + end, + {description = "lua execute prompt", group = "awesome"}), + -- Menubar + awful.key({ modkey }, "p", function() menubar.show() end, + {description = "show the menubar", group = "launcher"}) ) clientkeys = awful.util.table.join( - awful.key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen end), - awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end), - awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle ), - awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end), - awful.key({ modkey, }, "o", awful.client.movetoscreen ), - awful.key({ modkey, "Shift" }, "r", function (c) c:redraw() end), - awful.key({ modkey }, "t", awful.client.togglemarked ), - awful.key({ modkey, }, "n", function (c) c.minimized = not c.minimized end), + awful.key({ modkey, }, "f", + function (c) + c.fullscreen = not c.fullscreen + c:raise() + end, + {description = "toggle fullscreen", group = "client"}), + awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end, + {description = "close", group = "client"}), + awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle , + {description = "toggle floating", group = "client"}), + awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end, + {description = "move to master", group = "client"}), + awful.key({ modkey, }, "o", function (c) c:move_to_screen() end, + {description = "move to screen", group = "client"}), + awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end, + {description = "toggle keep on top", group = "client"}), + awful.key({ modkey, }, "n", + function (c) + -- The client currently has the input focus, so it cannot be + -- minimized, since minimized clients can't have the focus. + c.minimized = true + end , + {description = "minimize", group = "client"}), awful.key({ modkey, }, "m", function (c) - c.maximized_horizontal = not c.maximized_horizontal - c.maximized_vertical = not c.maximized_vertical - end) + c.maximized = not c.maximized + c:raise() + end , + {description = "maximize", group = "client"}) ) --- Compute the maximum number of digit we need, limited to 9 -keynumber = 0 -for s = 1, screen.count() do - keynumber = math.min(9, math.max(#tags[s], keynumber)); -end - -- Bind all key numbers to tags. -- Be careful: we use keycodes to make it works on any keyboard layout. -- This should map on the top row of your keyboard, usually 1 to 9. -for i = 1, keynumber do +for i = 1, 9 do globalkeys = awful.util.table.join(globalkeys, + -- View tag only. awful.key({ modkey }, "#" .. i + 9, function () - local screen = mouse.screen - if tags[screen][i] then - awful.tag.viewonly(tags[screen][i]) + local screen = awful.screen.focused() + local tag = screen.tags[i] + if tag then + tag:view_only() end - end), + end, + {description = "view tag #"..i, group = "tag"}), + -- Toggle tag. awful.key({ modkey, "Control" }, "#" .. i + 9, function () - local screen = mouse.screen - if tags[screen][i] then - awful.tag.viewtoggle(tags[screen][i]) + local screen = awful.screen.focused() + local tag = screen.tags[i] + if tag then + awful.tag.viewtoggle(tag) end - end), + end, + {description = "toggle tag #" .. i, group = "tag"}), + -- Move client to tag. awful.key({ modkey, "Shift" }, "#" .. i + 9, function () - if client.focus and tags[client.focus.screen][i] then - awful.client.movetotag(tags[client.focus.screen][i]) - end - end), + if client.focus then + local tag = client.focus.screen.tags[i] + if tag then + client.focus:move_to_tag(tag) + end + end + end, + {description = "move focused client to tag #"..i, group = "tag"}), + -- Toggle tag on focused client. awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9, function () - if client.focus and tags[client.focus.screen][i] then - awful.client.toggletag(tags[client.focus.screen][i]) + if client.focus then + local tag = client.focus.screen.tags[i] + if tag then + client.focus:toggle_tag(tag) + end end - end)) + end, + {description = "toggle focused client on tag #" .. i, group = "tag"}) + ) end clientbuttons = awful.util.table.join( @@ -423,173 +422,129 @@ clientbuttons = awful.util.table.join( awful.button({ modkey }, 1, awful.mouse.client.move), awful.button({ modkey }, 3, awful.mouse.client.resize)) -cmdmodkey = "Mod3" - --- xmms2 & sound -globalkeys = awful.util.table.join(globalkeys, - awful.key({ cmdmodkey }, "Prior", function () awful.util.spawn("amixer set Master 2+") end), - awful.key({ cmdmodkey }, "Next", function () awful.util.spawn("amixer set Master 2-") end), - awful.key({ cmdmodkey }, "Up", function () awful.util.spawn("amixer set PCM 2+") end), - awful.key({ cmdmodkey }, "Down", function () awful.util.spawn("amixer set PCM 2-") end), - awful.key({ cmdmodkey }, "Home", function () awful.util.spawn("amixer set Mic toggle") end), - awful.key({ cmdmodkey }, "End", function () awful.util.spawn("amixer set Master toggle") end), - awful.key({ cmdmodkey }, "Left", function () awful.util.spawn("xmms2 prev") end), - awful.key({ cmdmodkey }, "Right", function () awful.util.spawn("xmms2 next") end), - awful.key({ cmdmodkey }, "space", function () awful.util.spawn("xmms2 toggleplay") end), - awful.key({ cmdmodkey }, "backslash", function () - local f = io.popen('xmms2 current', 'r') - naughty.notify({ title = "Now playing", text = f:read(), timeout = 5 }) - f:close() - end), - awful.key({ cmdmodkey, "Shift" }, "backslash", function () - local f = io.popen('xmms2 list', 'r') - naughty.notify({ title = "Playlist", text = f:read(), timeout = 15 }) - f:close() - end) -) - --- misc apps -globalkeys = awful.util.table.join(globalkeys, - awful.key({ cmdmodkey }, "n", function () awful.util.spawn("sensible-browser") end), - awful.key({ cmdmodkey }, "m", function () awful.util.spawn(terminal .. " -e mutt -f =store") end), - awful.key({ cmdmodkey }, "t", function () awful.util.spawn(terminal) end), - awful.key({ cmdmodkey }, "c", function () awful.util.spawn(terminal .. " -e python") end), - awful.key({ cmdmodkey }, "r", function () mypromptbox[mouse.screen]:run() end), - awful.key({ cmdmodkey }, "j", function () awful.util.spawn("jpilot") end), - awful.key({ cmdmodkey }, "x", function () awful.util.spawn_with_shell("/sbin/start-stop-daemon --start --background --exec /usr/bin/xscreensaver; xscreensaver-command -lock") end), - awful.key({ cmdmodkey, "Shift" }, "x", function () awful.util.spawn("xscreensaver-command -exit") end), - awful.key(nil, "XF86ScreenSaver", function () awful.util.spawn("xset dpms force off") end) -) - -- Set keys root.keys(globalkeys) -- }}} -- {{{ Rules +-- Rules to apply to new clients (through the "manage" signal). awful.rules.rules = { -- All clients will match this rule. { rule = { }, properties = { border_width = beautiful.border_width, border_color = beautiful.border_normal, - focus = true, + focus = awful.client.focus.filter, + raise = true, keys = clientkeys, - buttons = clientbuttons } }, - { rule = { class = "MPlayer" }, - properties = { floating = true } }, - { rule = { class = "pinentry" }, - properties = { floating = true } }, - { rule = { class = "gimp" }, - properties = { floating = true } }, - { rule = { class = "twinkle" }, - properties = { floating = true } }, - { rule = { class = "Play stream" }, - properties = { floating = true } }, - { rule = { class = "gscan2pdf" }, - properties = { floating = true } }, - { rule = { class = "Add-ons" }, - properties = { floating = true } }, - { rule = { class = "Iceweasel" }, - properties = { tag = tags[1][screen.count()>1 and 1 or 9], switchtotag = false } }, - { rule = { class = "Iceweasel", role = "Manager" }, - properties = { floating = true } }, - { rule = { class = "-v" }, - properties = { tag = screen.count()>1 and tags[3][2] or tags[1][8], switchtotag = false } }, + buttons = clientbuttons, + placement = awful.placement.no_overlap+awful.placement.no_offscreen + } + }, + + -- Floating clients. + { rule_any = { + instance = { + "DTA", -- Firefox addon DownThemAll. + "copyq", -- Includes session name in class. + }, + class = { + "Arandr", + "Gpick", + "Kruler", + "MessageWin", -- kalarm. + "Sxiv", + "Wpa_gui", + "pinentry", + "veromix", + "xtightvncviewer"}, + + name = { + "Event Tester", -- xev. + }, + role = { + "AlarmWindow", -- Thunderbird's calendar. + "pop-up", -- e.g. Google Chrome's (detached) Developer Tools. + } + }, properties = { floating = true }}, + + -- Add titlebars to normal clients and dialogs + { rule_any = {type = { "normal", "dialog" } + }, properties = { titlebars_enabled = false } + }, + + -- Set Firefox to always map on the tag named "2" on screen 1. + -- { rule = { class = "Firefox" }, + -- properties = { screen = 1, tag = "2" } }, } -- }}} -- {{{ Signals -- Signal function to execute when a new client appears. -client.add_signal("manage", function (c, startup) - -- Add a titlebar - -- awful.titlebar.add(c, { modkey = modkey }) - - -- Enable sloppy focus - c:add_signal("mouse::enter", function(c) - if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier - and awful.client.focus.filter(c) then - client.focus = c - end - end) - - if not startup then - -- Set the windows at the slave, - -- i.e. put it at the end of others instead of setting it master. - -- awful.client.setslave(c) - - -- Put windows in a smart way, only if they does not set an initial position. - if not c.size_hints.user_position and not c.size_hints.program_position then - awful.placement.no_overlap(c) - awful.placement.no_offscreen(c) - end +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 awesome.startup and + not c.size_hints.user_position + and not c.size_hints.program_position then + -- Prevent clients from being unreachable after screen count changes. + awful.placement.no_offscreen(c) end end) -client.add_signal("focus", function(c) c.border_color = beautiful.border_focus end) -client.add_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) - --- Hook called every sixty seconds -function hook_battery() - mybatterybox.text = " " .. get_acpibatt() .. " " -end --- }}} - --- {{{ Statusbar battery --- -function get_acpibatt() - local f = io.popen('acpi -b', 'r') - if not f then - return "acpi -b failed" - end - - local s = f:read('*l') - f:close() - if not s then - return '-'; - end - - -- Battery 0: Discharging, 89%, 00:02:14 remaining - -- Battery 0: Charging, 58%, 00:02:14 until charged - -- Battery 0: Full, 100% - -- so find the first bit first and then go look for the time - local st, en, status, percent = string.find(s, '%a+%s%d:%s(%a+),%s(%d+%%)'); - local st, en, time = string.find(s, ',%s(%d+:%d+):%d+%s%a+', en); +-- 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( + awful.button({ }, 1, function() + client.focus = c + c:raise() + awful.mouse.client.move(c) + end), + awful.button({ }, 3, function() + client.focus = c + c:raise() + awful.mouse.client.resize(c) + end) + ) - if not status or not percent then -- time can be empty if we're full - return "couldn't parse line " .. s - end + awful.titlebar(c) : setup { + { -- Left + awful.titlebar.widget.iconwidget(c), + buttons = buttons, + layout = wibox.layout.fixed.horizontal + }, + { -- Middle + { -- Title + align = "center", + widget = awful.titlebar.widget.titlewidget(c) + }, + buttons = buttons, + layout = wibox.layout.flex.horizontal + }, + { -- Right + awful.titlebar.widget.floatingbutton (c), + awful.titlebar.widget.maximizedbutton(c), + awful.titlebar.widget.stickybutton (c), + awful.titlebar.widget.ontopbutton (c), + awful.titlebar.widget.closebutton (c), + layout = wibox.layout.fixed.horizontal() + }, + layout = wibox.layout.align.horizontal + } +end) - if not time then - return percent +-- Enable sloppy focus +client.connect_signal("mouse::enter", function(c) + if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier + and awful.client.focus.filter(c) then + client.focus = c end +end) - if status == 'Charging' then - return '↑ ' .. percent; - elseif status == 'Discharging' then - return '↓ '.. time; - else - return ''; - end -end -t = timer({ timeout = 20 }) -t:add_signal('timeout', hook_battery) -t:start() -hook_battery() +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) -- }}} ---{{{ batt hook -local function get_bat() - local a = io.open("/sys/class/power_supply/BAT1/charge_full") - for line in a:lines() do - full = line - end - a:close() - local b = io.open("/sys/class/power_supply/BAT1/charge_now") - for line in b:lines() do - now = line - end - b:close() - batt=math.floor(now*100/full) - batterywidget:bar_data_add("bat",batt ) -end --- awful.hooks.timer.register(5, get_bat) ---}}} +-- vim:ft=lua:sw=4:sts=4:ts=4:et