From 7e1633cb04fffe69bfdfbcf9406907699dfb3856 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Sat, 10 May 2014 20:55:41 +0200 Subject: awesome: Rewrite for awesome 3.5 API --- .config/awesome/awesome.lua | 433 --------------------------------- .config/awesome/rc.lua | 563 +++++++++++++++++++++++++++++++++++++++---- .config/awesome/runonce.lua | 2 + .config/awesome/switcher.lua | 7 +- 4 files changed, 524 insertions(+), 481 deletions(-) delete mode 100644 .config/awesome/awesome.lua diff --git a/.config/awesome/awesome.lua b/.config/awesome/awesome.lua deleted file mode 100644 index ffa5bfa..0000000 --- a/.config/awesome/awesome.lua +++ /dev/null @@ -1,433 +0,0 @@ --- Standard awesome library -require("awful") -require("awful.autofocus") -require("awful.rules") --- Theme handling library -require("beautiful") --- Notification library -require("naughty") --- Dynamic tagging -require("eminent") - -require("switcher") - -require("vicious") - --- {{{ Variable definitions --- Themes define colours, icons, and wallpapers -beautiful.init(os.getenv("HOME") .. "/.local/share/awesome/themes/zenburn/theme.lua") - -local cmd = require("cmds") - ---function spawn_once(unit, cmd) --- awful.util.spawn("systemd-run --user --scope --unit " .. unit .. " -- " .. cmd, false) ---end - -local runonce = require("runonce") -local spawn_once = function(unit, cmd) runonce.run(cmd) end - -spawn_once("urxvtd", cmd.urxvtd) -spawn_once("pulseaudio", "start-pulseaudio-x11") -spawn_once("switch-icon", cmd.swIcon) -spawn_once("lxpolkit", "/usr/libexec/lxpolkit") -spawn_once("nm-applet", "nm-applet") - --- This is used later as the default terminal and editor to run. -terminal = "urxvtc" -editor = os.getenv("EDITOR") or "nano" -editor_cmd = terminal .. " -e " .. editor - --- Fixes for the cursor [disables startup notification] -local spawn_from_awesome = awful.util.spawn ---awful.util.spawn = function (s) --- spawn_from_awesome("launch " .. s, false) ---end - ---awful.util.spawn = function(cmd, n) --- spawn_from_awesome("systemd-run --user --scope -- " .. cmd, n) ---end -awful.util.spawn("xsetroot -cursor_name left_ptr", false) - --- Default modkey. --- Usually, Mod4 is the key with a logo between Control and Alt. --- If you do not like this or do not have such a key, --- 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" - --- Table of layouts to cover with awful.layout.inc, order matters. -layouts = -{ - awful.layout.suit.floating, - awful.layout.suit.fair, - awful.layout.suit.fair.horizontal, - 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 -} --- }}} - --- {{{ Tags --- Define a tag table which hold all screen tags. -tags = {} -for s = 1, screen.count() do - -- Each screen has its own tag table. - tags[s] = awful.tag({ 1, 2, 3, 4, 5, 6, 7, 8, 9 }, s, layouts[1]) -end --- }}} - --- {{{ Notify -naughty.config.presets.low.width = 250 -naughty.config.presets.normal.width = 250 -naughty.config.presets.critical.width = 250 - -naughty.config.presets.low.screen = screen.count() -naughty.config.presets.normal.screen = screen.count() -naughty.config.presets.critical.screen = screen.count() --- }}} - --- {{{ Menu --- Create a laucher widget and a main menu -myawesomemenu = { - { "manual", terminal .. " -e man awesome" }, - { "restart", awesome.restart }, - { "quit", awesome.quit } -} - -mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, - { "open terminal", terminal } - } - }) - -mylauncher = awful.widget.launcher({ image = image(beautiful.awesome_icon), - menu = mymainmenu }) --- }}} - --- {{{ Wibox --- Create a textclock widget -mytextclock = awful.widget.textclock({ align = "right" }) - --- Create a systray -mysystray = widget({ type = "systray" }) - --- Create a wibox for each screen and add it -mywibox = {} -mypromptbox = {} -mylayoutbox = {} -mytaglist = {} -mytaglist.buttons = awful.util.table.join( - awful.button({ }, 1, awful.tag.viewonly), - awful.button({ modkey }, 1, awful.client.movetotag), - awful.button({ }, 3, awful.tag.viewtoggle), - awful.button({ modkey }, 3, awful.client.toggletag), - awful.button({ }, 4, awful.tag.viewprev), - awful.button({ }, 5, awful.tag.viewnext) - ) -mytasklist = {} -mytasklist.buttons = awful.util.table.join( - awful.button({ }, 1, function (c) - if c == client.focus then - c.minimized = true - else - if not c:isvisible() then - awful.tag.viewonly(c:tags()[1]) - end - -- This will also un-minimize - -- the client, if needed - client.focus = c - c:raise() - end - end), - awful.button({ }, 3, function () - if instance then - instance:hide() - instance = nil - else - instance = awful.menu.clients({ width=250 }) - end - end), - 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)) - -mygmail = widget({ type = "textbox" }) -gmail_t = awful.tooltip({ objects = { mygmail },}) - -mygmailimg = widget({ type = "imagebox" }) -mygmailimg.image = image("/home/ben/.config/awesome/gmail.21.u.png") -vicious.widgets.gmail.feed = -vicious.register(mygmail, vicious.widgets.gmail, - function (widget, args) - gmail_t:set_text(args["{subject}"]) - gmail_t:add_to_object(mygmailimg) - return args["{count}"] - end, 60) - -for s = 1, screen.count() do - -- Create a promptbox for each screen - mypromptbox[s] = awful.widget.prompt({ layout = awful.widget.layout.horizontal.leftright }) - -- 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))) - -- Create a taglist widget - mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.label.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) - - -- Create the wibox - mywibox[s] = awful.wibox({ position = "top", screen = s }) - -- Add widgets to the wibox - order matters - mywibox[s].widgets = { - { - mylauncher, - mytaglist[s], - mypromptbox[s], - layout = awful.widget.layout.horizontal.leftright - }, - mylayoutbox[s], - mytextclock, - s == screen.count() and mysystray or nil, - mygmail, mygmailimg, - mytasklist[s], - layout = awful.widget.layout.horizontal.rightleft - } -end --- }}} - --- {{{ Mouse bindings -root.buttons(awful.util.table.join( - awful.button({ }, 1, function () mymainmenu:close() end), - awful.button({ }, 3, function () mymainmenu:toggle() end), - awful.button({ }, 4, awful.tag.viewprev), - awful.button({ }, 5, awful.tag.viewnext) -)) --- }}} - --- {{{ 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, }, "Tab", function() - switcher.start( 1, "Super_L", "Tab", "ISO_Left_Tab") - end), - - awful.key({ modkey, }, "ISO_Left_Tab", function() - switcher.start(-1, "Super_L", "Tab", "ISO_Left_Tab") - end), - - awful.key({ modkey, }, "j", - function () - awful.client.focus.byidx( 1) - if client.focus then client.focus:raise() end - end), - 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({keygrabber=true}) end), - - -- Layout manipulation - awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end), - awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end), - awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end), - awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end), - awful.key({ modkey, }, "u", awful.client.urgent.jumpto), - - -- Standard program - awful.key({ modkey, }, "x", function () spawn_from_awesome(terminal, false) end), - awful.key({ modkey, }, "a", function () awful.util.spawn(terminal .. " -geometry 100x25 -e pa-sink-ctl" ) end), - awful.key({ modkey, }, "w", function () awful.util.spawn("chromium") end), - awful.key({ modkey, }, "n", function () awful.util.spawn("nautilus") end), - awful.key({ modkey, }, "v", function () awful.util.spawn("virt-manager --no-fork") end), - awful.key({ modkey, }, "p", function () awful.util.spawn("pidgin") end), - awful.key({ modkey, }, "i", function () awful.util.spawn(terminal .. " -geometry 100x30 -e " .. os.getenv("HOME") .. "/.scripts/start_remote_irssi.sh") end), - - awful.key({ }, "Print", function () awful.util.spawn("scrot", false) end), - awful.key({ modkey, }, "Print", function () awful.util.spawn("scrot -s", false) end), - awful.key({ modkey, }, "Pause", function () awful.util.spawn("xset r rate 250 50", false) end), - - awful.key({ }, "XF86MonBrightnessUp", function () awful.util.spawn("sudo brightness up", false) end), - awful.key({ }, "XF86MonBrightnessDown", function () awful.util.spawn("sudo brightness down", false) end), - awful.key({}, "XF86TouchpadToggle", function () awful.util.spawn(cmd.tggle_tpd, false) end), - awful.key({}, "XF86TouchpadOn", function () awful.util.spawn(cmd.tggle_tpd, false) end), - -- Manually mapped x220 micmute button to XF86Launch2 (prog2) in udev: keymap.rules - awful.key({}, "XF86AudioMute", function () awful.util.spawn(os.getenv("HOME") .. "/.scripts/toggle_mute.sh output", false) end), - awful.key({}, "XF86Launch2", function () awful.util.spawn(os.getenv("HOME") .. "/.scripts/toggle_mute.sh input", false) end), - - awful.key({ modkey, "Shift" }, "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, "Shift" }, "f", function () awful.layout.set(layouts[1]) end), - - awful.key({ modkey, "Control" }, "n", awful.client.restore), - - -- Prompt - awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end), - - awful.key({ modkey }, "F3", - function () - awful.prompt.run({ prompt = "Run Lua code: " }, - mypromptbox[mouse.screen].widget, - awful.util.eval, nil, - awful.util.getdir("cache") .. "/history_eval") - end) -) - -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, }, "q", 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", function (c) c.ontop = not c.ontop end), - --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), - awful.key({ modkey, }, "m", - function (c) - c.maximized_horizontal = not c.maximized_horizontal - c.maximized_vertical = not c.maximized_vertical - end) -) - --- 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 - globalkeys = awful.util.table.join(globalkeys, - awful.key({ modkey }, "#" .. i + 9, - function () - local screen = mouse.screen - if tags[screen][i] then - awful.tag.viewonly(tags[screen][i]) - end - end), - awful.key({ modkey, "Control" }, "#" .. i + 9, - function () - local screen = mouse.screen - if tags[screen][i] then - awful.tag.viewtoggle(tags[screen][i]) - end - end), - 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), - 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]) - end - end)) -end - -clientbuttons = awful.util.table.join( - awful.button({ }, 1, function (c) client.focus = c; c:raise() end), - awful.button({ modkey }, 1, function(c) client.focus=c; c:raise(); awful.mouse.client.move(c); end), - awful.button({ modkey }, 3, function(c) client.focus=c; c:raise(); awful.mouse.client.resize(c) end), - awful.button({ modkey }, 2, function(c) c:kill() end) -) - --- Set keys -root.keys(globalkeys) --- }}} - --- {{{ Rules -awful.rules.rules = { - -- All clients will match this rule. - { rule = { }, - properties = { border_width = beautiful.border_width, - border_color = beautiful.border_normal, - focus = true, - keys = clientkeys, - buttons = clientbuttons } }, - { rule = { class = "MPlayer" }, - properties = { floating = true } }, - { rule = { class = "pinentry" }, - properties = { floating = true } }, - { rule = { class = "gimp" }, - properties = { floating = true } }, - -- Set Firefox to always map on tags number 2 of screen 1. - -- { rule = { class = "Firefox" }, - -- properties = { tag = tags[1][2] } }, -} --- }}} - --- {{{ Signals --- Signal function to execute when a new client appears. -client.add_signal("manage", function (c, startup) - -- Give Client focus when entering a screen - c:add_signal("property::screen", function(c) client.focus = c end) - - -- Add a titlebar - -- awful.titlebar.add(c, { modkey = modkey }) - - 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.under_mouse(c) - awful.placement.no_offscreen(c) - end - end - c:add_signal("marked", function(c) c.border_color = beautiful.border_marked end) - c:add_signal("unmarked", function(c) - if client.focus ~= c then - c.border_color = beautiful.border_normal - else - c.border_color = beautiful.border_focus - end - 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) --- }}} - --- vim: softtabstop=4:expandtab:shiftwidth=4 diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index c58d101..32a3ce3 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -1,48 +1,523 @@ ----- After require("naughty") ----- {{{ 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 --- ----- Handle runtime errors after startup ---do --- local in_error = false --- awesome.add_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 = err }) --- in_error = false --- end) ---end ----- }}} - -local rc, err = loadfile(os.getenv("HOME").."/.config/awesome/awesome.lua"); -if rc then - rc, err = pcall(rc); - if rc then - return; - end +-- Standard awesome library +local gears = require("gears") +local awful = require("awful") +awful.rules = require("awful.rules") +require("awful.autofocus") +-- Widget and layout library +local wibox = require("wibox") +-- Theme handling library +local beautiful = require("beautiful") +-- Notification library +local naughty = require("naughty") +local menubar = require("menubar") + +local vicious = require("vicious") + +local switcher = require("switcher") + +-- {{{ 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 + +-- 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 = err }) + in_error = false + end) +end +-- }}} + +-- {{{ Autostart +local cmd = require("cmds") +local runonce = require("runonce") +local spawn_once = function(unit, cmd) runonce.run(cmd) end + +spawn_once("urxvtd", cmd.urxvtd) +spawn_once("pulseaudio", "start-pulseaudio-x11") +spawn_once("switch-icon", cmd.swIcon) +spawn_once("lxpolkit", "/usr/libexec/lxpolkit") +spawn_once("nm-applet", "nm-applet") + +-- }}} + +-- {{{ Variable definitions +-- Themes define colours, icons, font and wallpapers. +beautiful.init(os.getenv("HOME") .. "/.local/share/awesome/themes/zenburn/theme.lua") + +-- This is used later as the default terminal and editor to run. +terminal = "urxvtc" +editor = os.getenv("EDITOR") or "nano" +editor_cmd = terminal .. " -e " .. editor + +local spawn_from_awesome = awful.util.spawn + +awful.util.spawn("xsetroot -cursor_name left_ptr", false) + +-- Default modkey. +-- Usually, Mod4 is the key with a logo between Control and Alt. +-- If you do not like this or do not have such a key, +-- 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" + +-- Table of layouts to cover with awful.layout.inc, order matters. +local layouts = +{ + awful.layout.suit.floating, + awful.layout.suit.fair, + awful.layout.suit.fair.horizontal, + 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 +} +-- }}} + +-- {{{ Wallpaper +if beautiful.wallpaper then + for s = 1, screen.count() do + gears.wallpaper.maximized(beautiful.wallpaper, s, true) + end +end +-- }}} + +-- {{{ Tags +-- Define a tag table which hold all screen tags. +tags = {} +for s = 1, screen.count() do + -- Each screen has its own tag table. + tags[s] = awful.tag({ 1, 2, 3, 4, 5, 6, 7, 8, 9 }, s, layouts[1]) +end +-- }}} + +-- {{{ Menu +-- Create a laucher widget and a main menu +myawesomemenu = { + { "manual", terminal .. " -e man awesome" }, + { "edit config", editor_cmd .. " " .. awesome.conffile }, + { "restart", awesome.restart }, + { "quit", awesome.quit } +} + +mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, + { "open terminal", terminal } + } + }) + +mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, + menu = mymainmenu }) + +-- Menubar configuration +menubar.utils.terminal = terminal -- Set the terminal for applications that require it +-- }}} + +-- {{{ Wibox +-- Create a textclock widget +mytextclock = awful.widget.textclock() + +-- Create a wibox for each screen and add it +mywibox = {} +mypromptbox = {} +mylayoutbox = {} +mytaglist = {} +mytaglist.buttons = awful.util.table.join( + awful.button({ }, 1, awful.tag.viewonly), + awful.button({ modkey }, 1, awful.client.movetotag), + awful.button({ }, 3, awful.tag.viewtoggle), + awful.button({ modkey }, 3, awful.client.toggletag), + awful.button({ }, 4, function(t) awful.tag.viewnext(awful.tag.getscreen(t)) end), + awful.button({ }, 5, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end) + ) +mytasklist = {} +mytasklist.buttons = awful.util.table.join( + awful.button({ }, 1, function (c) + if c == client.focus then + c.minimized = true + else + -- Without this, the following + -- :isvisible() makes no sense + c.minimized = false + if not c:isvisible() then + awful.tag.viewonly(c:tags()[1]) + end + -- This will also un-minimize + -- the client, if needed + client.focus = c + c:raise() + end + end), + awful.button({ }, 3, function () + if instance then + instance:hide() + instance = nil + else + instance = awful.menu.clients({ + theme = { width = 250 } + }) + end + end), + 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)) + +mygmail = wibox.widget.textbox() +gmail_t = awful.tooltip({ objects = { mygmail },}) + +mygmailimg = wibox.widget.imagebox() +mygmailimg:set_image("/home/ben/.config/awesome/gmail.21.u.png") +vicious.widgets.gmail.feed = + vicious.register(mygmail, vicious.widgets.gmail, + function (widget, args) + gmail_t:set_text(args["{subject}"]) + gmail_t:add_to_object(mygmailimg) + return args["{count}"] + end, 60) + +for s = 1, screen.count() do + -- Create a promptbox for each screen + 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))) + -- Create a taglist widget + mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons) + + -- Create a tasklist widget + mytasklist[s] = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons) + + -- Create the wibox + mywibox[s] = awful.wibox({ position = "top", screen = s }) + + -- Widgets that are aligned to the left + local left_layout = wibox.layout.fixed.horizontal() + left_layout:add(mylauncher) + left_layout:add(mytaglist[s]) + left_layout:add(mypromptbox[s]) + + -- Widgets that are aligned to the right + local right_layout = wibox.layout.fixed.horizontal() + if s == 1 then right_layout:add(wibox.widget.systray()) end + right_layout:add(mygmail) + right_layout:add(mygmailimg) + right_layout:add(mytextclock) + right_layout:add(mylayoutbox[s]) + + -- Now bring it all together (with the tasklist in the middle) + local layout = wibox.layout.align.horizontal() + layout:set_left(left_layout) + layout:set_middle(mytasklist[s]) + layout:set_right(right_layout) + + mywibox[s]:set_widget(layout) end - -dofile("/etc/xdg/awesome/rc.lua"); - -for s = 1,screen.count() do - mypromptbox[s].text = awful.util.escape(err:match("[^\n]*")); +-- }}} + +-- {{{ Mouse bindings +root.buttons(awful.util.table.join( + awful.button({ }, 1, function () mymainmenu:close() end), + awful.button({ }, 3, function () mymainmenu:toggle() end), + awful.button({ }, 4, awful.tag.viewprev), + awful.button({ }, 5, awful.tag.viewnext) +)) +-- }}} + +-- {{{ 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, }, "j", + function () + awful.client.focus.byidx( 1) + if client.focus then client.focus:raise() end + end), + awful.key({ modkey, }, "k", + function () + awful.client.focus.byidx(-1) + if client.focus then client.focus:raise() end + end), + + -- Layout manipulation + awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end), + awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end), + awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end), + awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end), + awful.key({ modkey, }, "u", awful.client.urgent.jumpto), +-- awful.key({ modkey, }, "Tab", +-- function () +-- awful.client.focus.history.previous() +-- if client.focus then +-- client.focus:raise() +-- end +-- end), + awful.key({ modkey, }, "Tab", function() + switcher.start( 1, "Super_L", "Tab", "ISO_Left_Tab") + end), + + awful.key({ modkey, }, "ISO_Left_Tab", function() + switcher.start(-1, "Super_L", "Tab", "ISO_Left_Tab") + end), + + -- Standard program + awful.key({ modkey, }, "x", function () spawn_from_awesome(terminal, false) end), + awful.key({ modkey, }, "a", function () awful.util.spawn(terminal .. " -geometry 100x25 -e pa-sink-ctl" ) end), + awful.key({ modkey, }, "w", function () awful.util.spawn("chromium") end), + awful.key({ modkey, }, "n", function () awful.util.spawn("nautilus") end), + awful.key({ modkey, }, "v", function () awful.util.spawn("virt-manager --no-fork") end), + awful.key({ modkey, }, "p", function () awful.util.spawn("pidgin") end), + awful.key({ modkey, }, "i", function () awful.util.spawn(terminal .. " -geometry 100x30 -e " .. os.getenv("HOME") .. "/.scripts/start_remote_irssi.sh") end), + + awful.key({ }, "Print", function () awful.util.spawn("scrot", false) end), + awful.key({ modkey, }, "Print", function () awful.util.spawn("scrot -s", false) end), + awful.key({ modkey, }, "Pause", function () awful.util.spawn("xset r rate 250 50", false) end), + + awful.key({ }, "XF86MonBrightnessUp", function () awful.util.spawn("sudo brightness up", false) end), + awful.key({ }, "XF86MonBrightnessDown", function () awful.util.spawn("sudo brightness down", false) end), + awful.key({}, "XF86TouchpadToggle", function () awful.util.spawn(cmd.tggle_tpd, false) end), + awful.key({}, "XF86TouchpadOn", function () awful.util.spawn(cmd.tggle_tpd, false) end), + -- Manually mapped x220 micmute button to XF86Launch2 (prog2) in udev: keymap.rules + awful.key({}, "XF86AudioMute", function () awful.util.spawn(os.getenv("HOME") .. "/.scripts/toggle_mute.sh output", false) end), + awful.key({}, "XF86Launch2", function () awful.util.spawn(os.getenv("HOME") .. "/.scripts/toggle_mute.sh input", false) 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, "Shift" }, "f", function () awful.layout.set(layouts[1]) end), + + awful.key({ modkey, "Control" }, "n", awful.client.restore), + + -- Prompt + awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end), + + awful.key({ modkey }, "F3", + function () + awful.prompt.run({ prompt = "Run Lua code: " }, + mypromptbox[mouse.screen].widget, + awful.util.eval, nil, + awful.util.getdir("cache") .. "/history_eval") + end), + -- Menubar + awful.key({ modkey }, "p", function() menubar.show() end) +) + +clientkeys = awful.util.table.join( + awful.key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen end), + awful.key({ modkey, }, "q", 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", function (c) c.ontop = not c.ontop end), +-- 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), + awful.key({ modkey, }, "m", + function (c) + c.maximized_horizontal = not c.maximized_horizontal + c.maximized_vertical = not c.maximized_vertical + 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, 9 do + globalkeys = awful.util.table.join(globalkeys, + -- View tag only. + awful.key({ modkey }, "#" .. i + 9, + function () + local screen = mouse.screen + local tag = awful.tag.gettags(screen)[i] + if tag then + awful.tag.viewonly(tag) + end + end), + -- Toggle tag. + awful.key({ modkey, "Control" }, "#" .. i + 9, + function () + local screen = mouse.screen + local tag = awful.tag.gettags(screen)[i] + if tag then + awful.tag.viewtoggle(tag) + end + end), + -- Move client to tag. + awful.key({ modkey, "Shift" }, "#" .. i + 9, + function () + if client.focus then + local tag = awful.tag.gettags(client.focus.screen)[i] + if tag then + awful.client.movetotag(tag) + end + end + end), + -- Toggle tag. + awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9, + function () + if client.focus then + local tag = awful.tag.gettags(client.focus.screen)[i] + if tag then + awful.client.toggletag(tag) + end + end + end)) end -naughty.notify{text="Awesome crashed during startup on " .. - os.date("%d%/%m/%Y %T:\n\n") - .. err .. "\n", timeout = 0} +clientbuttons = awful.util.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), + awful.button({ modkey }, 2, function(c) c:kill() 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 = 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 } }, + -- Set Firefox to always map on tags number 2 of screen 1. + -- { rule = { class = "Firefox" }, + -- properties = { tag = tags[1][2] } }, +} +-- }}} + +-- {{{ Signals +-- Signal function to execute when a new client appears. +client.connect_signal("manage", function (c, startup) +-- -- Enable sloppy focus +-- c: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) + + -- Give Client focus when entering a screen + c:connect_signal("property::screen", function(c) client.focus = c 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.under_mouse(c) + awful.placement.no_offscreen(c) + end + end + + c:connect_signal("marked", function(c) c.border_color = beautiful.border_marked end) + c:connect_signal("unmarked", function(c) + if client.focus ~= c then + c.border_color = beautiful.border_normal + else + c.border_color = beautiful.border_focus + end + end) + + local titlebars_enabled = false + if titlebars_enabled and (c.type == "normal" or c.type == "dialog") then + -- 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) + ) + + -- Widgets that are aligned to the left + local left_layout = wibox.layout.fixed.horizontal() + left_layout:add(awful.titlebar.widget.iconwidget(c)) + left_layout:buttons(buttons) + + -- Widgets that are aligned to the right + local right_layout = wibox.layout.fixed.horizontal() + right_layout:add(awful.titlebar.widget.floatingbutton(c)) + right_layout:add(awful.titlebar.widget.maximizedbutton(c)) + right_layout:add(awful.titlebar.widget.stickybutton(c)) + right_layout:add(awful.titlebar.widget.ontopbutton(c)) + right_layout:add(awful.titlebar.widget.closebutton(c)) + + -- The title goes in the middle + local middle_layout = wibox.layout.flex.horizontal() + local title = awful.titlebar.widget.titlewidget(c) + title:set_align("center") + middle_layout:add(title) + middle_layout:buttons(buttons) + + -- Now bring it all together + local layout = wibox.layout.align.horizontal() + layout:set_left(left_layout) + layout:set_right(right_layout) + layout:set_middle(middle_layout) + + awful.titlebar(c):set_widget(layout) + end +end) -local f = io.open(os.getenv("HOME").."/tmp/awesome.error", "w+") -f:write("Awesome crashed during startup on ", os.date("%d%/%m/%Y %T:\n\n")) -f:write(err, "\n"); -f:close(); +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) +-- }}} diff --git a/.config/awesome/runonce.lua b/.config/awesome/runonce.lua index fd57cde..b0d7143 100644 --- a/.config/awesome/runonce.lua +++ b/.config/awesome/runonce.lua @@ -1,6 +1,8 @@ -- @author Peter J. Kranz (Absurd-Mind, peter@myref.net) -- Any questions, criticism or praise just drop me an email +local awful = require("awful") + local M = {} -- get the current Pid of awesome diff --git a/.config/awesome/switcher.lua b/.config/awesome/switcher.lua index c15f7ab..4f66305 100644 --- a/.config/awesome/switcher.lua +++ b/.config/awesome/switcher.lua @@ -5,8 +5,8 @@ -- Licensed under the GPL-3 ---------------------------------------------------------------- -- To use this module add: --- require("switcher") --- to the top of your rc.lua. +-- local switcher = require("switcher") +-- to the top of your rc.lua -- -- And add the following to your global keybindings: -- awful.key({ modkey, }, "Tab", function() @@ -87,7 +87,7 @@ local function switcher_end() capi.client.focus = c end -function switch(modifiers, key, event) +local function switch(modifiers, key, event) if event == "press" and key == state.key_next then switcher_next(1) elseif event == "press" and key == state.key_prev then @@ -112,4 +112,3 @@ function start(rel, key_mod, key_next, key_prev) switcher_next(rel) capi.keygrabber.run(switch) end - -- cgit