Merge branch 'master' of sc:awesome

This commit is contained in:
crater2150 2010-10-18 11:44:00 +02:00
commit abbda7aa7a
4 changed files with 4 additions and 2 deletions

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
wallpaper

1
rc.lua
View file

@ -10,7 +10,6 @@ require("awful.rules")
require("beautiful")
require("naughty")
require("teardrop")
require("obvious.battery")
require("obvious.popup_run_prompt")
require("vicious")
require("aweswt")

View file

@ -39,6 +39,8 @@ awful.rules.rules = {
properties = { tag = tags[1][4] } },
{ rule = { class = "Thunderbird" },
properties = { tag = tags[1][4] } },
{ rule = { class = "Claws-mail" },
properties = { tag = tags[1][4] } },
{ rule = { class = "Sunbird-bin" },
properties = { tag = tags[1][5] } },
{ rule = { class = "Gmpc" },

View file

@ -23,7 +23,7 @@ vicious.register(memwidget, vicious.widgets.mem, "⌸ $1% ($2MB / $3MB) ", 13)
--batwidget = obvious.battery();
batwidget = widget({ type = "textbox" })
vicious.register(batwidget, vicious.widgets.batat, "⌁ $1$2% - $3", 61)
vicious.register(batwidget, vicious.widgets.bat, "⌁ $1$2% - $3", 61)
cpuwidget = awful.widget.progressbar()
cpulabel = widget({ type = "textbox" })