X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/4fa03df85745250f4d7db56800d6254fb034f132..766ce1f56ad3b29f3af98497df7e579b4839f0b5:/.config/awesome/rc.lua?ds=sidebyside;pf=etc diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 0d32ad3..2f556b1 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -7,7 +7,12 @@ require("beautiful") -- Notification library require("naughty") -require("vicious") +--require("vicious") + +require("obvious.battery") +require("obvious.clock") + +--require("bashets.bashets") -- Load Debian menu entries require("debian.menu") @@ -19,6 +24,8 @@ theme_path = "/usr/share/awesome/themes/default/theme.lua" -- Uncommment this for a lighter theme -- theme_path = "/usr/share/awesome/themes/sky/theme.lua" +wallpaper_cmd = { "awsetbg -t .config/awesome/bgstripes.png" } + -- Actually load theme beautiful.init(theme_path) @@ -106,9 +113,9 @@ tags.settings = { { name = "2", layout = layouts[1] }, { name = "3", layout = layouts[1] }, { name = "4", layout = layouts[1] }, - { name = "5", layout = layouts[1] }, - { name = "6", layout = layouts[5] }, - { name = "7", layout = layouts[5] }, + { name = "5", layout = layouts[5] }, + { name = "6", layout = layouts[3] }, + { name = "7", layout = layouts[3] }, { name = "8", layout = layouts[3] }, { name = "9", layout = layouts[3] }, } @@ -125,6 +132,11 @@ for s = 1, screen.count() do end tags[s][1].selected = true end + +if screen.count() == 3 then + tags[1][1].selected = false + tags[1][9].selected = true +end -- }}} -- {{{ Menu @@ -278,7 +290,8 @@ for s = 1, screen.count() do spacer, mytextclock, spacer, separator, spacer, - mybatterybox, + obvious.battery.widget, +-- mybatterybox, -- batterywidget, -- spacer, separator, spacer, -- cpuwidget.widget, @@ -370,7 +383,7 @@ clientkeys = awful.util.table.join( 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", awful.client.togglemarked ), + 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) @@ -433,17 +446,17 @@ globalkeys = awful.util.table.join(globalkeys, awful.key({ cmdmodkey }, "Down", function () awful.util.spawn("amixer set PCM 2-") end), awful.key({ cmdmodkey }, "Home", function () awful.util.spawn("amixer set Mic toggle") end), awful.key({ cmdmodkey }, "End", function () awful.util.spawn("amixer set Master toggle") end), - awful.key({ cmdmodkey }, "Left", function () awful.util.spawn("xmms2 prev") end), - awful.key({ cmdmodkey }, "Right", function () awful.util.spawn("xmms2 next") end), - awful.key({ cmdmodkey }, "space", function () awful.util.spawn("xmms2 toggleplay") end), + awful.key({ cmdmodkey }, "Left", function () awful.util.spawn("nyxmms2 prev") end), + awful.key({ cmdmodkey }, "Right", function () awful.util.spawn("nyxmms2 next") end), + awful.key({ cmdmodkey }, "space", function () awful.util.spawn("nyxmms2 toggle") end), awful.key({ cmdmodkey }, "backslash", function () - local f = io.popen('xmms2 current', 'r') - naughty.notify({ title = "Now playing", text = f:read(), timeout = 5 }) + local f = io.popen('nyxmms2 current', 'r') + naughty.notify({ title = "Now playing", text = string.sub(f:read(), 10), timeout = 5 }) f:close() end), awful.key({ cmdmodkey, "Shift" }, "backslash", function () - local f = io.popen('xmms2 list', 'r') - naughty.notify({ title = "Playlist", text = f:read(), timeout = 15 }) + local f = io.popen('nyxmms2 list', 'r') + naughty.notify({ title = "Playlist", text = f:read("*a"), timeout = 15 }) f:close() end) ) @@ -453,9 +466,13 @@ globalkeys = awful.util.table.join(globalkeys, awful.key({ cmdmodkey }, "n", function () awful.util.spawn("sensible-browser") end), awful.key({ cmdmodkey }, "m", function () awful.util.spawn(terminal .. " -e mutt -f =store") end), awful.key({ cmdmodkey }, "t", function () awful.util.spawn(terminal) end), - awful.key({ cmdmodkey }, "c", function () awful.util.spawn(terminal .. " -e python") end), + awful.key({ cmdmodkey }, "y", function () awful.util.spawn(terminal .. " -e python") end), + awful.key({ cmdmodkey }, "c", function () awful.util.spawn(terminal .. " -e wyrd") end), awful.key({ cmdmodkey }, "r", function () mypromptbox[mouse.screen]:run() end), - awful.key({ cmdmodkey }, "j", function () awful.util.spawn("jpilot") end), + awful.key({ cmdmodkey }, "g", function () awful.util.spawn("gscan2pdf") end), + awful.key({ cmdmodkey }, "o", function () awful.util.spawn("okular") end), + awful.key({ cmdmodkey }, "l", function () awful.util.spawn("libreoffice") end), + awful.key({ cmdmodkey }, "i", function () awful.util.spawn(terminal .. " -title irc -name irc -e ssh -Snone -t irc screen -dr irc") end), awful.key({ cmdmodkey }, "x", function () awful.util.spawn_with_shell("/sbin/start-stop-daemon --start --background --exec /usr/bin/xscreensaver; xscreensaver-command -lock") end), awful.key({ cmdmodkey, "Shift" }, "x", function () awful.util.spawn("xscreensaver-command -exit") end), awful.key(nil, "XF86ScreenSaver", function () awful.util.spawn("xset dpms force off") end) @@ -472,28 +489,24 @@ awful.rules.rules = { properties = { border_width = beautiful.border_width, border_color = beautiful.border_normal, focus = true, + floating = true, keys = clientkeys, - buttons = clientbuttons } }, - { rule = { class = "MPlayer" }, - properties = { floating = true } }, - { rule = { class = "pinentry" }, - properties = { floating = true } }, - { rule = { class = "gimp" }, - properties = { floating = true } }, - { rule = { class = "twinkle" }, - properties = { floating = true } }, - { rule = { class = "Play stream" }, - properties = { floating = true } }, - { rule = { class = "gscan2pdf" }, - properties = { floating = true } }, - { rule = { class = "Add-ons" }, - properties = { floating = true } }, - { rule = { class = "Iceweasel" }, - properties = { tag = tags[1][screen.count()>1 and 1 or 9], switchtotag = false } }, - { rule = { class = "Iceweasel", role = "Manager" }, - properties = { floating = true } }, - { rule = { class = "-v" }, - properties = { tag = screen.count()>1 and tags[3][2] or tags[1][8], switchtotag = false } }, + buttons = clientbuttons }, + callback = awful.placement.centered }, + { rule = { class = "URxvt" }, + properties = { floating = false } }, + { rule = { class = "URxvt", instance = "irc" }, + properties = { floating = false, tag = tags[screen.count()][screen.count() == 1 and 2 or 1], switchtotag = true } }, + { rule = { class = "Iceweasel", instance = "Navigator" }, + properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][9], switchtotag = false, floating = false } }, +-- { rule = { class = "Iceweasel", instance = "Dialog" }, +-- properties = { floating = true } }, + { rule = { class = "Jpilot", instance = "jpilot" }, + properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][8], switchtotag = true, floating = false } }, + -- { rule = { name = "OpenOffice.org" }, + -- properties = { switchtotag = true, floating = true, maximized_vertical = true, maximized_horizontal = true, callback = awful.placement.no_offscreen } }, + -- { rule = { name = "Okular" }, +-- properties = { switchtotag = true, floating = true, maximized_vertical = true, maximized_horizontal = true, callback = awful.placement.no_offscreen } }, } -- }}} @@ -518,15 +531,30 @@ client.add_signal("manage", function (c, startup) -- 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.center_vertical(c) + --awful.placement.center_horizontal(c) awful.placement.no_overlap(c) awful.placement.no_offscreen(c) end end + c.size_hints_honor = false 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) +function clear_urgency_flag(c) + print("property::urgent received for client: ", c) + io.flush () +-- if c.urgent then +-- c.urgent = false +-- end +end + +client.add_signal("new", function (c) + c:add_signal("property::urgent", clear_urgency_flag) +end) + -- Hook called every sixty seconds function hook_battery() mybatterybox.text = " " .. get_acpibatt() .. " " @@ -570,26 +598,10 @@ function get_acpibatt() return ''; end end -t = timer({ timeout = 20 }) -t:add_signal('timeout', hook_battery) -t:start() -hook_battery() +--t = timer({ timeout = 20 }) +--t:add_signal('timeout', hook_battery) +--t:start() +--hook_battery() +--bashets.register_lua(mybatterybox, get_acpibatt, '%1', 30) +--bashets.start() -- }}} - ---{{{ batt hook -local function get_bat() - local a = io.open("/sys/class/power_supply/BAT1/charge_full") - for line in a:lines() do - full = line - end - a:close() - local b = io.open("/sys/class/power_supply/BAT1/charge_now") - for line in b:lines() do - now = line - end - b:close() - batt=math.floor(now*100/full) - batterywidget:bar_data_add("bat",batt ) -end --- awful.hooks.timer.register(5, get_bat) ---}}}