X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/311e3834c913999f702be34f7f813b18f3ef14e5..eb63f8b326b9c076cf2d57aa73176f935c670fdc:/.config/awesome/rc.lua?ds=inline
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index f7a4bd0..8d95a9f 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -29,7 +29,7 @@ layouts =
"tileleft",
"tilebottom",
"tiletop",
--- "magnifier",
+ "magnifier",
"max",
-- "spiral",
-- "dwindle",
@@ -52,10 +52,10 @@ floatapps =
}
-- Applications to be moved to a pre-defined tag by class or instance.
--- Use the screen and workspace indices.
+-- Use the screen and tags indices.
apptags =
{
- ["Firefox"] = { screen = 1, tag = 9 },
+ ["Iceweasel"] = { screen = 1, tag = 9 },
["jpilot"] = { screen = 1, tag = 8 },
}
@@ -87,7 +87,7 @@ for s = 1, screen.count() do
tags[s][tagnumber] = tag({ name = tagnumber, layout = layouts[1] })
-- Add tags to screen one by one
-- split at 0.5/50% exactly
- tags[s][tagnumber].mwfact = 0.5
+ -- tags[s][tagnumber].mwfact = 0.5
tags[s][tagnumber].screen = s
end
-- I'm sure you want to see at least one tag.
@@ -108,15 +108,14 @@ mytaglist.label = awful.widget.taglist.label.all
-- Create a tasklist widget
mytasklist = widget({ type = "tasklist", name = "mytasklist" })
-mytasklist:mouse_add(mouse({ }, 1, function (object, c) c:focus_set(); c:raise() end))
+mytasklist:mouse_add(mouse({ }, 1, function (object, c) client.focus = c; c:raise() end))
mytasklist:mouse_add(mouse({ }, 4, function () awful.client.focusbyidx(1) end))
mytasklist:mouse_add(mouse({ }, 5, function () awful.client.focusbyidx(-1) end))
mytasklist.label = awful.widget.tasklist.label.currenttags
-- Create a textbox widget
-mytextbox = widget({ type = "textbox", name = "mytextbox", align = "right" })
--- Set the default text in textbox
-mytextbox.text = " awesome " .. AWESOME_VERSION .. " "
+mytimebox = widget({ type = "textbox", name = "mytimebox", align = "right" })
+mybatterybox = widget({ type = "textbox", name = "mybatterybox", align = "right" })
mypromptbox = widget({ type = "textbox", name = "mypromptbox", align = "left" })
-- Create an iconbox widget
@@ -138,21 +137,42 @@ for s = 1, screen.count() do
mylayoutbox[s].text = ""
end
+--Battery widget
+batterywidget = widget({ type = 'progressbar', name = 'batterywidget' })
+batterywidget.width = 100
+batterywidget.height = 0.8
+batterywidget.gap = 1
+batterywidget.border_padding = 1
+batterywidget.border_width = 1
+batterywidget.ticks_count = 10
+batterywidget.ticks_gap = 1
+batterywidget.vertical = false
+batterywidget:bar_properties_set('bat', {
+ bg = 'black',
+ fg = 'blue4',
+ fg_off = 'red',
+ reverse = false,
+ min_value = 0,
+ max_value = 100
+})
+-- }}}
+
-- Create a statusbar for each screen and add it
mystatusbar = {}
for s = 1, screen.count() do
mystatusbar[s] = statusbar({ position = "top", name = "mystatusbar" .. s,
- fg = beautiful.fg_normal, bg = beautiful.bg_normal })
+ fg = beautiful.fg_normal, bg = beautiful.bg_normal })
-- Add widgets to the statusbar - order matters
- mystatusbar[s].widgets =
- {
+ mystatusbar[s]:widgets({
mytaglist,
mytasklist,
mypromptbox,
- mytextbox,
+-- batterywidget,
+ mybatterybox,
+ mytimebox,
mylayoutbox[s],
s == screen.count() and mysystray or nil
- }
+ })
mystatusbar[s].screen = s
end
-- }}}
@@ -189,7 +209,7 @@ for i = 1, keynumber do
end):add()
keybinding({ modkey, "Shift" }, i,
function ()
- local sel = client.focus_get()
+ local sel = client.focus
if sel then
if tags[sel.screen][i] then
awful.client.movetotag(tags[sel.screen][i])
@@ -198,7 +218,7 @@ for i = 1, keynumber do
end):add()
keybinding({ modkey, "Control", "Shift" }, i,
function ()
- local sel = client.focus_get()
+ local sel = client.focus
if sel then
if tags[sel.screen][i] then
awful.client.toggletag(tags[sel.screen][i])
@@ -219,17 +239,19 @@ keybinding({ modkey, "Shift" }, "q", awesome.quit):add()
-- Client manipulation
keybinding({ modkey }, "m", awful.client.maximize):add()
-keybinding({ modkey, "Shift" }, "c", function () client.focus_get():kill() end):add()
-keybinding({ modkey }, "j", function () awful.client.focusbyidx(1); client.focus_get():raise() end):add()
-keybinding({ modkey }, "k", function () awful.client.focusbyidx(-1); client.focus_get():raise() end):add()
+keybinding({ modkey, "Shift" }, "c", function () client.focus:kill() end):add()
+keybinding({ modkey }, "j", function () awful.client.focusbyidx(1); client.focus:raise() end):add()
+keybinding({ modkey }, "k", function () awful.client.focusbyidx(-1); client.focus:raise() end):add()
keybinding({ modkey, "Shift" }, "j", function () awful.client.swap(1) end):add()
keybinding({ modkey, "Shift" }, "k", function () awful.client.swap(-1) end):add()
keybinding({ modkey, "Control" }, "j", function () awful.screen.focus(1) end):add()
keybinding({ modkey, "Control" }, "k", function () awful.screen.focus(-1) end):add()
keybinding({ modkey, "Control" }, "space", awful.client.togglefloating):add()
-keybinding({ modkey, "Control" }, "Return", function () client.focus_get():swap(awful.client.master()) end):add()
+keybinding({ modkey, "Control" }, "Return", function () client.focus:swap(awful.client.master()) end):add()
keybinding({ modkey }, "o", awful.client.movetoscreen):add()
keybinding({ modkey }, "Tab", awful.client.focus.history.previous):add()
+keybinding({ modkey }, "u", awful.client.urgent.jumpto):add()
+keybinding({ modkey, "Shift" }, "r", function () client.focus:redraw() end):add()
-- Layout manipulation
keybinding({ modkey }, "l", function () awful.tag.incmwfact(0.05) end):add()
@@ -243,11 +265,27 @@ keybinding({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -
-- Prompt
keybinding({ modkey }, "F1", function ()
- awful.prompt({ prompt = "Run: " }, mypromptbox, awful.spawn, awful.completion.bash)
- end):add()
+ awful.prompt.run({ prompt = "Run: " }, mypromptbox, awful.spawn, awful.completion.bash,
+os.getenv("HOME") .. "/.cache/awesome/history") end):add()
keybinding({ modkey }, "F4", function ()
- awful.prompt({ prompt = "Run Lua code: " }, mypromptbox, awful.eval)
- end):add()
+ awful.prompt.run({ prompt = "Run Lua code: " }, mypromptbox, awful.eval, awful.prompt.bash,
+os.getenv("HOME") .. "/.cache/awesome/history_eval") end):add()
+keybinding({ modkey, "Ctrl" }, "i", function ()
+ if mypromptbox.text then
+ mypromptbox.text = nil
+ else
+ mypromptbox.text = nil
+ if client.focus.class then
+ mypromptbox.text = "Class: " .. client.focus.class .. " "
+ end
+ if client.focus.instance then
+ mypromptbox.text = mypromptbox.text .. "Instance: ".. client.focus.instance .. " "
+ end
+ if client.focus.role then
+ mypromptbox.text = mypromptbox.text .. "Role: ".. client.focus.role
+ end
+ end
+ end):add()
--- Tabulous, tab manipulation
keybinding({ modkey, "Control" }, "y", function ()
@@ -261,7 +299,7 @@ keybinding({ modkey, "Control" }, "y", function ()
tabbedview = tabulous.tab_create()
tabulous.tab(tabbedview, nextclient)
else
- tabulous.tab(tabbedview, client.focus_get())
+ tabulous.tab(tabbedview, client.focus)
end
else
tabulous.tab(tabbedview, nextclient)
@@ -338,7 +376,7 @@ end
function hook_mouseover(c)
-- Sloppy focus, but disabled for magnifier layout
if awful.layout.get(c.screen) ~= "magnifier" then
- c:focus_set()
+ client.focus = c
end
end
@@ -351,14 +389,14 @@ function hook_manage(c)
awful.titlebar.add(c, { modkey = modkey })
end
-- Add mouse bindings
- c:mouse_add(mouse({ }, 1, function (c) c:focus_set(); c:raise() end))
+ c:mouse_add(mouse({ }, 1, function (c) client.focus = c; c:raise() end))
c:mouse_add(mouse({ modkey }, 1, function (c) c:mouse_move() end))
c:mouse_add(mouse({ modkey }, 3, function (c) c:mouse_resize() end))
-- New client may not receive focus
-- if they're not focusable, so set border anyway.
c.border_width = beautiful.border_width
c.border_color = beautiful.border_normal
- c:focus_set()
+ client.focus = c
-- Check if the application should be floating.
local cls = c.class
@@ -388,26 +426,31 @@ end
-- Hook function to execute when arranging the screen
-- (tag switch, new client, etc)
function hook_arrange(screen)
- mylayoutbox[screen].text =
- ""
+ local layout = awful.layout.get(screen)
+ if layout then
+ mylayoutbox[screen].text =
+ ""
+ else
+ mylayoutbox[screen].text = "No layout."
+ end
-- If no window has focus, give focus to the latest in history
- if not client.focus_get() then
+ if not client.focus then
local c = awful.client.focus.history.get(screen, 0)
- if c then c:focus_set() end
+ if c then client.focus = c end
end
-- Uncomment if you want mouse warping
--[[
- local sel = client.focus_get()
+ local sel = client.focus
if sel then
- local c_c = sel.coords
- local m_c = mouse.coords
+ local c_c = sel:coords()
+ local m_c = mouse.coords()
if m_c.x < c_c.x or m_c.x >= c_c.x + c_c.width or
m_c.y < c_c.y or m_c.y >= c_c.y + c_c.height then
if table.maxn(m_c.buttons) == 0 then
- mouse.coords = { x = c_c.x + 5, y = c_c.y + 5}
+ mouse.coords({ x = c_c.x + 5, y = c_c.y + 5})
end
end
end
@@ -415,13 +458,77 @@ function hook_arrange(screen)
end
-- Hook called every second
-function hook_timer ()
+function hook_timer()
-- For unix time_t lovers
-- mytextbox.text = " " .. os.time() .. " time_t "
-- Otherwise use:
- mytextbox.text = " " .. os.date() .. " "
+ mytimebox.text = " " .. os.date() .. " "
end
+-- Hook called every sixty seconds
+function hook_battery()
+ mybatterybox.text = " " .. get_acpibatt() .. " "
+end
+
+-- {{{ Statusbar battery
+--
+function get_acpibatt()
+
+ local f = io.popen('acpi -b', 'r')
+ if not f then
+ return "acpi -b failed"
+ end
+
+ local s = f:read('*l')
+ f:close()
+ if not s then
+ return laststring;
+ end
+
+ -- Battery 0: Discharging, 89%, 00:02:14 remaining
+ -- Battery 0: Charging, 58%, 00:02:14 until charged
+ -- Battery 0: Full, 100%
+ -- so find the first bit first and then go look for the time
+ local st, en, status, percent = string.find(s, '%a+%s%d:%s(%a+),%s(%d+%%)');
+ local st, en, time = string.find(s, ',%s(%d+:%d+:%d+)%s%a+', en);
+
+ if not status or not percent then -- time can be empty if we're full
+ return "couldn't parse line " .. s
+ end
+
+ if not time then
+ return percent
+ end
+
+ if status == 'Charging' then
+ status = 'c';
+ elseif status == 'Discarching' then
+ status = 'd';
+ else
+ status = '';
+ end
+
+ return percent; -- .. ' (' .. status .. ')'; -- .. ' ' .. time .. ' left';
+end
+-- }}}
+
+--{{{ 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
+--}}}
+
-- Set up some hooks
awful.hooks.focus.register(hook_focus)
awful.hooks.unfocus.register(hook_unfocus)
@@ -431,6 +538,8 @@ awful.hooks.manage.register(hook_manage)
awful.hooks.mouseover.register(hook_mouseover)
awful.hooks.arrange.register(hook_arrange)
awful.hooks.timer.register(1, hook_timer)
+awful.hooks.timer.register(120, hook_battery)
+-- awful.hooks.timer.register(5, get_bat)
-- }}}
cmdmodkey = "Mod3"
@@ -457,3 +566,14 @@ keybinding({ cmdmodkey }, "r", function () awful.spawn("gmrun") end):add()
keybinding({ cmdmodkey }, "j", function () awful.spawn("jpilot") end):add()
keybinding({ cmdmodkey }, "x", function () awful.spawn("/sbin/start-stop-daemon --start --background --exec /usr/bin/xscreensaver; xscreensaver-command -lock") end):add()
keybinding({ cmdmodkey, "Shift" }, "x", function () awful.spawn("xscreensaver-command -exit") end):add()
+
+-- Highlight statusbars on the screen that has focus,
+-- set this to false if you only have one screen or
+-- you don't like it :P
+if screen.count() > 1 then
+ statusbar_highlight_focus = true
+else
+ statusbar_highlight_focus = false
+end
+
+hook_battery()