From: martin f. krafft <madduck@madduck.net>
Date: Mon, 2 Nov 2009 11:36:32 +0000 (+0100)
Subject: updates
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/4fa03df85745250f4d7db56800d6254fb034f132

updates
---

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 0fbd3b6..0d32ad3 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -7,6 +7,8 @@ require("beautiful")
 -- Notification library
 require("naughty")
 
+require("vicious")
+
 -- Load Debian menu entries
 require("debian.menu")
 
@@ -35,74 +37,93 @@ modkey = "Mod4"
 -- Table of layouts to cover with awful.layout.inc, order matters.
 layouts =
 {
-    awful.layout.suit.tile,
-    awful.layout.suit.tile.left,
-    awful.layout.suit.tile.bottom,
-    awful.layout.suit.tile.top,
+--    awful.layout.suit.tile,
+--    awful.layout.suit.tile.left,
+--    awful.layout.suit.tile.bottom,
+--    awful.layout.suit.tile.top,
     awful.layout.suit.fair,
     awful.layout.suit.fair.horizontal,
-    awful.layout.suit.spiral,
-    awful.layout.suit.spiral.dwindle,
+--    awful.layout.suit.spiral,
+--    awful.layout.suit.spiral.dwindle,
     awful.layout.suit.max,
-    awful.layout.suit.max.fullscreen,
+--    awful.layout.suit.max.fullscreen,
     awful.layout.suit.magnifier,
     awful.layout.suit.floating
 }
 
--- Table of clients that should be set floating. The index may be either
--- the application class or instance. The instance is useful when running
--- a console app in a terminal like (Music on Console)
---    xterm -name mocp -e mocp
--- OVERRULED BY TILEDAPPS BELOW
-floatapps =
-{
-    -- by class
-    ["MPlayer"] = true,
-    ["pinentry"] = true,
-    ["GIMP"] = true,
-    ["twinkle"] = true,
-    ["Add-ons"] = true,
-    ["Play stream"] = true,
-    ["gscan2pdf"] = true,
-}
-
--- Applications that should never float, assuming everything else floats
--- (by instance)
-tiledapps =
-{
-    ["urxvt"] = true,
-}
-
--- Applications that should be maximised
--- (by instance)
-maxapps =
-{
-    ["Navigator"] = true,
-    -- jpilot is -v
-    ["-v"] = true,
-    ["Xpdf"] = true,
-    ["gscan2pdf"] = true
-}
-
--- Applications to be moved to a pre-defined tag by class or instance.
--- Use the screen and tags indices.
-apptags =
-{
-    ["Navigator"] = { screen = 1, tag = 9 },
-    -- jpilot is -v
-    ["-v"] = { screen = 1, tag = 8 },
-}
+---- Table of clients that should be set floating. The index may be either
+---- the application class or instance. The instance is useful when running
+---- a console app in a terminal like (Music on Console)
+----    xterm -name mocp -e mocp
+---- OVERRULED BY TILEDAPPS BELOW
+--floatapps =
+--{
+--    -- by class
+--    ["MPlayer"] = true,
+--    ["pinentry"] = true,
+--    ["GIMP"] = true,
+--    ["twinkle"] = true,
+--    ["Add-ons"] = true,
+--    ["Play stream"] = true,
+--    ["gscan2pdf"] = true,
+--}
+--
+---- Applications that should never float, assuming everything else floats
+---- (by instance)
+--tiledapps =
+--{
+--    ["urxvt"] = true,
+--}
+--
+---- Applications that should be maximised
+---- (by instance)
+--maxapps =
+--{
+--    ["Navigator"] = true,
+--    -- jpilot is -v
+--    ["-v"] = true,
+--    ["Xpdf"] = true,
+--    ["gscan2pdf"] = true
+--}
+--
+---- Applications to be moved to a pre-defined tag by class or instance.
+---- Use the screen and tags indices.
+--apptags =
+--{
+--    ["Navigator"] = { screen = 1, tag = 9 },
+--    -- jpilot is -v
+--    ["-v"] = { screen = 1, tag = 8 },
+--}
 
 -- Define if we want to use titlebar on all applications.
 use_titlebar = false
 -- }}}
 
 -- {{{ Tags
--- Define a tag table which hold all screen tags.
 tags = {}
+tags.settings = {
+    { name = "1", layout = layouts[1] },
+    { 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 = "8", layout = layouts[3] },
+    { name = "9", layout = layouts[3] },
+}
+
+-- Define a tag table which hold all screen tags.
 for s = 1, screen.count() do
-    -- Each screen has its own tag table.
-    tags[s] = awful.tag({ 1, 2, 3, 4, 5, 6, 7, 8, 9 }, s)
+    tags[s] = {}
+    for i, v in ipairs(tags.settings) do
+        tags[s][i] = tag({ name = v.name })
+        tags[s][i].screen = s
+        awful.tag.setproperty(tags[s][i], "layout", v.layout)
+        awful.tag.setproperty(tags[s][i], "mwfact", v.mwfact)
+        awful.tag.setproperty(tags[s][i], "hide",   v.hide)
+    end
+    tags[s][1].selected = true
 end
 -- }}}
 
@@ -126,11 +147,62 @@ mylauncher = awful.widget.launcher({ image = image(beautiful.awesome_icon),
 -- }}}
 
 -- {{{ Wibox
+
+-- {{{ Reusable separators
+spacer         = widget({ type = "textbox", name = "spacer" })
+separator      = widget({ type = "textbox", name = "separator" })
+spacer.text    = " "
+separator.text = "Ù­"
+-- }}}
+
+---- {{{ CPU usage and temperature
+---- Widget icon
+--cpuicon        = widget({ type = "imagebox", name = "cpuicon" })
+--cpuicon.image  = image(beautiful.widget_cpu)
+---- Initialize widgets
+--thermalwidget  = widget({ type = "textbox", name = "thermalwidget" })
+--cpuwidget      = awful.widget.graph({ layout = awful.widget.layout.horizontal.rightleft })
+---- Graph properties
+--cpuwidget:set_width(50)
+----cpuwidget:set_scale(false)
+--cpuwidget:set_max_value(100)
+--cpuwidget:set_background_color(beautiful.fg_off_widget)
+--cpuwidget:set_border_color(beautiful.border_widget)
+--cpuwidget:set_color(beautiful.fg_end_widget)
+--cpuwidget:set_gradient_angle(0)
+--cpuwidget:set_gradient_colors({
+--    beautiful.fg_end_widget,
+--    beautiful.fg_center_widget,
+--    beautiful.fg_widget })
+---- Register widgets
+--vicious.register(cpuwidget, vicious.widgets.cpu, "$1")
+--vicious.register(thermalwidget, vicious.widgets.thermal, "CPU: $1°C", 19, "hwmon0")
+---- }}}
+
+-- 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 textclock widget
-mytextclock = awful.widget.textclock({ align = "right" })
+mytextclock = awful.widget.textclock({ align = "right" }, "%a %d %b %H:%M:%S", 1)
 
 -- Create a systray
-mysystray = widget({ type = "systray" })
+mysystray = widget({ type = "systray", align = "right" })
 
 mybatterybox = widget({ type = "textbox", name = "mybatterybox", align = "right" })
 
@@ -203,36 +275,24 @@ for s = 1, screen.count() do
             layout = awful.widget.layout.horizontal.leftright
         },
         mylayoutbox[s],
+        spacer,
         mytextclock,
+        spacer, separator, spacer,
         mybatterybox,
+--        batterywidget,
+--        spacer, separator, spacer,
+--        cpuwidget.widget,
+--        spacer, separator, spacer,
+--        thermalwidget.widget,
+        spacer,
         s == screen.count() and mysystray or nil,
         mytasklist[s],
         layout = awful.widget.layout.horizontal.rightleft
     }
 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
-})
 -- }}}
 
-
 -- {{{ Mouse bindings
 root.buttons(awful.util.table.join(
     awful.button({ }, 3, function () mymainmenu:toggle() end),
@@ -310,6 +370,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,           }, "n",      function (c) c.minimized = not c.minimized    end),
     awful.key({ modkey,           }, "m",
         function (c)
@@ -375,8 +436,16 @@ globalkeys = awful.util.table.join(globalkeys,
   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 }, "backslash", function () awful.util.spawn_with_shell("xmms2 current | head -1 | xmessage -nearmouse -timeout 5 -file -") end),
-  awful.key({ cmdmodkey, "Shift" }, "backslash", function () awful.util.spawn_with_shell("xmms2 list | xmessage -nearmouse -timeout 5 -file -") end)
+  awful.key({ cmdmodkey }, "backslash", function ()
+    local f = io.popen('xmms2 current', 'r')
+    naughty.notify({ title = "Now playing", text = f:read(), 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 })
+    f:close()
+  end)
 )
 
 -- misc apps
@@ -385,7 +454,6 @@ globalkeys = awful.util.table.join(globalkeys,
   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 }, "r", function () awful.util.spawn("gmrun") end),
   awful.key({ cmdmodkey }, "r", function () mypromptbox[mouse.screen]:run() end),
   awful.key({ cmdmodkey }, "j", function () awful.util.spawn("jpilot") 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),
@@ -420,11 +488,12 @@ awful.rules.rules = {
       properties = { floating = true } },
     { rule = { class = "Add-ons" },
       properties = { floating = true } },
-    -- Set Firefox to always map on tags number 2 of screen 1.
-    { rule = { class = "Firefox" },
-      properties = { tag = tags[1][9] } },
+    { 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 = tags[1][8] } },
+      properties = { tag = screen.count()>1 and tags[3][2] or tags[1][8], switchtotag = false } },
 }
 -- }}}
 
@@ -458,20 +527,15 @@ 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)
 
--- Hook called every second
-awful.hooks.timer.register(1, function ()
-    mytextclock.text = os.date(" %a %d %b %H:%M:%S ")
-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"
@@ -506,6 +570,10 @@ function get_acpibatt()
       return '';
     end
 end
+t = timer({ timeout = 20 })
+t:add_signal('timeout', hook_battery)
+t:start()
+hook_battery()
 -- }}}
 
 --{{{ batt hook
@@ -523,20 +591,5 @@ local function get_bat()
   batt=math.floor(now*100/full)
   batterywidget:bar_data_add("bat",batt )
 end
---}}}
-
--- Set up some hooks
-awful.hooks.timer.register(20, hook_battery)
 -- awful.hooks.timer.register(5, get_bat)
--- }}}
-
--- 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()
+--}}}