potato/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes rc.lua for desktop.

Browse Source
This commit is contained in:
Ian Adam Naval 2014-04-16 02:31:41 -04:00
parent 7b34acb50c
commit 3cefee938a
1 changed files with 205 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

390
awesome/awesome.configdir/rc.lua
View File

@ -3,38 +3,46 @@ local gears = require("gears")
local awful = require("awful") local awful = require("awful")
awful.rules = require("awful.rules") awful.rules = require("awful.rules")
require("awful.autofocus") require("awful.autofocus")
-- Widget and layout library -- Widget and layout library
local wibox = require("wibox") local wibox = require("wibox")
-- Theme handling library -- Theme handling library
local beautiful = require("beautiful") local beautiful = require("beautiful")
-- Notification library -- Notification library
local naughty = require("naughty") local naughty = require("naughty")
local menubar = require("menubar") local menubar = require("menubar")
require('freedesktop.utils') -- Freedesktop utilities
require('freedesktop.menu') local freedesktoputils = require('freedesktop.utils')
-- require("debian.menu") local freedesktopmenu = require('freedesktop.menu')
-- {{{ Error handling -- {{{ Error handling
-- Check if awesome encountered an error during startup and fell back to -- Check if awesome encountered an error during startup and fell back to
-- another config (This code will only ever execute for the fallback config) -- another config (This code will only ever execute for the fallback config)
if awesome.startup_errors then if awesome.startup_errors then
naughty.notify({ preset = naughty.config.presets.critical, naughty.notify({
title = "Oops, there were errors during startup!", preset = naughty.config.presets.critical,
text = awesome.startup_errors }) title = "Oops, there were errors during startup!",
text = awesome.startup_errors
})
end end
-- Handle runtime errors after startup -- Handle runtime errors after startup
do do
local in_error = false local in_error = false
awesome.connect_signal("debug::error", function (err) awesome.connect_signal("debug::error",
function (err)
-- Make sure we don't go into an endless error loop -- Make sure we don't go into an endless error loop
if in_error then return end if in_error then return end
in_error = true in_error = true
naughty.notify({ preset = naughty.config.presets.critical, naughty.notify({
title = "Oops, an error happened!", preset = naughty.config.presets.critical,
text = err }) title = "Oops, an error happened!",
text = err
})
in_error = false in_error = false
end) end)
end end
@ -49,8 +57,10 @@ terminal = "terminology"
editor = os.getenv("EDITOR") or "vim" editor = os.getenv("EDITOR") or "vim"
editor_cmd = terminal .. " -e " .. editor editor_cmd = terminal .. " -e " .. editor
freedesktop.utils.terminal = terminal -- default: "xterm" -- For freedesktop menu
freedesktop.utils.icon_theme = 'gnome' -- look inside /usr/share/icons/, default: nil (don't use icon theme) freedesktop.utils.terminal = terminal -- default: "xterm"
freedesktop.utils.icon_theme = 'gnome' -- look inside /usr/share/icons/, default: nil (don't use icon theme)
freedesktop.utils.app_folders = { "/usr/share/applications/", "~/.local/share/applications/" }
-- Default modkey. -- Default modkey.
-- Usually, Mod4 is the key with a logo between Control and Alt. -- Usually, Mod4 is the key with a logo between Control and Alt.
@ -97,25 +107,23 @@ end
-- {{{ Menu -- {{{ Menu
-- Create a laucher widget and a main menu -- Create a laucher widget and a main menu
myawesomemenu = { myawesomemenu = {
{ "manual", terminal .. " -e man awesome" }, { "manual", terminal .. " -e man awesome" },
{ "edit config", editor_cmd .. " " .. awesome.conffile }, { "edit config", editor_cmd .. " " .. awesome.conffile },
{ "restart", awesome.restart }, { "restart", awesome.restart },
{ "quit", awesome.quit } { "quit", awesome.quit }
} }
-- Add freedesktop menu
menu_items = freedesktop.menu.new() menu_items = freedesktop.menu.new()
table.insert(menu_items, { "awesome", myawesomemenu, beautiful.awesome_icon }) table.insert(menu_items, { "awesome", myawesomemenu, beautiful.awesome_icon })
table.insert(menu_items, { "open terminal", terminal }) table.insert(menu_items, { "open terminal", terminal })
mymainmenu = awful.menu({ items = menu_items }) mymainmenu = awful.menu({ items = menu_items })
mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, mylauncher = awful.widget.launcher({
menu = mymainmenu }) image = beautiful.awesome_icon,
menu = mymainmenu
-- Menubar configuration })
menubar.utils.terminal = terminal -- Set the terminal for applications that require it
menubar.app_folders = { "/usr/share/applications/", "~/.local/share/applications/" }
-- }}} -- }}}
@ -129,47 +137,48 @@ mypromptbox = {}
mylayoutbox = {} mylayoutbox = {}
mytaglist = {} mytaglist = {}
mytaglist.buttons = awful.util.table.join( mytaglist.buttons = awful.util.table.join(
awful.button({ }, 1, awful.tag.viewonly), awful.button({ }, 1, awful.tag.viewonly),
awful.button({ modkey }, 1, awful.client.movetotag), awful.button({ modkey }, 1, awful.client.movetotag),
awful.button({ }, 3, awful.tag.viewtoggle), awful.button({ }, 3, awful.tag.viewtoggle),
awful.button({ modkey }, 3, awful.client.toggletag), awful.button({ modkey }, 3, awful.client.toggletag),
awful.button({ }, 4, function(t) awful.tag.viewnext(awful.tag.getscreen(t)) end), 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) awful.button({ }, 5, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end)
) )
mytasklist = {} mytasklist = {}
mytasklist.buttons = awful.util.table.join( mytasklist.buttons = awful.util.table.join(
awful.button({ }, 1, function (c) awful.button({ }, 1, function (c)
if c == client.focus then if c == client.focus then
c.minimized = true c.minimized = true
else else
-- Without this, the following -- Without this, the following
-- :isvisible() makes no sense -- :isvisible() makes no sense
c.minimized = false c.minimized = false
if not c:isvisible() then if not c:isvisible() then
awful.tag.viewonly(c:tags()[1]) awful.tag.viewonly(c:tags()[1])
end end
-- This will also un-minimize -- This will also un-minimize
-- the client, if needed -- the client, if needed
client.focus = c client.focus = c
c:raise() c:raise()
end end
end), end),
awful.button({ }, 3, function () awful.button({ }, 3, function ()
if instance then if instance then
instance:hide() instance:hide()
instance = nil instance = nil
else else
instance = awful.menu.clients({ width=250 }) instance = awful.menu.clients({ width=250 })
end end
end), end),
awful.button({ }, 4, function () awful.button({ }, 4, function ()
awful.client.focus.byidx(1) awful.client.focus.byidx(1)
if client.focus then client.focus:raise() end if client.focus then client.focus:raise() end
end), end),
awful.button({ }, 5, function ()
awful.client.focus.byidx(-1) awful.button({ }, 5, function ()
if client.focus then client.focus:raise() end awful.client.focus.byidx(-1)
end)) if client.focus then client.focus:raise() end
end))
for s = 1, screen.count() do for s = 1, screen.count() do
-- Create a promptbox for each screen -- Create a promptbox for each screen
@ -178,10 +187,10 @@ for s = 1, screen.count() do
-- We need one layoutbox per screen. -- We need one layoutbox per screen.
mylayoutbox[s] = awful.widget.layoutbox(s) mylayoutbox[s] = awful.widget.layoutbox(s)
mylayoutbox[s]:buttons(awful.util.table.join( mylayoutbox[s]:buttons(awful.util.table.join(
awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end), awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end),
awful.button({ }, 3, 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({ }, 4, function () awful.layout.inc(layouts, 1) end),
awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end))) awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end)))
-- Create a taglist widget -- Create a taglist widget
mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons) mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons)
@ -191,41 +200,52 @@ for s = 1, screen.count() do
-- Create the wibox -- Create the wibox
mywibox[s] = awful.wibox({ position = "top", screen = s }) mywibox[s] = awful.wibox({ position = "top", screen = s })
batterywidget = wibox.widget.textbox() -- Only create sysmon stuff for one screen
batterywidget:set_text("Battery | ") if s == 1 then
batterywidgettimer = timer({ timeout = 5 }) batterywidget = wibox.widget.textbox()
batterywidgettimer:connect_signal("timeout", batterywidget:set_text("No battery | ")
function() batterywidgettimer = timer({ timeout = 5 })
fh = assert(io.popen("cat /sys/class/power_supply/BAT1/capacity", "r")) batterywidgettimer:connect_signal("timeout",
batterywidget:set_text(fh:read("*l") .. "% | ") function()
fh:close() fh = assert(io.popen("cat /sys/class/power_supply/BAT1/capacity", "r"))
end battery = fh:read("*l")
) if battery then
batterywidgettimer:start() batterywidget:set_text(battery .. "% | ")
end
fh:close()
end)
batterywidgettimer:start()
memorywidget = wibox.widget.textbox() memorywidget = wibox.widget.textbox()
memorywidget:set_text("Memory | ") memorywidget:set_text("Memory | ")
memorywidgettimer = timer({ timeout = 5 }) memorywidgettimer = timer({ timeout = 5 })
memorywidgettimer:connect_signal("timeout", memorywidgettimer:connect_signal("timeout",
function() function()
fh = assert(io.popen("free -m | grep '-' | awk '{print $4}'", "r")) fh = assert(io.popen("free -m | grep '-' | awk '{print $4}'", "r"))
memorywidget:set_text(fh:read("*l") .. " MB | ") memory = fh:read("*l")
fh:close() if memory then
end memorywidget:set_text(memory .. " MB | ")
) end
memorywidgettimer:start() fh:close()
end)
memorywidgettimer:start()
loadwidget = wibox.widget.textbox()
loadwidget:set_text("Load | ")
loadwidgettimer = timer({ timeout = 5 })
loadwidgettimer:connect_signal("timeout",
function()
fh = assert(io.popen("uptime | sed -e 's/.*average: //' | sed -e 's/,.*//'", "r"))
loadavg = fh:read("*l")
if loadavg then
loadwidget:set_text(loadavg .. " | ")
end
fh:close()
end
)
loadwidgettimer:start()
end
loadwidget = wibox.widget.textbox()
loadwidget:set_text("Load | ")
loadwidgettimer = timer({ timeout = 5 })
loadwidgettimer:connect_signal("timeout",
function()
fh = assert(io.popen("uptime | sed -e 's/.*average: //' | sed -e 's/,.*//'", "r"))
loadwidget:set_text(fh:read("*l") .. " | ")
fh:close()
end
)
loadwidgettimer:start()
-- Widgets that are aligned to the left -- Widgets that are aligned to the left
local left_layout = wibox.layout.fixed.horizontal() local left_layout = wibox.layout.fixed.horizontal()
left_layout:add(mylauncher) left_layout:add(mylauncher)
@ -237,11 +257,13 @@ loadwidgettimer:start()
-- Widgets that are aligned to the right -- Widgets that are aligned to the right
local right_layout = wibox.layout.fixed.horizontal() local right_layout = wibox.layout.fixed.horizontal()
if s == 1 then right_layout:add(wibox.widget.systray()) end if s == 1 then
right_layout:add(loadwidget) right_layout:add(wibox.widget.systray())
right_layout:add(memorywidget) right_layout:add(loadwidget)
right_layout:add(batterywidget) right_layout:add(memorywidget)
right_layout:add(mytextclock) right_layout:add(batterywidget)
right_layout:add(mytextclock)
end
right_layout:add(mylayoutbox[s]) right_layout:add(mylayoutbox[s])
-- Now bring it all together (with the tasklist in the middle) -- Now bring it all together (with the tasklist in the middle)
@ -259,7 +281,7 @@ root.buttons(awful.util.table.join(
awful.button({ }, 3, function () mymainmenu:toggle() end), awful.button({ }, 3, function () mymainmenu:toggle() end),
awful.button({ }, 4, awful.tag.viewnext), awful.button({ }, 4, awful.tag.viewnext),
awful.button({ }, 5, awful.tag.viewprev) awful.button({ }, 5, awful.tag.viewprev)
)) ))
-- }}} -- }}}
-- {{{ Key bindings -- {{{ Key bindings
@ -272,12 +294,12 @@ globalkeys = awful.util.table.join(
function () function ()
awful.client.focus.byidx( 1) awful.client.focus.byidx( 1)
if client.focus then client.focus:raise() end if client.focus then client.focus:raise() end
end), end),
awful.key({ modkey, }, "k", awful.key({ modkey, }, "k",
function () function ()
awful.client.focus.byidx(-1) awful.client.focus.byidx(-1)
if client.focus then client.focus:raise() end if client.focus then client.focus:raise() end
end), end),
awful.key({ modkey, }, "w", function () mymainmenu:show() end), awful.key({ modkey, }, "w", function () mymainmenu:show() end),
-- Layout manipulation -- Layout manipulation
@ -292,7 +314,7 @@ globalkeys = awful.util.table.join(
if client.focus then if client.focus then
client.focus:raise() client.focus:raise()
end end
end), end),
-- Standard program -- Standard program
awful.key({ modkey, "Control" }, "l", function () awful.util.spawn("xscreensaver-command -lock") end), awful.key({ modkey, "Control" }, "l", function () awful.util.spawn("xscreensaver-command -lock") end),
@ -315,20 +337,20 @@ globalkeys = awful.util.table.join(
awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end), awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end),
awful.key({ modkey }, "x", awful.key({ modkey }, "x",
function () function ()
awful.prompt.run({ prompt = "Run Lua code: " }, awful.prompt.run({ prompt = "Run Lua code: " },
mypromptbox[mouse.screen].widget, mypromptbox[mouse.screen].widget,
awful.util.eval, nil, awful.util.eval, nil,
awful.util.getdir("cache") .. "/history_eval") awful.util.getdir("cache") .. "/history_eval")
end), end),
-- Menubar -- Menubar
awful.key({ modkey }, "p", function() menubar.show() end) awful.key({ modkey }, "p", function() menubar.show() end)
) )
clientkeys = awful.util.table.join( clientkeys = awful.util.table.join(
awful.key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen end), 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, "Shift" }, "c", function (c) c:kill() end),
awful.key({ modkey, "Alt" }, "f4", function (c) c:kill() end), awful.key({ modkey, "Alt" }, "f4", function (c) c:kill() end),
awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle ), 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, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
awful.key({ modkey, }, "o", awful.client.movetoscreen ), awful.key({ modkey, }, "o", awful.client.movetoscreen ),
@ -338,13 +360,13 @@ clientkeys = awful.util.table.join(
-- The client currently has the input focus, so it cannot be -- The client currently has the input focus, so it cannot be
-- minimized, since minimized clients can't have the focus. -- minimized, since minimized clients can't have the focus.
c.minimized = true c.minimized = true
end), end),
awful.key({ modkey, }, "m", awful.key({ modkey, }, "m",
function (c) function (c)
c.maximized_horizontal = not c.maximized_horizontal c.maximized_horizontal = not c.maximized_horizontal
c.maximized_vertical = not c.maximized_vertical c.maximized_vertical = not c.maximized_vertical
end) end)
) )
-- Bind all key numbers to tags. -- Bind all key numbers to tags.
-- Be careful: we use keycodes to make it works on any keyboard layout. -- Be careful: we use keycodes to make it works on any keyboard layout.
@ -353,55 +375,54 @@ for i = 1, 9 do
globalkeys = awful.util.table.join(globalkeys, globalkeys = awful.util.table.join(globalkeys,
-- Brightness -- Brightness
awful.key({ }, "XF86MonBrightnessDown", function ()
awful.key({ }, "XF86MonBrightnessDown", function () awful.util.spawn("xbacklight -dec 10") end),
awful.util.spawn("xbacklight -dec 10") end), awful.key({ }, "XF86MonBrightnessUp", function ()
awful.key({ }, "XF86MonBrightnessUp", function () awful.util.spawn("xbacklight -inc 10") end),
awful.util.spawn("xbacklight -inc 10") end), awful.key({ }, "XF86AudioLowerVolume", function ()
awful.key({ }, "XF86AudioLowerVolume", function () awful.util.spawn("amixer -q set Master 5%-") end),
awful.util.spawn("amixer -q set Master 5%-") end), awful.key({ }, "XF86AudioRaiseVolume", function ()
awful.key({ }, "XF86AudioRaiseVolume", function () awful.util.spawn("amixer -q set Master 5%+") end),
awful.util.spawn("amixer -q set Master 5%+") end), awful.key({ }, "XF86AudioMute", function ()
awful.key({ }, "XF86AudioMute", function () awful.util.spawn("amixer -q set Master toggle") end),
awful.util.spawn("amixer -q set Master toggle") end), awful.key({ }, "Print", function ()
awful.key({ }, "Print", function () awful.util.spawn("scrot -s -e 'mv $f ~/Pictures/'") end),
awful.util.spawn("scrot -s -e 'mv $f ~/Pictures/'") end),
awful.key({ modkey }, "#" .. i + 9, awful.key({ modkey }, "#" .. i + 9,
function () function ()
local screen = mouse.screen local screen = mouse.screen
local tag = awful.tag.gettags(screen)[i] local tag = awful.tag.gettags(screen)[i]
if tag then if tag then
awful.tag.viewonly(tag) awful.tag.viewonly(tag)
end end
end), end),
awful.key({ modkey, "Control" }, "#" .. i + 9, awful.key({ modkey, "Control" }, "#" .. i + 9,
function () function ()
local screen = mouse.screen local screen = mouse.screen
local tag = awful.tag.gettags(screen)[i] local tag = awful.tag.gettags(screen)[i]
if tag then if tag then
awful.tag.viewtoggle(tag) awful.tag.viewtoggle(tag)
end end
end), end),
awful.key({ modkey, "Shift" }, "#" .. i + 9, awful.key({ modkey, "Shift" }, "#" .. i + 9,
function () function ()
if client.focus then if client.focus then
local tag = awful.tag.gettags(client.focus.screen)[i] local tag = awful.tag.gettags(client.focus.screen)[i]
if tag then if tag then
awful.client.movetotag(tag) awful.client.movetotag(tag)
end end
end end
end), end),
awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9, awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
function () function ()
if client.focus then if client.focus then
local tag = awful.tag.gettags(client.focus.screen)[i] local tag = awful.tag.gettags(client.focus.screen)[i]
if tag then if tag then
awful.client.toggletag(tag) awful.client.toggletag(tag)
end end
end end
end)) end))
end end
clientbuttons = awful.util.table.join( clientbuttons = awful.util.table.join(
@ -417,17 +438,17 @@ root.keys(globalkeys)
awful.rules.rules = { awful.rules.rules = {
-- All clients will match this rule. -- All clients will match this rule.
{ rule = { }, { rule = { },
properties = { border_width = beautiful.border_width, properties = { border_width = beautiful.border_width,
border_color = beautiful.border_normal, border_color = beautiful.border_normal,
focus = awful.client.focus.filter, focus = awful.client.focus.filter,
keys = clientkeys, keys = clientkeys,
buttons = clientbuttons } }, buttons = clientbuttons } },
{ rule = { class = "MPlayer" }, { rule = { class = "MPlayer" },
properties = { floating = true } }, properties = { floating = true } },
{ rule = { class = "pinentry" }, { rule = { class = "pinentry" },
properties = { floating = true } }, properties = { floating = true } },
{ rule = { class = "gimp" }, { rule = { class = "gimp" },
properties = { floating = true } }, properties = { floating = true } },
-- Set Firefox to always map on tags number 2 of screen 1. -- Set Firefox to always map on tags number 2 of screen 1.
-- { rule = { class = "Firefox" }, -- { rule = { class = "Firefox" },
-- properties = { tag = tags[1][2] } }, -- properties = { tag = tags[1][2] } },
@ -461,17 +482,17 @@ client.connect_signal("manage", function (c, startup)
if titlebars_enabled and (c.type == "normal" or c.type == "dialog") then if titlebars_enabled and (c.type == "normal" or c.type == "dialog") then
-- buttons for the titlebar -- buttons for the titlebar
local buttons = awful.util.table.join( local buttons = awful.util.table.join(
awful.button({ }, 1, function() awful.button({ }, 1, function()
client.focus = c client.focus = c
c:raise() c:raise()
awful.mouse.client.move(c) awful.mouse.client.move(c)
end), end),
awful.button({ }, 3, function() awful.button({ }, 3, function()
client.focus = c client.focus = c
c:raise() c:raise()
awful.mouse.client.resize(c) awful.mouse.client.resize(c)
end) end)
) )
-- Widgets that are aligned to the left -- Widgets that are aligned to the left
local left_layout = wibox.layout.fixed.horizontal() local left_layout = wibox.layout.fixed.horizontal()
@ -506,4 +527,3 @@ end)
client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end) client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
-- }}} -- }}}