X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/93bc739eb28a479240d52cc112e63b2cee7c2688..64db5d7e1f1f7c68d94a605cf78b29970c11817f:/.config/awesome/rc.lua diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 3f21875..bdbf42d 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -1,16 +1,24 @@ --- awesome 3 configuration file - --- Include awesome library, with lots of useful function! +-- Include awesome libraries, with lots of useful function! require("awful") -require("tabulous") require("beautiful") +-- Load Debian menu entries +require("debian.menu") + -- {{{ Variable definitions --- This is a file path to a theme file which will defines colors. -theme_path = "/home/madduck/code/awesome/share/awesome/themes/default" +-- Themes define colours, icons, and wallpapers +-- The default is a dark theme +theme_path = "/usr/share/awesome/themes/default/theme" +-- Uncommment this for a lighter theme +-- theme_path = "/usr/share/awesome/themes/sky/theme" --- This is used later as the default terminal to run. +-- Actually load theme +beautiful.init(theme_path) + +-- This is used later as the default terminal and editor to run. terminal = "x-terminal-emulator" +editor = os.getenv("EDITOR") or "editor" +editor_cmd = terminal .. " -e " .. editor -- Default modkey. -- Usually, Mod4 is the key with a logo between Control and Alt. @@ -30,6 +38,7 @@ layouts = "fairv", "magnifier", "max", + "fullscreen", -- "spiral", -- "dwindle", "floating" @@ -48,14 +57,14 @@ floatapps = ["GIMP"] = true, ["twinkle"] = true, ["Add-ons"] = true, - ["Play stream"] = true + ["Play stream"] = true, } -- Applications that should never float, assuming everything else floats -- (by instance) tiledapps = { - ["urxvt"] = true + ["urxvt"] = true, } -- Applications that should be maximised @@ -65,7 +74,8 @@ maxapps = ["Navigator"] = true, -- jpilot is -v ["-v"] = true, - ["Xpdf"] = true + ["Xpdf"] = true, + ["gscan2pdf"] = true } -- Applications to be moved to a pre-defined tag by class or instance. @@ -81,19 +91,6 @@ apptags = use_titlebar = false -- }}} --- {{{ Initialization --- Initialize theme (colors). -beautiful.init(theme_path) - --- Register theme in awful. --- This allows to not pass plenty of arguments to each function --- to inform it about colors we want it to draw. -awful.beautiful.register(beautiful) - --- Uncomment this to activate autotabbing --- tabulous.autotab_start() --- }}} - -- {{{ Tags -- Define tags table. tags = {} @@ -114,53 +111,83 @@ end -- }}} -- {{{ Wibox --- Create a taglist widget -mytaglist = widget({ type = "taglist", name = "mytaglist" }) -mytaglist:buttons({ - button({ }, 1, function (object, tag) awful.tag.viewonly(tag) end), - button({ modkey }, 1, function (object, tag) awful.client.movetotag(tag) end), - button({ }, 3, function (object, tag) tag.selected = not tag.selected end), - button({ modkey }, 3, function (object, tag) awful.client.toggletag(tag) end), - button({ }, 4, awful.tag.viewnext), - button({ }, 5, awful.tag.viewprev) -}) -mytaglist.label = awful.widget.taglist.label.all - --- Create a tasklist widget -mytasklist = widget({ type = "tasklist", name = "mytasklist" }) -mytasklist:buttons({ - button({ }, 1, function (object, c) client.focus = c; c:raise() end), - button({ }, 4, function () awful.client.focusbyidx(1) end), - button({ }, 5, function () awful.client.focusbyidx(-1) end) -}) -mytasklist.label = awful.widget.tasklist.label.currenttags - -- Create a textbox widget -mytimebox = widget({ type = "textbox", name = "mytimebox", align = "right" }) -mybatterybox = widget({ type = "textbox", name = "mybatterybox", align = "right" }) -mypromptbox = widget({ type = "textbox", name = "mypromptbox", align = "left" }) +mytextbox = widget({ type = "textbox", align = "right" }) +-- Set the default text in textbox +mytextbox.text = " " .. AWESOME_RELEASE .. " " + +-- Create a laucher widget and a main menu +myawesomemenu = { + { "manual", terminal .. " -e man awesome" }, + { "edit config", editor_cmd .. " " .. awful.util.getdir("config") .. "/rc.lua" }, + { "restart", awesome.restart }, + { "quit", awesome.quit } +} + +mymainmenu = awful.menu.new({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, + { "open terminal", terminal }, + { "Debian", debian.menu.Debian_menu.Debian } + } + }) --- Create a laucher widget -mylauncher = awful.widget.launcher({ name = "mylauncher", - image = "/home/madduck/code/awesome/share/awesome/icons/awesome16.png", - command = terminal .. " -e man awesome"}) +mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, + menu = mymainmenu }) -- Create a systray -mysystray = widget({ type = "systray", name = "mysystray", align = "right" }) +mysystray = widget({ type = "systray", align = "right" }) + +-- Create textbox widgets +mytimebox = widget({ type = "textbox", name = "mytimebox", align = "right" }) +mybatterybox = widget({ type = "textbox", name = "mybatterybox", align = "right" }) --- Create an iconbox widget which will contains an icon indicating which layout we're using. --- We need one layoutbox per screen. +-- Create a wibox for each screen and add it +mywibox = {} +mypromptbox = {} mylayoutbox = {} +mytaglist = {} +mytaglist.buttons = { button({ }, 1, awful.tag.viewonly), + button({ modkey }, 1, awful.client.movetotag), + button({ }, 3, function (tag) tag.selected = not tag.selected end), + button({ modkey }, 3, awful.client.toggletag), + button({ }, 4, awful.tag.viewnext), + button({ }, 5, awful.tag.viewprev) } +mytasklist = {} +mytasklist.buttons = { button({ }, 1, function (c) client.focus = c; c:raise() end), + button({ }, 3, function () awful.menu.clients({ width=250 }) end), + button({ }, 4, function () awful.client.focus.byidx(1) end), + button({ }, 5, function () awful.client.focus.byidx(-1) end) } + for s = 1, screen.count() do - mylayoutbox[s] = widget({ type = "imagebox", name = "mylayoutbox", align = "right" }) - mylayoutbox[s]:buttons({ - button({ }, 1, function () awful.layout.inc(layouts, 1) end), - button({ }, 3, function () awful.layout.inc(layouts, -1) end), - button({ }, 4, function () awful.layout.inc(layouts, 1) end), - button({ }, 5, function () awful.layout.inc(layouts, -1) end) - }) - mylayoutbox[s].image = image("/home/madduck/code/awesome/share/awesome/icons/layouts/tilew.png") + -- Create a promptbox for each screen + mypromptbox[s] = widget({ type = "textbox", align = "left" }) + -- Create an imagebox widget which will contains an icon indicating which layout we're using. + -- We need one layoutbox per screen. + mylayoutbox[s] = widget({ type = "imagebox", align = "right" }) + mylayoutbox[s]:buttons({ button({ }, 1, function () awful.layout.inc(layouts, 1) end), + button({ }, 3, function () awful.layout.inc(layouts, -1) end), + button({ }, 4, function () awful.layout.inc(layouts, 1) end), + button({ }, 5, function () awful.layout.inc(layouts, -1) end) }) + -- Create a taglist widget + mytaglist[s] = awful.widget.taglist.new(s, awful.widget.taglist.label.all, mytaglist.buttons) + + -- Create a tasklist widget + mytasklist[s] = awful.widget.tasklist.new(function(c) + return awful.widget.tasklist.label.currenttags(c, s) + end, mytasklist.buttons) + + -- Create the wibox + mywibox[s] = wibox({ position = "top", fg = beautiful.fg_normal, bg = beautiful.bg_normal }) + -- Add widgets to the wibox - order matters + mywibox[s].widgets = { mytaglist[s], + mytasklist[s], + mypromptbox[s], + mybatterybox, + mytimebox, + mylayoutbox[s], + s == screen.count() and mysystray or nil } + mywibox[s].screen = s end +-- }}} --Battery widget batterywidget = widget({ type = 'progressbar', name = 'batterywidget' }) @@ -182,29 +209,10 @@ batterywidget:bar_properties_set('bat', { }) -- }}} --- Create a wibox for each screen and add it -mywibox = {} -for s = 1, screen.count() do - mywibox[s] = wibox({ position = "top", name = "mywibox" .. s, - fg = beautiful.fg_normal, bg = beautiful.bg_normal }) - -- Add widgets to the wibox - order matters - mywibox[s]:widgets({ - mytaglist, - mytasklist, - mypromptbox, --- batterywidget, --- mybatterybox, - mytimebox, - mylayoutbox[s], - s == screen.count() and mysystray or nil - }) - mywibox[s].screen = s -end --- }}} -- {{{ Mouse bindings awesome.buttons({ - button({ }, 3, function () awful.util.spawn(terminal) end), + button({ }, 3, function () mymainmenu:toggle() end), button({ }, 4, awful.tag.viewnext), button({ }, 5, awful.tag.viewprev) }) @@ -260,27 +268,27 @@ keybinding({ modkey }, "Escape", awful.tag.history.restore):add() keybinding({ modkey }, "Return", function () awful.util.spawn(terminal) end):add() keybinding({ modkey, "Control" }, "r", function () - mypromptbox.text = + mypromptbox[mouse.screen].text = awful.util.escape(awful.util.restart()) end):add() keybinding({ modkey, "Shift" }, "q", awesome.quit):add() -- Client manipulation keybinding({ modkey }, "m", awful.client.maximize):add() -keybinding({ modkey }, "f", function () client.focus.fullscreen = not client.focus.fullscreen end):add() -keybinding({ modkey, "Shift" }, "c", function () client.focus:kill() end):add() -keybinding({ modkey }, "j", function () awful.client.focus.byidx(1); client.focus:raise() end):add() -keybinding({ modkey }, "k", function () awful.client.focus.byidx(-1); client.focus:raise() end):add() -keybinding({ modkey, "Shift" }, "j", function () awful.client.swap(1) end):add() -keybinding({ modkey, "Shift" }, "k", function () awful.client.swap(-1) end):add() +keybinding({ modkey }, "f", function () if client.focus then client.focus.fullscreen = not client.focus.fullscreen end end):add() +keybinding({ modkey, "Shift" }, "c", function () if client.focus then client.focus:kill() end end):add() +keybinding({ modkey }, "j", function () awful.client.focus.byidx(1); if client.focus then client.focus:raise() end end):add() +keybinding({ modkey }, "k", function () awful.client.focus.byidx(-1); if client.focus then client.focus:raise() end end):add() +keybinding({ modkey, "Shift" }, "j", function () awful.client.swap.byidx(1) end):add() +keybinding({ modkey, "Shift" }, "k", function () awful.client.swap.byidx(-1) end):add() keybinding({ modkey, "Control" }, "j", function () awful.screen.focus(1) end):add() keybinding({ modkey, "Control" }, "k", function () awful.screen.focus(-1) end):add() keybinding({ modkey, "Control" }, "space", awful.client.togglefloating):add() -keybinding({ modkey, "Control" }, "Return", function () client.focus:swap(awful.client.master()) end):add() +keybinding({ modkey, "Control" }, "Return", function () if client.focus then client.focus:swap(awful.client.getmaster()) end end):add() keybinding({ modkey }, "o", awful.client.movetoscreen):add() keybinding({ modkey }, "Tab", awful.client.focus.history.previous):add() keybinding({ modkey }, "u", awful.client.urgent.jumpto):add() -keybinding({ modkey, "Shift" }, "r", function () client.focus:redraw() end):add() +keybinding({ modkey, "Shift" }, "r", function () if client.focus then client.focus:redraw() end end):add() -- Layout manipulation keybinding({ modkey }, "l", function () awful.tag.incmwfact(0.05) end):add() @@ -294,29 +302,34 @@ keybinding({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, - -- Prompt keybinding({ modkey }, "F1", function () - awful.prompt.run({ prompt = "Run: " }, mypromptbox, awful.util.spawn, awful.completion.bash, -os.getenv("HOME") .. "/.cache/awesome/history") end):add() + awful.prompt.run({ prompt = "Run: " }, mypromptbox[mouse.screen], awful.util.spawn, awful.completion.bash, + awful.util.getdir("cache") .. "/history") + end):add() keybinding({ modkey }, "F4", function () - awful.prompt.run({ prompt = "Run Lua code: " }, mypromptbox, awful.eval, awful.prompt.bash, -os.getenv("HOME") .. "/.cache/awesome/history_eval") end):add() + awful.prompt.run({ prompt = "Run Lua code: " }, mypromptbox[mouse.screen], awful.util.eval, awful.prompt.bash, + awful.util.getdir("cache") .. "/history_eval") + end):add() + keybinding({ modkey, "Ctrl" }, "i", function () - if mypromptbox.text then - mypromptbox.text = nil - else - mypromptbox.text = nil + local s = mouse.screen + if mypromptbox[s].text then + mypromptbox[s].text = nil + elseif client.focus then + mypromptbox[s].text = nil if client.focus.class then - mypromptbox.text = "Class: " .. client.focus.class .. " " + mypromptbox[s].text = "Class: " .. client.focus.class .. " " end if client.focus.instance then - mypromptbox.text = mypromptbox.text .. "Instance: ".. client.focus.instance .. " " + mypromptbox[s].text = mypromptbox[s].text .. "Instance: ".. client.focus.instance .. " " end if client.focus.role then - mypromptbox.text = mypromptbox.text .. "Role: ".. client.focus.role + mypromptbox[s].text = mypromptbox[s].text .. "Role: ".. client.focus.role end end end):add() --- Tabulous, tab manipulation +require("tabulous") keybinding({ modkey, "Control" }, "y", function () local tabbedview = tabulous.tabindex_get() local nextclient = awful.client.next(1) @@ -396,12 +409,12 @@ awful.hooks.marked.register(function (c) c.border_color = beautiful.border_marked end) --- Hook function to execute when unmarking a client +-- Hook function to execute when unmarking a client. awful.hooks.unmarked.register(function (c) c.border_color = beautiful.border_focus end) --- Hook function to execute when the mouse is over a client. +-- Hook function to execute when the mouse enters a client. awful.hooks.mouse_enter.register(function (c) -- Sloppy focus, but disabled for magnifier layout if awful.layout.get(c.screen) ~= "magnifier" @@ -426,7 +439,6 @@ awful.hooks.manage.register(function (c) -- if they're not focusable, so set border anyway. c.border_width = beautiful.border_width c.border_color = beautiful.border_normal - client.focus = c -- Check if the application should be floating. -- OVERRIDDEN, SEE tiledapps BELOW @@ -453,11 +465,14 @@ awful.hooks.manage.register(function (c) awful.client.movetotag(tags[target.screen][target.tag], c) end + -- Do this after tag mapping, so you don't see it on the wrong tag for a split second. + client.focus = c + -- Set the windows at the slave, -- i.e. put it at the end of others instead of setting it master. -- awful.client.setslave(c) - -- Honor size hints: if you want to drop the gaps between windows, set this to false. | if maxapps[inst] or maxapps[cls] then + -- Honor size hints: if you want to drop the gaps between windows, set this to false. c.honorsizehints = true -- Maximise some @@ -466,12 +481,12 @@ awful.hooks.manage.register(function (c) end end) --- Hook function to execute when arranging the screen +-- Hook function to execute when arranging the screen. -- (tag switch, new client, etc) awful.hooks.arrange.register(function (screen) local layout = awful.layout.get(screen) if layout then - mylayoutbox[screen].image = image("/home/madduck/code/awesome/share/awesome/icons/layouts/" .. layout .. "w.png") + mylayoutbox[screen].image = image(beautiful["layout_" .. layout]) else mylayoutbox[screen].image = nil end @@ -486,7 +501,7 @@ awful.hooks.arrange.register(function (screen) -- Uncomment if you want mouse warping --[[ if client.focus then - local c_c = client.focus:coords() + local c_c = client.focus:fullgeometry() local m_c = mouse.coords() if m_c.x < c_c.x or m_c.x >= c_c.x + c_c.width or @@ -524,7 +539,7 @@ function get_acpibatt() local s = f:read('*l') f:close() if not s then - return laststring; + return '-'; end -- Battery 0: Discharging, 89%, 00:02:14 remaining @@ -547,7 +562,7 @@ function get_acpibatt() elseif status == 'Discarching' then status = 'd'; else - status = ''; + status = '-'; end return percent; -- .. ' (' .. status .. ')'; -- .. ' ' .. time .. ' left';