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

146
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({
preset = naughty.config.presets.critical,
title = "Oops, there were errors during startup!", title = "Oops, there were errors during startup!",
text = awesome.startup_errors }) 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({
preset = naughty.config.presets.critical,
title = "Oops, an error happened!", title = "Oops, an error happened!",
text = err }) 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.
@ -103,19 +113,17 @@ myawesomemenu = {
{ "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/" }
-- }}} -- }}}
@ -135,7 +143,7 @@ mytaglist.buttons = awful.util.table.join(
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)
@ -154,22 +162,23 @@ mytasklist.buttons = awful.util.table.join(
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.button({ }, 5, 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))
for s = 1, screen.count() do for s = 1, screen.count() do
-- Create a promptbox for each screen -- Create a promptbox for each screen
@ -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 | ")
batterywidgettimer = timer({ timeout = 5 })
batterywidgettimer:connect_signal("timeout",
function() function()
fh = assert(io.popen("cat /sys/class/power_supply/BAT1/capacity", "r")) fh = assert(io.popen("cat /sys/class/power_supply/BAT1/capacity", "r"))
batterywidget:set_text(fh:read("*l") .. "% | ") battery = fh:read("*l")
fh:close() if battery then
batterywidget:set_text(battery .. "% | ")
end end
) fh:close()
batterywidgettimer:start() 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
memorywidget:set_text(memory .. " MB | ")
end end
) fh:close()
memorywidgettimer:start() end)
memorywidgettimer:start()
loadwidget = wibox.widget.textbox() loadwidget = wibox.widget.textbox()
loadwidget:set_text("Load | ") loadwidget:set_text("Load | ")
loadwidgettimer = timer({ timeout = 5 }) loadwidgettimer = timer({ timeout = 5 })
loadwidgettimer:connect_signal("timeout", loadwidgettimer:connect_signal("timeout",
function() function()
fh = assert(io.popen("uptime | sed -e 's/.*average: //' | sed -e 's/,.*//'", "r")) fh = assert(io.popen("uptime | sed -e 's/.*average: //' | sed -e 's/,.*//'", "r"))
loadwidget:set_text(fh:read("*l") .. " | ") loadavg = fh:read("*l")
if loadavg then
loadwidget:set_text(loadavg .. " | ")
end
fh:close() fh:close()
end end
) )
loadwidgettimer:start() loadwidgettimer:start()
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()
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(wibox.widget.systray())
right_layout:add(loadwidget) right_layout:add(loadwidget)
right_layout:add(memorywidget) right_layout:add(memorywidget)
right_layout:add(batterywidget) right_layout:add(batterywidget)
right_layout:add(mytextclock) 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
@ -323,7 +345,7 @@ globalkeys = awful.util.table.join(
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),
@ -344,7 +366,7 @@ clientkeys = awful.util.table.join(
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,22 +375,21 @@ 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]
@ -376,7 +397,7 @@ for i = 1, 9 do
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]
@ -384,7 +405,7 @@ for i = 1, 9 do
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]
@ -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)
-- }}} -- }}}