Added awesome's new-colors branch

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "config/awesome/vicious"]
+	path = config/awesome/vicious
+	url = http://git.sysphere.org/vicious/

config/awesome/functions.lua

@@ -0,0 +1,39 @@
+-- Functions
+function switch_tag (i)
+   local screen = mouse.screen
+   if tags[screen][i] then
+      awful.tag.viewonly(tags[screen][i])
+   end
+end
+
+function toggle_tag (i)
+   local screen = mouse.screen
+   if tags[screen][i] then
+      awful.tag.viewtoggle(tags[screen][i])
+   end
+end
+
+function move_to_tag (i)
+   if client.focus and tags[client.focus.screen][i] then
+      awful.client.movetotag(tags[client.focus.screen][i])
+   end
+end
+
+function toggle_client_tag (i)
+   if client.focus and tags[client.focus.screen][i] then
+      awful.client.toggletag(tags[client.focus.screen][i])
+   end
+end
+
+function fexists (n)
+   local f = io.open(n)
+
+   if f == nil then
+      return false
+   end
+
+   io.close(f)
+   return true
+end
+
+module("functions")

config/awesome/rc.lua

@@ -6,49 +6,15 @@ require("awful.rules")
 require("beautiful")
 -- Notification library
 require("naughty")
+require("vicious")
+require("functions")
 
 -- {{{ Variable definitions
 -- Themes define colours, icons, and wallpapers
-beautiful.init("/usr/share/awesome/themes/zenburn/theme.lua")
+beautiful.init(os.getenv("HOME") .. "/.config/awesome/themes/custom/theme.lua")
 theme.border_width = "0"
-
+theme.font   = "terminus 8"
--- Functions
+awesome.font = theme.font
-function switch_tag (i)
-   local screen = mouse.screen
-   if tags[screen][i] then
-      awful.tag.viewonly(tags[screen][i])
-   end
-end
-
-function toggle_tag (i)
-   local screen = mouse.screen
-   if tags[screen][i] then
-      awful.tag.viewtoggle(tags[screen][i])
-   end
-end
-
-function move_to_tag (i)
-   if client.focus and tags[client.focus.screen][i] then
-      awful.client.movetotag(tags[client.focus.screen][i])
-   end
-end
-
-function toggle_client_tag (i)
-   if client.focus and tags[client.focus.screen][i] then
-      awful.client.toggletag(tags[client.focus.screen][i])
-   end
-end
-
-function fexists(n)
-   local f = io.open(n)
-
-   if f == nil then
-      return false
-   end
-
-   io.close(f)
-   return true
-end
 
 -- This is used later as the default terminal and editor to run.
 terminal = "urxvt"
@@ -60,7 +26,8 @@ locker = "i3lock -c 000000"
 -- Usually, Mod4 is the key with a logo between Control and Alt.
 -- If you do not like this or do not have such a key,
 -- I suggest you to remap Mod4 to another key using xmodmap or other tools.
--- However, you can use another modifier like Mod1, but it may interact with others.
+-- However, you can use another modifier like Mod1, but it may interact with
+-- others.
 modkey = "Mod4"
 
 -- Table of layouts to cover with awful.layout.inc, order matters.
@@ -86,7 +53,9 @@ layouts =
 tags = {}
 for s = 1, screen.count() do
     -- Each screen has its own tag table.
-    tags[s] = awful.tag({ "Q", "W", "E", "A", "S", "D", "Z", "X", "C" }, s, layouts[1])
+    tags[s] = awful.tag({ "Q", "W", "E", "A", "S", "D", "Z", "X", "C" },
+                        s,
+                        layouts[1])
 end
 -- }}}
 
@@ -99,28 +68,49 @@ myawesomemenu = {
    { "quit", awesome.quit }
 }
 
-mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
+mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu },
                                     { "open terminal", terminal }
                                   }
                         })
 
-mylauncher = awful.widget.launcher({ image = image(beautiful.awesome_icon),
+mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
                                      menu = mymainmenu })
 -- }}}
 
 -- {{{ Wibox
 -- Create a textclock widget
-mytextclock = awful.widget.textclock({ align = "right" })
+mytextclock = awful.widget.textclock()
 
 -- Create Network usage widget
---netwidget = widget({ type = "textbox" })
+netwidget = wibox.widget.textbox()
---vicious.register(netwidget, vicious.net, "down:${eth0 down_kb} up:${eth0 up_kb}")
+vicious.register(netwidget, vicious.widgets.net,
+                 function (widget, args)
+                    return string.format(" down: %03dkb/s | up: %03dkb/s ",
+                                         args["{eth0 down_kb}"],
+                                         args["{eth0 up_kb}"])
+                 end)
 
--- Create a systray
+-- Create Package widget
-mysystray = widget({ type = "systray" })
+pkgwidget = wibox.widget.textbox()
+vicious.register(pkgwidget, vicious.widgets.pkg, " updates: $1 |", 60*60, "Arch")
+
+-- Create mpd widget
+mpdwidget = wibox.widget.textbox()
+vicious.register(mpdwidget, vicious.widgets.mpd,
+                 function (widget, args)
+                    if   args["{state}"] == "Stop" then return ""
+                    else return '<span color="white">MPD:</span> '..
+                       args["{Artist}"]..' - '.. args["{Title}"] .. " "
+                    end
+                 end)
+
+-- Create a cpu usage widget
+cpuwidget = wibox.widget.textbox()
+vicious.register(cpuwidget, vicious.widgets.cpu, " cpu: $1% |")
 
 -- Create a wibox for each screen and add it
-mywibox = {}
+mytopwibox = {}
+mybottomwibox = {}
 mypromptbox = {}
 mylayoutbox = {}
 mytaglist = {}
@@ -130,84 +120,41 @@ mytaglist.buttons = awful.util.table.join(
                     awful.button({ }, 3, awful.tag.viewtoggle),
                     awful.button({ modkey }, 3, awful.client.toggletag),
                     awful.button({ }, 4, awful.tag.viewnext),
-                    awful.button({ }, 5, awful.tag.viewprev)
+                    awful.button({ }, 5, awful.tag.viewprev))
-                    )
+
 mytasklist = {}
-mytasklist.buttons = awful.util.table.join(
+mytasklist.buttons =
-                     awful.button({ }, 1, function (c)
+   awful.util.table.join(awful.button({ }, 1,
-                                              if not c:isvisible() then
+                                      function (c)
-                                                  awful.tag.viewonly(c:tags()[1])
+                                         if not c:isvisible() then
-                                              end
+                                            awful.tag.viewonly(c:tags()[1])
-                                              client.focus = c
+                                         end
-                                              c:raise()
+                                         client.focus = c
-                                          end),
+                                         c:raise()
-                     awful.button({ }, 3, function ()
+                                      end),
-                                              if instance then
+                         awful.button({ }, 3,
-                                                  instance:hide()
+                                      function ()
-                                                  instance = nil
+                                         if instance then
-                                              else
+                                            instance:hide()
-                                                  instance = awful.menu.clients({ width=250 })
+                                            instance = nil
-                                              end
+                                         else
-                                          end),
+                                            instance = awful.menu.clients({ width=250 })
-                     awful.button({ }, 4, function ()
+                                         end
-                                              awful.client.focus.byidx(1)
+                                      end),
-                                              if client.focus then client.focus:raise() end
+                         awful.button({ }, 4,
-                                          end),
+                                      function ()
-                     awful.button({ }, 5, function ()
+                                         awful.client.focus.byidx(1)
-                                              awful.client.focus.byidx(-1)
+                                         if client.focus then client.focus:raise() end
-                                              if client.focus then client.focus:raise() end
+                                      end),
-                                          end))
+                         awful.button({ }, 5,
-xmms2_playing = false
+                                      function ()
--- Create a previous button
+                                         awful.client.focus.byidx(-1)
-myprevbutton = widget({ type = "imagebox" })
+                                         if client.focus then client.focus:raise() end
-myprevbutton.image = image(beautiful.xmms2_previous_icon)
+                                      end))
-myprevbutton:buttons(awful.util.table.join(
-                        awful.button({ }, 1,
-                                     function ()
-                                        awful.util.spawn("xmms2 prev")
-                                     end)
-                  ))
--- Create a play button
-myplaybutton = widget({ type = "imagebox" })
-myplaybutton.image = image(beautiful.xmms2_play_icon)
-myplaybutton:buttons(awful.util.table.join(
-                        awful.button({ }, 1,
-                                     function ()
-                                        awful.util.spawn("xmms2 toggleplay")
-                                        if xmms2_playing then xmms2_playing = false else xmms2_playing = true end
-                                        if xmms2_playing then
-                                           myplaybutton.image = image(beautiful.xmms2_pause_icon)
-                                        else
-                                           myplaybutton.image = image(beautiful.xmms2_play_icon)
-                                        end
-                                     end)
-                  ))
--- Create a stop button
-mystopbutton = widget({ type = "imagebox" })
-mystopbutton.image = image(beautiful.xmms2_stop_icon)
-mystopbutton:buttons(awful.util.table.join(
-                        awful.button({ }, 1,
-                                     function ()
-                                        if xmms2_playing then
-                                           xmms2_playing = false
-                                           myplaybutton.image = image(beautiful.xmms2_play_icon)
-                                        end
-                                        awful.util.spawn("xmms2 stop")
-                                     end)
-                  ))
--- Create a next button
-mynextbutton = widget({ type = "imagebox" })
-mynextbutton.image = image(beautiful.xmms2_next_icon)
-mynextbutton:buttons(awful.util.table.join(
-                        awful.button({ }, 1,
-                                     function ()
-                                        awful.util.spawn("xmms2 next")
-                                     end)
-                  ))
 
 for s = 1, screen.count() do
     -- Create a promptbox for each screen
-    mypromptbox[s] = awful.widget.prompt({ layout = awful.widget.layout.horizontal.leftright })
+   mypromptbox[s] = awful.widget.prompt()
     -- Create an imagebox widget which will contains an icon indicating which layout we're using.
     -- We need one layoutbox per screen.
     mylayoutbox[s] = awful.widget.layoutbox(s)
@@ -217,33 +164,49 @@ for s = 1, screen.count() do
                            awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end),
                            awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end)))
     -- Create a taglist widget
-    mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.label.all, mytaglist.buttons)
+    mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons)
 
     -- Create a tasklist widget
-    mytasklist[s] = awful.widget.tasklist(function(c)
+    mytasklist[s] =
-                                              return awful.widget.tasklist.label.currenttags(c, s)
+       awful.widget.tasklist(s,
-                                          end, mytasklist.buttons)
+                             awful.widget.tasklist.filter.currenttags,
+                             mytasklist.buttons)
 
-    -- Create the wibox
+    -- Create the top wibox
-    mywibox[s] = awful.wibox({ position = "top", screen = s })
+    mytopwibox[s]    = awful.wibox({ position = "top",    screen = s })
-    -- Add widgets to the wibox - order matters
+    -- Create the bottom wibox
-    mywibox[s].widgets = {
+    mybottomwibox[s] = awful.wibox({ position = "bottom", screen = s })
-        {
+    -- Add widgets to the top wibox - order matters
-            mylauncher,
+    local left_layout = wibox.layout.fixed.horizontal()
-            mytaglist[s],
+    left_layout:add(mylauncher)
-            mypromptbox[s],
+    left_layout:add(mytaglist[s])
-            layout = awful.widget.layout.horizontal.leftright
+    left_layout:add(mypromptbox[s])
-        },
+
-        mylayoutbox[s],
+    local right_layout = wibox.layout.fixed.horizontal()
-        mynextbutton,
+    right_layout:add(mpdwidget)
-        mystopbutton,
+    if s == 1 then right_layout:add(wibox.widget.systray()) end
-        myplaybutton,
+    right_layout:add(mylayoutbox[s])
-        myprevbutton,
+
-        mytextclock,
+    local layout = wibox.layout.align.horizontal()
-        s == 1 and mysystray or nil,
+    layout:set_left(left_layout)
-        mytasklist[s],
+    layout:set_right(right_layout)
-        layout = awful.widget.layout.horizontal.rightleft
+
-    }
+    mytopwibox[s]:set_widget(layout)
+
+    left_layout = wibox.layout.fixed.horizontal()
+    left_layout:add(pkgwidget)
+    left_layout:add(netwidget)
+
+    right_layout = wibox.layout.fixed.horizontal()
+    right_layout:add(cpuwidget)
+    right_layout:add(mytextclock)
+
+    layout = wibox.layout.align.horizontal()
+    layout:set_left(left_layout)
+    layout:set_middle(mytasklist[s])
+    layout:set_right(right_layout)
+
+    mybottomwibox[s]:set_widget(layout)
 end
 -- }}}
 
@@ -270,7 +233,7 @@ globalkeys = awful.util.table.join(
         function ()
             awful.client.focus.byidx(-1)
             if client.focus then client.focus:raise() end
-        end),
+         end),
     awful.key({ modkey, "Mod1"             }, "w", function () mymainmenu:show(true)        end),
 
     -- Layout manipulation
@@ -288,19 +251,19 @@ globalkeys = awful.util.table.join(
         end),
 
     -- Standard program
-    awful.key({ modkey,                    }, "Return", function () awful.util.spawn(terminal) end),
+    awful.key({ modkey,           }, "Return", function () awful.util.spawn(terminal) end),
-    awful.key({ modkey, "Control"          }, "r", awesome.restart),
+    awful.key({ modkey, "Control" }, "r", awesome.restart),
-    awful.key({ modkey, "Mod1"             }, "q", awesome.quit),
+    awful.key({ modkey, "Mod1"    }, "q", awesome.quit),
-    awful.key({ "Mod1", "Control"          }, "l", function () awful.util.spawn(locker) end),
+    awful.key({ "Mod1", "Control" }, "l", function () awful.util.spawn(locker) end),
 
-    awful.key({ modkey,                    }, "l",     function () awful.tag.incmwfact( 0.05)    end),
+    awful.key({ modkey,           }, "l",     function () awful.tag.incmwfact( 0.05)    end),
-    awful.key({ modkey,                    }, "h",     function () awful.tag.incmwfact(-0.05)    end),
+    awful.key({ modkey,           }, "h",     function () awful.tag.incmwfact(-0.05)    end),
-    awful.key({ modkey, "Shift"            }, "h",     function () awful.tag.incnmaster( 1)      end),
+    awful.key({ modkey, "Shift"   }, "h",     function () awful.tag.incnmaster( 1)      end),
-    awful.key({ modkey, "Shift"            }, "l",     function () awful.tag.incnmaster(-1)      end),
+    awful.key({ modkey, "Shift"   }, "l",     function () awful.tag.incnmaster(-1)      end),
-    awful.key({ modkey, "Control"          }, "h",     function () awful.tag.incncol( 1)         end),
+    awful.key({ modkey, "Control" }, "h",     function () awful.tag.incncol( 1)         end),
-    awful.key({ modkey, "Control"          }, "l",     function () awful.tag.incncol(-1)         end),
+    awful.key({ modkey, "Control" }, "l",     function () awful.tag.incncol(-1)         end),
-    awful.key({ modkey,                    }, "space", function () awful.layout.inc(layouts,  1) end),
+    awful.key({ modkey,           }, "space", function () awful.layout.inc(layouts,  1) end),
-    awful.key({ modkey, "Shift"            }, "space", function () awful.layout.inc(layouts, -1) end),
+    awful.key({ modkey, "Shift"   }, "space", function () awful.layout.inc(layouts, -1) end),
 
     -- Extra tag bindings
     awful.key({ modkey,                    }, "q", function () switch_tag(1)        end),
@@ -399,12 +362,18 @@ awful.rules.rules = {
       properties = { floating = true } },
     { rule = { class = "pinentry" },
       properties = { floating = true } },
-    { rule = { class = "Gimp" },
+    { rule = { class = "Gimp", machine ~= "raphael" },
       properties = { floating = true } },
-    { rule = { class = "gwibber", name = "gwibber" },
+    { rule = { class = "Gwibber" },
       properties = { floating = true } },
     { rule = { class = "Xsane" },
       properties = { floating = true } },
+--   { rule = { floating = true },
+--      properties = { callback = function(c)
+--                                   io.stdout:write("it's floating")
+--                                end
+--      }
+--   },
     -- Set Firefox to always map on tags number 2 of screen 1.
     -- { rule = { class = "Firefox" },
     --   properties = { tag = tags[1][2] } },
@@ -435,7 +404,13 @@ client.add_signal("manage", function (c, startup)
             awful.placement.no_overlap(c)
             awful.placement.no_offscreen(c)
         end
-    end
+     end
+
+
+     -- floating windows need borders
+     if awful.client.floating.get(c) then
+        c.border_width = 1
+     end
 end)
 
 client.add_signal("focus", function(c)

config/awesome/themes/custom/theme.lua

@@ -0,0 +1,141 @@
+-------------------------------
+--  "Zenburn" awesome theme  --
+--    By Adrian C. (anrxc)   --
+-------------------------------
+
+-- Alternative icon sets and widget icons:
+--  * http://awesome.naquadah.org/wiki/Nice_Icons
+
+-- {{{ Main
+theme = {}
+theme.wallpaper_cmd =
+   { "awsetbg /usr/share/awesome/themes/zenburn/zenburn-background.png" }
+-- }}}
+
+-- {{{ Styles
+theme.font      = "sans 8"
+
+-- {{{ Colors
+theme.fg_normal = "#FFFFFF"
+theme.fg_focus  = "#00B4FF"
+theme.fg_urgent = "#CC9393"
+theme.bg_normal = "#000000"
+theme.bg_focus  = "#1E2320"
+theme.bg_urgent = "#3F3F3F"
+-- }}}
+
+-- {{{ Borders
+theme.border_width  = "0"
+theme.border_normal = "#3F3F3F"
+theme.border_focus  = "#6F6F6F"
+theme.border_marked = "#CC9393"
+-- }}}
+
+-- {{{ Titlebars
+theme.titlebar_bg_focus  = "#3F3F3F"
+theme.titlebar_bg_normal = "#3F3F3F"
+-- }}}
+
+-- There are other variable sets
+-- overriding the default one when
+-- defined, the sets are:
+-- [taglist|tasklist]_[bg|fg]_[focus|urgent]
+-- titlebar_[normal|focus]
+-- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
+-- Example:
+--theme.taglist_bg_focus = "#CC9393"
+-- }}}
+
+-- {{{ Widgets
+-- You can add as many variables as
+-- you wish and access them by using
+-- beautiful.variable in your rc.lua
+--theme.fg_widget        = "#AECF96"
+--theme.fg_center_widget = "#88A175"
+--theme.fg_end_widget    = "#FF5656"
+--theme.bg_widget        = "#494B4F"
+--theme.border_widget    = "#3F3F3F"
+-- }}}
+
+-- {{{ Mouse finder
+theme.mouse_finder_color = "#CC9393"
+-- mouse_finder_[timeout|animate_timeout|radius|factor]
+-- }}}
+
+-- {{{ Menu
+-- Variables set for theming the menu:
+-- menu_[bg|fg]_[normal|focus]
+-- menu_[border_color|border_width]
+theme.menu_height = "15"
+theme.menu_width  = "100"
+-- }}}
+
+-- {{{ Icons
+-- {{{ Taglist
+theme.taglist_squares_sel   =
+   os.getenv("HOME") .. "/.config/awesome/themes/custom/taglist/squarefz.png"
+theme.taglist_squares_unsel =
+   os.getenv("HOME") .. "/.config/awesome/themes/custom/taglist/squarez.png"
+-- }}}
+
+-- {{{ Misc
+theme.awesome_icon           =
+   os.getenv("HOME") .. "/.config/awesome/themes/custom/awesome-icon.png"
+theme.menu_submenu_icon      = "/usr/share/awesome/themes/default/submenu.png"
+theme.tasklist_floating_icon = "/usr/share/awesome/themes/default/tasklist/floatingw.png"
+-- }}}
+
+-- {{{ Layout
+theme.layout_tile       =
+   os.getenv("HOME") .. "/.config/awesome/themes/custom/layouts/tile.png"
+theme.layout_tileleft   =
+   os.getenv("HOME") .. "/.config/awesome/themes/custom/layouts/tileleft.png"
+theme.layout_tilebottom =
+   os.getenv("HOME") .. "/.config/awesome/themes/custom/layouts/tilebottom.png"
+theme.layout_tiletop    =
+   os.getenv("HOME") .. "/.config/awesome/themes/custom/layouts/tiletop.png"
+theme.layout_fairv      =
+   os.getenv("HOME") .. "/.config/awesome/themes/custom/layouts/fairv.png"
+theme.layout_fairh      =
+   os.getenv("HOME") .. "/.config/awesome/themes/custom/layouts/fairh.png"
+theme.layout_spiral     =
+   os.getenv("HOME") .. "/.config/awesome/themes/custom/layouts/spiral.png"
+theme.layout_dwindle    =
+   os.getenv("HOME") .. "/.config/awesome/themes/custom/layouts/dwindle.png"
+theme.layout_max        =
+   os.getenv("HOME") .. "/.config/awesome/themes/custom/layouts/max.png"
+theme.layout_fullscreen =
+   os.getenv("HOME") .. "/.config/awesome/themes/custom/layouts/fullscreen.png"
+theme.layout_magnifier  =
+   os.getenv("HOME") .. "/.config/awesome/themes/custom/layouts/magnifier.png"
+theme.layout_floating   =
+   os.getenv("HOME") .. "/.config/awesome/themes/custom/layouts/floating.png"
+-- }}}
+
+-- {{{ Titlebar
+theme.titlebar_close_button_focus  = "/usr/share/awesome/themes/zenburn/titlebar/close_focus.png"
+theme.titlebar_close_button_normal = "/usr/share/awesome/themes/zenburn/titlebar/close_normal.png"
+
+theme.titlebar_ontop_button_focus_active  = "/usr/share/awesome/themes/zenburn/titlebar/ontop_focus_active.png"
+theme.titlebar_ontop_button_normal_active = "/usr/share/awesome/themes/zenburn/titlebar/ontop_normal_active.png"
+theme.titlebar_ontop_button_focus_inactive  = "/usr/share/awesome/themes/zenburn/titlebar/ontop_focus_inactive.png"
+theme.titlebar_ontop_button_normal_inactive = "/usr/share/awesome/themes/zenburn/titlebar/ontop_normal_inactive.png"
+
+theme.titlebar_sticky_button_focus_active  = "/usr/share/awesome/themes/zenburn/titlebar/sticky_focus_active.png"
+theme.titlebar_sticky_button_normal_active = "/usr/share/awesome/themes/zenburn/titlebar/sticky_normal_active.png"
+theme.titlebar_sticky_button_focus_inactive  = "/usr/share/awesome/themes/zenburn/titlebar/sticky_focus_inactive.png"
+theme.titlebar_sticky_button_normal_inactive = "/usr/share/awesome/themes/zenburn/titlebar/sticky_normal_inactive.png"
+
+theme.titlebar_floating_button_focus_active  = "/usr/share/awesome/themes/zenburn/titlebar/floating_focus_active.png"
+theme.titlebar_floating_button_normal_active = "/usr/share/awesome/themes/zenburn/titlebar/floating_normal_active.png"
+theme.titlebar_floating_button_focus_inactive  = "/usr/share/awesome/themes/zenburn/titlebar/floating_focus_inactive.png"
+theme.titlebar_floating_button_normal_inactive = "/usr/share/awesome/themes/zenburn/titlebar/floating_normal_inactive.png"
+
+theme.titlebar_maximized_button_focus_active  = "/usr/share/awesome/themes/zenburn/titlebar/maximized_focus_active.png"
+theme.titlebar_maximized_button_normal_active = "/usr/share/awesome/themes/zenburn/titlebar/maximized_normal_active.png"
+theme.titlebar_maximized_button_focus_inactive  = "/usr/share/awesome/themes/zenburn/titlebar/maximized_focus_inactive.png"
+theme.titlebar_maximized_button_normal_inactive = "/usr/share/awesome/themes/zenburn/titlebar/maximized_normal_inactive.png"
+-- }}}
+-- }}}
+
+return theme

config/awesome/themes/default/theme.lua

@@ -1,99 +0,0 @@
-base_loc = os.getenv("HOME") .. "/.config/awesome/themes/default/"
----------------------------
--- Default awesome theme --
----------------------------
-
-theme = {}
-
-theme.font          = "sans 8"
-
-theme.bg_normal     = "#000000"
-theme.bg_focus      = "#333333"
-theme.bg_urgent     = "#ff0000"
-theme.bg_minimize   = "#444444"
-
-theme.fg_normal     = "#aaaaaa"
-theme.fg_focus      = "#ffffff"
-theme.fg_urgent     = "#ffffff"
-theme.fg_minimize   = "#ffffff"
-
-theme.border_width  = "1"
-theme.border_normal = "#000000"
-theme.border_focus  = "#535d6c"
-theme.border_marked = "#91231c"
-
--- There are another variables sets
--- overriding the default one when
--- defined, the sets are:
--- [taglist|tasklist]_[bg|fg]_[focus|urgent]
--- titlebar_[bg|fg]_[normal|focus]
--- Example:
---taglist_bg_focus = #ff0000
-
--- Display the taglist squares
-theme.taglist_squares_sel    = base_loc .. "taglist/squarefw.png"
-theme.taglist_squares_unsel  = base_loc .. "taglist/squarew.png"
-
-theme.tasklist_floating_icon = base_loc .. "tasklist/floatingw.png"
-
--- Variables set for theming menu
--- menu_[bg|fg]_[normal|focus]
--- menu_[border_color|border_width]
-theme.menu_submenu_icon = base_loc .. "submenu.png"
-theme.menu_height       = "15"
-theme.menu_width        = "100"
-
--- You can add as many variables as
--- you wish and access them by using
--- beautiful.variable in your rc.lua
---bg_widget    = #cc0000
-
--- Define the image to load
-theme.titlebar_close_button_normal              = base_loc .. "titlebar/close_normal.png"
-theme.titlebar_close_button_focus               = base_loc .. "titlebar/close_focus.png"
-
-theme.titlebar_ontop_button_normal_inactive     = base_loc .. "titlebar/ontop_normal_inactive.png"
-theme.titlebar_ontop_button_focus_inactive      = base_loc .. "titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_active       = base_loc .. "titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_active        = base_loc .. "titlebar/ontop_focus_active.png"
-
-theme.titlebar_sticky_button_normal_inactive    = base_loc .. "titlebar/sticky_normal_inactive.png"
-theme.titlebar_sticky_button_focus_inactive     = base_loc .. "titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_active      = base_loc .. "titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_active       = base_loc .. "titlebar/sticky_focus_active.png"
-
-theme.titlebar_floating_button_normal_inactive  = base_loc .. "titlebar/floating_normal_inactive.png"
-theme.titlebar_floating_button_focus_inactive   = base_loc .. "titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_active    = base_loc .. "titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_active     = base_loc .. "titlebar/floating_focus_active.png"
-
-theme.titlebar_maximized_button_normal_inactive = base_loc .. "titlebar/maximized_normal_inactive.png"
-theme.titlebar_maximized_button_focus_inactive  = base_loc .. "titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_active   = base_loc .. "titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_active    = base_loc .. "titlebar/maximized_focus_active.png"
-
--- You can use your own command to set your wallpaper
---theme.wallpaper_cmd = { "awsetbg /usr/share/awesome/themes/default/background.png" }
-
--- You can use your own layout icons like this:
-theme.layout_fairh        = base_loc .. "layouts/fairhw.png"
-theme.layout_fairv        = base_loc .. "layouts/fairvw.png"
-theme.layout_floating     = base_loc .. "layouts/floatingw.png"
-theme.layout_magnifier    = base_loc .. "layouts/magnifierw.png"
-theme.layout_max          = base_loc .. "layouts/maxw.png"
-theme.layout_fullscreen   = base_loc .. "layouts/fullscreenw.png"
-theme.layout_tilebottom   = base_loc .. "layouts/tilebottomw.png"
-theme.layout_tileleft     = base_loc .. "layouts/tileleftw.png"
-theme.layout_tile         = base_loc .. "layouts/tilew.png"
-theme.layout_tiletop      = base_loc .. "layouts/tiletopw.png"
-
-theme.awesome_icon        = "/usr/share/awesome/icons/awesome16.png"
-
-theme.xmms2_play_icon     = base_loc .. "xmms2/play.png"
-theme.xmms2_pause_icon    = base_loc .. "xmms2/pause.png"
-theme.xmms2_next_icon     = base_loc .. "xmms2/next.png"
-theme.xmms2_previous_icon = base_loc .. "xmms2/previous.png"
-theme.xmms2_stop_icon     = base_loc .. "xmms2/stop.png"
-
-return theme
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80