X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=config%2Fawesome%2Frc.lua;fp=config%2Fawesome%2Frc.lua;h=caa561ef711106140562eb4f188d2d0309d5dd33;hb=683cbaa17771354b5c37f0ab805bbb6dd6a646b5;hp=bf699297d400a783aab05bd3ec0d6dadcd9a2815;hpb=c4efffc9d1d55a6b2440bda809babf415f547120;p=~madcoder%2Fdotfiles.git

diff --git a/config/awesome/rc.lua b/config/awesome/rc.lua
index bf69929..caa561e 100644
--- a/config/awesome/rc.lua
+++ b/config/awesome/rc.lua
@@ -37,10 +37,6 @@ function fg(color, text)
     return '<span color="'..color..'">'..text..'</span>'
 end
 
-function heading(text)
-    return fg(beautiful.fg_focus, text)
-end
-
 -- }}}
 
 -- {{{ Tags
@@ -185,16 +181,16 @@ end
 -- }}}
 -- {{{ Widgets
 
-function make_imagebox(fname, w, h, bg)
-    local icon = image(fname)
+local icondir = awful.util.getdir("config").."/icons/"
+
+function make_icon(fname, left, right, h, bg)
+    local icon = image(icondir..fname)
     local ib   = widget { type = 'imagebox' }
+    local w    = left + icon.width + right
     local i    = image.argb32(w, h, nil)
 
-    if not bg then bg = beautiful.bg_normal end
-
-    i:draw_rectangle(0, 0, w, h, true, bg)
-    i:insert(icon, math.floor((w - icon.width) / 2),
-             math.floor((h - icon.height) / 2))
+    i:draw_rectangle(0, 0, w, h, true, beautiful.bg_normal)
+    i:insert(icon, left, math.floor((h - icon.height) / 2))
 
     ib.image = i
     return ib
@@ -216,43 +212,13 @@ mypromptbox = awful.widget.prompt{
     layout = awful.widget.layout.horizontal.leftright
 }
 
--- }}}
--- {{{ Load Average Widget
-
-loadwidget = widget({ type = 'textbox' })
-load_update = function()
-    -- Use /proc/loadavg to get the average system load on 1, 5 and 15 minute intervals
-    local f = io.open('/proc/loadavg')
-    local n = f:read()
-    f:close()
-
-    -- Find the third space
-    local pos = n:find(' ', n:find(' ', n:find(' ')+1)+1)
-
-    loadwidget.text = heading('Load')..': '..n:sub(1,pos-1)
-end
-load_update()
-
-t = timer { timeout = 10 }
-t:add_signal("timeout", load_update)
-t:start()
-
 -- }}}
 -- {{{ CPU Widgets
 
-cpuiconwidget = nil
---    make_imagebox(os.getenv("HOME")..'/tmp/famfamfam/computer.png', 18, 18)
+cpuicon = make_icon('cpu.png', 16, 4, 16)
 
 cputextwidget = widget({ type = 'textbox' })
 
-cpugraphwidget = awful.widget.graph{
-    width  = 40, height = 16,
-    layout = awful.widget.layout.horizontal.rightleft
-}
-cpugraphwidget:set_background_color('#333333')
-cpugraphwidget:set_border_color('#0a0a0a')
-cpugraphwidget:set_gradient_colors({ '#285577', '#285577', '#AEC6D8' })
-
 vicious.register(cputextwidget, vicious.widgets.cpu,
 function (widget, args)
     local r = tonumber(args[1])
@@ -261,29 +227,24 @@ function (widget, args)
         percent = '0'..percent
     end
     if r < 25 then
-        percent = fg('green', percent)
+        percent = fg(theme.fg_focus, percent)
     elseif r < 50 then
         percent = fg('yellow', percent)
     elseif r < 75 then
         percent = fg('orange', percent)
     else
-        percent = fg('red', percent)
-    end
-    for s = 1, screen.count() do
-        cpugraphwidget:add_value(r / 100)
+        percent = fg('#ff4040', percent)
     end
-    return ' '..percent..' '
+    return percent..' '
 end, 2)
 
 -- }}}
 -- {{{ Memory Usage Widget
 
-memiconwidget = nil
---    make_imagebox(os.getenv("HOME")..'/tmp/famfamfam/bricks.png', 18, 18)
+memicon = make_icon('mem.png', 16, 4, 16)
 
 memtextwidget = widget({ type = 'textbox' })
 
-memtextwidget.text = heading('MEM')..': '
 vicious.register(memtextwidget, vicious.widgets.mem, function (widget, args)
     -- Add extra preceding zeroes when needed
     local r = tonumber(args[1])
@@ -292,39 +253,33 @@ vicious.register(memtextwidget, vicious.widgets.mem, function (widget, args)
         percent = '0'..percent
     end
     if r < 50 then
-        percent = fg('green', percent)
+        percent = fg(theme.fg_focus, percent)
     elseif r < 80 then
         percent = fg('orange', percent)
     else
         percent = fg('red', percent)
     end
-    return ' '..percent..' '..args[2]..'M'
+    return percent..' '..args[2]..'M'
 end, 2)
 
--- }}}
--- {{{ spacers
-
-rspacer = widget({ type = 'textbox' })
-rspacer.text = " │ "
-
 -- }}}
 -- {{{ Clock
 
+clockicon = make_icon('clock.png', 16, 4, 16)
+
 clockwidget = widget({ type = "textbox" })
 vicious.register(clockwidget, vicious.widgets.date,
-                 fg("#dddddd", "%a %d %b - %H:%M"), 10)
+                 fg(theme.fg_focus, "%H:%M") .. " %a %d %b  ", 10)
 
 -- }}}
 -- {{{ Statusbar
 
 mainstatusbar = {}
-mysystray = widget({ type = "systray" })
-
 for s = 1, screen.count() do
     local lr_layout = awful.widget.layout.horizontal.leftright
     local rl_layout = awful.widget.layout.horizontal.rightleft
 
-    mainstatusbar[s] = awful.wibox{ position = "top", height = 18, screen = s }
+    mainstatusbar[s] = awful.wibox{ position = "top", height = 16, screen = s }
 
     mainstatusbar[s].widgets = {
         {
@@ -332,12 +287,10 @@ for s = 1, screen.count() do
             mypromptbox.widget,
             layout = lr_layout
         },
-        s == 1 and mysystray or nil,
-        s == 1 and rspacer or nil,
-        clockwidget, rspacer,
-        memtextwidget, memiconwidget, rspacer,
-        cpugraphwidget.widget, cputextwidget, cpuiconwidget, rspacer,
-        loadwidget, rspacer,
+        s == 1 and widget{ type = 'systray' } or nil,
+        clockwidget, clockicon,
+        memtextwidget, memicon,
+        cputextwidget, cpuicon,
         layout = awful.widget.layout.horizontal.rightleft
     }
 end
@@ -347,7 +300,6 @@ end
 -- {{{ Keys
 ---- {{{ Global keys
 
-local hist = os.getenv("HOME") .. "/.cache/awesome/history"
 globalkeys = awful.util.table.join(
     -- Mod+{A/S}: Switch to prev/next tag
     awful.key(k_m, "Left",  mtag.prev),
@@ -536,3 +488,4 @@ end
 -- }}}
 
 awful.util.spawn("xkbcomp -w 0 -R/usr/share/X11/xkb /home/madcoder/.Xkeyboard :0")
+awful.util.spawn("xsetroot -cursor_name left_ptr")