From b0510ce32cf33900d7918392701943a9817cbf71 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 23 Jul 2015 11:08:21 -0300 Subject: Move stuff away from rc.lua --- config.dot/awesome.link/rc.lua | 337 +++-------------------------------------- 1 file changed, 18 insertions(+), 319 deletions(-) (limited to 'config.dot/awesome.link/rc.lua') diff --git a/config.dot/awesome.link/rc.lua b/config.dot/awesome.link/rc.lua index 9669bbc..c7928f6 100644 --- a/config.dot/awesome.link/rc.lua +++ b/config.dot/awesome.link/rc.lua @@ -1,3 +1,8 @@ +-- Basic settings +homedir = os.getenv("HOME") +configdir = homedir .. "/.config/awesome" +themes_dir = configdir .. "/themes" + -- Standard awesome library require("awful") require("awful.autofocus") @@ -15,335 +20,32 @@ require("vicious") -- Load Debian menu entries require("debian.menu") --- {{{ Variable definitions --- Folders -homedir = os.getenv("HOME") -configdir = homedir .. "/.config/awesome" -themes_dir = configdir .. "/themes" +-- Variables +dofile(configdir .. "/variables.lua") -- Themes define colours, icons, and wallpapers ---beautiful.init(themes_dir .. "/simplex/theme.lua") beautiful.init(themes_dir .. "/powerarrow/theme.lua") --- This is used later as the default terminal and editor to run. -terminal = "terminal" -editor = os.getenv("EDITOR") or "editor" -editor_cmd = terminal .. " " .. editor - --- 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.max, - awful.layout.suit.floating, - awful.layout.suit.tile, - awful.layout.suit.tile.left, - awful.layout.suit.tile.bottom, - awful.layout.suit.tile.top, - --awful.layout.suit.fair, - --awful.layout.suit.fair.horizontal, - --awful.layout.suit.spiral, - --awful.layout.suit.spiral.dwindle, - --awful.layout.suit.max.fullscreen, - --awful.layout.suit.magnifier -} --- }}} - --- {{{ Misc functions +-- Misc functions dofile(configdir .. "/functions.lua") --- }}} --- {{{ 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 --- }}} +-- Tags +dofile(configdir .. "/tags.lua") -- Menu dofile(configdir .. "/menu.lua") --- {{{ Wibox - --- 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.viewnext), - awful.button({ }, 5, awful.tag.viewprev) - ) - -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 - 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)) - --- Widgets -dofile(configdir .. "/widgets.lua") - -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 }) - mywibox[s] = awful.wibox({ position = "top", screen = s, height = "16" }) - -- Add widgets to the wibox - order matters - mywibox[s].widgets = { - { - mylauncher, - mytaglist[s], - mypromptbox[s], - layout = awful.widget.layout.horizontal.leftright - }, - mylayoutbox[s], - - s == 1 and mysystray or nil, - arr1, - spr3f, - binaryclock.widget, - spr3f, - arrl, - --my_cal.widget, - arr2, - --netwidget, - --neticon, - arr3, - batwidget, - baticon, - arr4, - --fswidget, - --udisks_glue.widget, - arr5, - sensors, - tempicon, - arr6, - --cpuwidget, - --cpuicon, - arr7, - --memwidget, - --memicon, - arr8, - --task_warrior.widget, - arr9, - --music, - arr0, - --mailicon, - arr9, - spr, - -- s == 1 and mysystray, spr or nil, mytasklist[s], +-- Wibox +dofile(configdir .. "/wibox.lua") - --mytextclock, - --volume_widget, - --battery_widget, - myledbox, - awesompd and musicwidget.widget or nil, - mytasklist[s], - layout = awful.widget.layout.horizontal.rightleft - } -end --- }}} +-- Mouse +dofile(configdir .. "/mouse.lua") --- {{{ Mouse bindings -root.buttons(awful.util.table.join( - awful.button({ }, 3, function () mymainmenu:toggle() end), - awful.button({ }, 4, awful.tag.viewnext), - awful.button({ }, 5, awful.tag.viewprev) -)) --- }}} +-- Global keys +dofile(configdir .. "/globalkeys.lua") --- {{{ 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), - 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), - - --- Default tab behavior - awful.key({ modkey, }, "Tab", - function () - awful.client.focus.history.previous() - if client.focus then - client.focus:raise() - end - end), - - --- Cyclic tab behavior - --- See http://stackoverflow.com/questions/11697102/awesome-alttab-just-switches-between-two-apps - awful.key({ "Mod1", "Shift" }, "Tab", - function () - -- awful.client.focus.history.previous() - awful.client.focus.byidx(-1) - if client.focus then - client.focus:raise() - end - end), - awful.key({ "Mod1", }, "Tab", - function () - -- awful.client.focus.history.previous() - awful.client.focus.byidx(1) - if client.focus then - client.focus:raise() - end - end), - - -- 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), - - -- Prompt - awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end) - - --awful.key({ modkey }, "x", - -- 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, }, "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) c.minimized = not c.minimized 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, awful.mouse.client.move), - awful.button({ modkey }, 3, awful.mouse.client.resize)) - --- Set keys -root.keys(globalkeys) --- }}} +-- Custom keys +dofile(configdir .. "/keys.lua") -- Rules dofile(configdir .. "/rules.lua") @@ -351,8 +53,5 @@ dofile(configdir .. "/rules.lua") -- Signals dofile(configdir .. "/signals.lua") --- Custom key mappings -dofile(configdir .. "/keys.lua") - -- Startup commands dofile(configdir .. "/programs.lua") -- cgit v1.2.3