X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/d48d9054871da65e6f0c02f3c8faa2c49fcbd30f..1895071b65aa44015ad09cf5b08566bfd9a18a34:/.config/awesome/rc.lua diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 088ba67..4a28c5e 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") @@ -285,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, @@ -377,12 +383,28 @@ 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) - c.maximized_horizontal = not c.maximized_horizontal - c.maximized_vertical = not c.maximized_vertical + -- silly lua can't do bitwise operations + if not c.maximized_horizontal and not c.maximized_vertical then + c.maximized_horizontal = true + c.maximized_vertical = true + elseif c.maximized_horizontal and c.maximized_vertical then + c.maximized_horizontal = false + c.maximized_vertical = true + elseif not c.maximized_horizontal and c.maximized_vertical then + c.maximized_horizontal = true + c.maximized_vertical = false + elseif c.maximized_horizontal and not c.maximized_vertical then + c.maximized_horizontal = false + c.maximized_vertical = false + end + -- b = c.maximized_horizontal + c.maximized_vertical * 2 + -- b = (b + 1) % 4 + -- c.maximized_horizontal = b & 1 + -- c.maximized_vertical = (b & 2) >>1 end) ) @@ -444,8 +466,10 @@ globalkeys = awful.util.table.join(globalkeys, 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('nyxmms2 status', 'r') - naughty.notify({ title = "Now playing", text = f:read(), timeout = 5 }) + local f = io.popen('nyxmms2 current', 'r') + for s, t in string.gmatch(f:read(), '(%w+):%s+([^:]+)') do + naughty.notify({ title = s, text = t, timeout = 5 }) + end f:close() end), awful.key({ cmdmodkey, "Shift" }, "backslash", function () @@ -460,11 +484,14 @@ 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("icedove") end), awful.key({ cmdmodkey }, "r", function () mypromptbox[mouse.screen]:run() end), - awful.key({ cmdmodkey }, "j", function () awful.util.spawn("jpilot") 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 }, "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 mosh -- 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 -- -no-capture-stderr -log ~/.tmp/xscreensaver.log; 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) ) @@ -490,13 +517,13 @@ awful.rules.rules = { 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 = "Icedove", instance = "Mail" }, + properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][8], 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" }, + -- { 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 } }, } -- }}} @@ -589,26 +616,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) ---}}}