From 6c41bc8a93e01f556a87c3d286a604e15b2fbcc3 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Wed, 25 Aug 2010 12:17:12 +0200 Subject: [PATCH 01/14] some changes, e.g. per tag wallpaper --- rc.lua | 58 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/rc.lua b/rc.lua index 83109ca..b2c3ecd 100644 --- a/rc.lua +++ b/rc.lua @@ -5,10 +5,11 @@ require("awful.rules") require("beautiful") require("naughty") require("teardrop") -require("obvious.battery") require("obvious.popup_run_prompt") require("vicious") ---- Spawns cmd if no client can be found matching properties + +confdir = "/home/crater2150/.config/awesome" +-- {{{ Spawns cmd if no client can be found matching properties -- If such a client can be found, pop to first tag where it is visible, and give it focus -- @param cmd the command to execute -- @param properties a table of properties to match against clients. Possible entries: any properties of the client object @@ -49,7 +50,7 @@ function runraise(cmd, properties) return end awful.util.spawn(cmd) -end +end --}}} -- Returns true if all pairs in table1 are present in table2 function match (table1, table2) @@ -153,10 +154,6 @@ vicious.register(clock, vicious.widgets.date, "%b %d, %R", 60) memwidget = widget({ type = "textbox" }) 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) - cpuwidget = awful.widget.progressbar() cpulabel = widget({ type = "textbox" }) cpuwidget:set_width(50) @@ -167,8 +164,6 @@ vicious.register(cpuwidget, vicious.widgets.cpu, "$1",41) vicious.register(cpulabel, vicious.widgets.cpu, "CPU: $1%") -wlanwidget = widget({ type = "textbox" }) -vicious.register(wlanwidget, vicious.widgets.wifi, "WLAN ${ssid} @ ${sign}, Q:${link}/70", 31, "wlan0") -- Create a wibox for each screen and add it leftwibox = {} rightwibox = {} @@ -210,8 +205,6 @@ for s = 1, screen.count() do { clock, separator, spacer, memwidget, - separator, spacer, batwidget, - separator, spacer, wlanwidget, separator, spacer, cpulabel, cpuwidget, spacer, layout = awful.widget.layout.horizontal.leftright @@ -230,12 +223,30 @@ awful.button({ }, 5, awful.tag.viewprev) )) -- }}} +curtag = 1 +function prevtag() + curtag = curtag - 1 + if curtag == 0 then curtag = 22 end + awful.util.spawn("awbg " .. curtag) + awful.tag.viewprev() +end + +function nexttag( + if curtag == 23 then curtag = 1 end + awful.util.spawn("awbg " .. curtag) + awful.tag.viewnext() +end + -- {{{ Key bindings globalkeys = awful.util.table.join( --{{{ - awful.key({ modkey, }, "Left", awful.tag.viewprev ), - awful.key({ modkey, }, "Right", awful.tag.viewnext ), + --awful.key({ modkey, }, "Left", awful.tag.viewprev ), + --awful.key({ modkey, }, "Right", awful.tag.viewnext ), + awful.key({ modkey, }, "Left", prevtag ), + awful.key({ modkey, }, "Right", nexttag ), awful.key({ modkey, }, "Escape", awful.tag.history.restore), + --awful.key({ }, "XF86Word", awful.tag.viewprev ), + --awful.key({ }, "XF86WebCam", awful.tag.viewnext ), awful.key({ }, "XF86Word", awful.tag.viewprev ), awful.key({ }, "XF86WebCam", awful.tag.viewnext ), awful.key({ }, "XF86Away", awful.tag.history.restore), @@ -275,16 +286,10 @@ globalkeys = awful.util.table.join( --}}} -- Standard program awful.key({ modkey, }, "Return", function () awful.util.spawn(terminal) end), --- awful.key({ modkey, }, "f", function () awful.util.spawn("firefox") end), --- awful.key({ modkey, }, "t", function () awful.util.spawn("thunderbird") end), --- awful.key({ modkey, }, "p", function () awful.util.spawn("pidgin") end), --- awful.key({ modkey, }, "s", function () awful.util.spawn("sunbird") end), --- awful.key({ modkey, }, "g", function () awful.util.spawn("gmpc") end), - awful.key({ modkey, }, "f", function () runraise("firefox", { class = "Firefox" }) end), - awful.key({ modkey, }, "t", function () runraise("thunderbird", { class = "Thunderbird" }) end), - awful.key({ modkey, }, "p", function () runraise("pidgin", { class = "Pidgin" }) end), - awful.key({ modkey, }, "s", function () runraised("sunbird", { class = "Sunbirdi-bin" }) end), - awful.key({ modkey, }, "g", function () runraise("gmpc", { class = "Gmpc" }) end), + awful.key({ modkey, }, "f", function () awful.util.spawn("firefox") end), + awful.key({ modkey, }, "t", function () awful.util.spawn("claws-mail") end), + awful.key({ modkey, }, "p", function () awful.util.spawn("pidgin") end), + awful.key({ modkey, }, "g", function () awful.util.spawn("gmpc") end), awful.key({ }, "XF86Mail", function () awful.util.spawn("xset dpms force off") end), awful.key({ }, "XF86Mail", function () awful.util.spawn("xset dpms force off") end), awful.key({ modkey }, "XF86Mail", function () awful.util.spawn("urslock") end), @@ -359,6 +364,8 @@ for i = 1, keynumber do function () local screen = mouse.screen if tags[screen][i] then + curtag = i + awful.util.spawn("awbg " .. i) awful.tag.viewonly(tags[screen][i]) end end), @@ -410,8 +417,7 @@ awful.rules.rules = { ontop = true, focus = true } }, { rule = { class = "Teardrop" }, - properties = { floating = true, - size_hints_honor = true } }, + properties = { floating = true } }, { rule = { class = "pinentry" }, properties = { floating = true } }, { rule = { class = "gimp" }, @@ -423,7 +429,7 @@ awful.rules.rules = { properties = { tag = tags[1][3] } }, { rule = { role = "buddy_list" }, properties = { master = true } }, - { rule = { class = "Thunderbird" }, + { rule = { class = "Claws-mail" }, properties = { tag = tags[1][4] } }, { rule = { class = "Sunbird-bin" }, properties = { tag = tags[1][5] } }, From 24d275a18a8fb71eac20e736cf3df02d01b8042c Mon Sep 17 00:00:00 2001 From: crater2150 Date: Tue, 7 Sep 2010 17:22:03 +0200 Subject: [PATCH 02/14] ignorefile --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..26708af --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +wallpaper From 1882efd0fdc56d50c46b2723af86ea67e333ef46 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Wed, 15 Sep 2010 22:42:31 +0200 Subject: [PATCH 03/14] foo --- rc.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rc.lua b/rc.lua index b2c3ecd..6613038 100644 --- a/rc.lua +++ b/rc.lua @@ -231,7 +231,7 @@ function prevtag() awful.tag.viewprev() end -function nexttag( +function nexttag() if curtag == 23 then curtag = 1 end awful.util.spawn("awbg " .. curtag) awful.tag.viewnext() @@ -247,8 +247,8 @@ globalkeys = awful.util.table.join( awful.key({ modkey, }, "Escape", awful.tag.history.restore), --awful.key({ }, "XF86Word", awful.tag.viewprev ), --awful.key({ }, "XF86WebCam", awful.tag.viewnext ), - awful.key({ }, "XF86Word", awful.tag.viewprev ), - awful.key({ }, "XF86WebCam", awful.tag.viewnext ), + awful.key({ }, "XF86Word", prevtag ), + awful.key({ }, "XF86WebCam", nexttag ), awful.key({ }, "XF86Away", awful.tag.history.restore), awful.key({ modkey, }, "j", From a3b4c66737a46095145b271a8abb2c2e831f9dd4 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Wed, 15 Sep 2010 22:42:56 +0200 Subject: [PATCH 04/14] keymaps --- keymaps/actions.lua | 48 +++++++++++++++++++++++++++++ keymaps/spawn.lua | 73 +++++++++++++++++++++++++++++++++++++++++++++ keymaps/wmbase.lua | 49 ++++++++++++++++++++++++++++++ 3 files changed, 170 insertions(+) create mode 100644 keymaps/actions.lua create mode 100644 keymaps/spawn.lua create mode 100644 keymaps/wmbase.lua diff --git a/keymaps/actions.lua b/keymaps/actions.lua new file mode 100644 index 0000000..a81e8f5 --- /dev/null +++ b/keymaps/actions.lua @@ -0,0 +1,48 @@ +-- Client manipulation +modkey = "Mod4" + +keybinding({ "Mod1" }, "Tab", function () awful.client.focus.byidx(1); if client.focus then client.focus:raise() end end):add() + + + +--From Here default config + +keybinding({ modkey, "Shift" }, "f", function () if client.focus then client.focus.fullscreen = not client.focus.fullscreen end end):add() +keybinding({ modkey, "Shift" }, "c", function () if client.focus then client.focus:kill() end end):add() +keybinding({ modkey }, "j", function () awful.client.focus.byidx(1); if client.focus then client.focus:raise() end end):add() +keybinding({ modkey }, "k", function () awful.client.focus.byidx(-1); if client.focus then client.focus:raise() end end):add() +keybinding({ modkey, "Shift" }, "j", function () awful.client.swap.byidx(1) end):add() +keybinding({ modkey, "Shift" }, "k", function () awful.client.swap.byidx(-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 () if client.focus then client.focus:swap(awful.client.getmaster()) end 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 () if client.focus then client.focus:redraw() end end):add() + +-- Layout manipulation +keybinding({ modkey }, "l", function () awful.tag.incmwfact(0.05) end):add() +keybinding({ modkey }, "h", function () awful.tag.incmwfact(-0.05) end):add() +keybinding({ modkey, "Shift" }, "h", function () awful.tag.incnmaster(1) end):add() +keybinding({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end):add() +keybinding({ modkey, "Control" }, "h", function () awful.tag.incncol(1) end):add() +keybinding({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end):add() +keybinding({ modkey }, "space", function () awful.layout.inc(layouts, 1) end):add() +keybinding({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end):add() + +-- Client awful tagging: this is useful to tag some clients and then do stuff like move to tag on them +keybinding({ modkey }, "t", awful.client.togglemarked):add() + +for i = 1, keynumber do + keybinding({ modkey, "Shift" }, "F" .. i, + function () + local screen = mouse.screen + if tags[screen][i] then + for k, c in pairs(awful.client.getmarked()) do + awful.client.movetotag(tags[screen][i], c) + end + end + end):add() +end diff --git a/keymaps/spawn.lua b/keymaps/spawn.lua new file mode 100644 index 0000000..93c88fe --- /dev/null +++ b/keymaps/spawn.lua @@ -0,0 +1,73 @@ + + +keybinding({ modkey }, "Return", function () awful.util.spawn(terminal) end):add() +keybinding({ modkey }, "f", function () awful.util.spawn("firefox") end):add() +keybinding({ }, "XF86AudioLowerVolume", function () awful.util.spawn("voldown 3") end):add() +keybinding({ }, "XF86AudioRaiseVolume", function () awful.util.spawn("volup 3") end):add() +keybinding({ "Shift" }, "XF86AudioLowerVolume", function () awful.util.spawn("voldown 10") end):add() +keybinding({ "Shift" }, "XF86AudioRaiseVolume", function () awful.util.spawn("volup 10") end):add() +keybinding({ modkey }, "XF86Mail", function () awful.util.spawn("xset dpms force off") end):add() +keybinding({ modkey }, "XF86WWW", function () awful.util.spawn(terminal .. " -e apselect") end):add() + + +keybinding({ }, "XF86AudioPlay", function () awful.util.spawn("mpc toggle") end):add() +keybinding({ }, "XF86AudioNext", function () awful.util.spawn("mpc next") end):add() +keybinding({ }, "XF86AudioPrev", function () awful.util.spawn("mpc prev") end):add() +keybinding({ }, "XF86AudioStop", function () awful.util.spawn("mpc stop") end):add() +keybinding({ modkey }, "XF86AudioStop", function () awful.util.spawn("mpc clear") end):add() +keybinding({ modkey }, "XF86AudioPlay", function () + awful.prompt.run({ prompt = "Play Band: " }, + mypromptbox[mouse.screen], playband, + awful.completion.bash, + awful.util.getdir("cache") .. "/history") +end):add() + +function playband(b) + return awful.util.spawn("playband " .. b) +end + + +keybinding({ modkey }, "Return", function () awful.util.spawn(terminal) end):add() + +keybinding({ modkey }, "F1", function () + awful.prompt.run({ prompt = "Run: " }, + mypromptbox[mouse.screen], awful.util.spawn, + awful.completion.bash, + awful.util.getdir("cache") .. "/history") +end):add() + +keybinding({ modkey }, "F4", function () + awful.prompt.run({ prompt = "Run Lua code: " }, + mypromptbox[mouse.screen], + awful.util.eval, + awful.prompt.bash, + awful.util.getdir("cache") .. "/history_eval") +end):add() + +keybinding({ modkey, "Ctrl" }, "i", function () + local s = mouse.screen + if mypromptbox[s].text then + mypromptbox[s].text = nil + elseif client.focus then + mypromptbox[s].text = nil + if client.focus.class then + mypromptbox[s].text = "Class: " .. client.focus.class .. " " + end + if client.focus.instance then + mypromptbox[s].text = mypromptbox[s].text .. "Instance: " + .. client.focus.instance .. " " + end + if client.focus.role then + mypromptbox[s].text = mypromptbox[s].text .. "Role: " + .. client.focus.role + end + end + end):add() + + +keybinding({}, "F12", function () + + tags[1][10].selected = not tags[1][10].selected; + +end):add() + diff --git a/keymaps/wmbase.lua b/keymaps/wmbase.lua new file mode 100644 index 0000000..e6d47aa --- /dev/null +++ b/keymaps/wmbase.lua @@ -0,0 +1,49 @@ + +-- Bind keyboard digits +-- Compute the maximum number of digit we need, limited to 9 +keynumber = 0 +for s = 1, screen.count() do + keynumber = math.min(9, math.max(#tags[s], keynumber)); +end + +for i = 1, keynumber do + keybinding({ modkey }, i, + function () + local screen = mouse.screen + if tags[screen][i] then + awful.tag.viewonly(tags[screen][i]) + end + end):add() + keybinding({ modkey, "Control" }, i, + function () + local screen = mouse.screen + if tags[screen][i] then + tags[screen][i].selected = not tags[screen][i].selected + end + end):add() + keybinding({ modkey, "Shift" }, i, + function () + if client.focus then + if tags[client.focus.screen][i] then + awful.client.movetotag(tags[client.focus.screen][i]) + end + end + end):add() + keybinding({ modkey, "Control", "Shift" }, i, + function () + if client.focus then + if tags[client.focus.screen][i] then + awful.client.toggletag(tags[client.focus.screen][i]) + end + end + end):add() +end + +keybinding({ modkey }, "Left", awful.tag.viewprev):add() +keybinding({ modkey }, "Right", awful.tag.viewnext):add() +keybinding({ modkey }, "Escape", awful.tag.history.restore):add() + +keybinding({ modkey, "Control" }, "r", function () + mypromptbox[mouse.screen].text = awful.util.escape(awful.util.restart()) + end):add() +keybinding({ modkey, "Shift" }, "q", awesome.quit):add() From 9c40f2d82ebcb97ebee8eb633b2bc559eddfc0be Mon Sep 17 00:00:00 2001 From: crater2150 Date: Wed, 15 Sep 2010 22:43:23 +0200 Subject: [PATCH 05/14] ignorefile --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..30cc063 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +wp From 1f3554a5343e9ed333f785fd1c65b5588a854cc7 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 18 Oct 2010 10:44:10 +0200 Subject: [PATCH 06/14] update# Please enter the commit message for your changes. Lines starting --- aweswt.lua | 2 +- bindings.lua | 6 +++--- rc.lua | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aweswt.lua b/aweswt.lua index 2ccf363..4d8a0a4 100644 --- a/aweswt.lua +++ b/aweswt.lua @@ -16,7 +16,7 @@ return t end function get_input (a) - s1='echo -e "'..a..'"|dmenu' + s1='echo -e "'..a..'"|dmenu -i' return get_out(s1) end diff --git a/bindings.lua b/bindings.lua index 86095b4..4bec762 100644 --- a/bindings.lua +++ b/bindings.lua @@ -57,7 +57,7 @@ globalkeys = awful.util.table.join( -- awful.key({ modkey, }, "s", function () awful.util.spawn("sunbird") end), -- awful.key({ modkey, }, "g", function () awful.util.spawn("gmpc") end), awful.key({ modkey, }, "f", function () awful.util.spawn("firefox") end), - awful.key({ modkey, }, "t", function () awful.util.spawn("thunderbird") end), + awful.key({ modkey, }, "t", function () awful.util.spawn("claws-mail") end), awful.key({ modkey, }, "p", function () awful.util.spawn("pidgin") end), awful.key({ modkey, }, "s", function () awful.util.spawn("sunbird") end), awful.key({ modkey, }, "g", function () awful.util.spawn("gmpc") end), @@ -76,7 +76,7 @@ globalkeys = awful.util.table.join( awful.key({ modkey, "Control" }, "Delete", function () awful.util.spawn("xlock") end), -- Audio control - awful.key({ }, "Print", function () teardrop("sakura --class=Teardrop -e alsamixer","top","center", 0.99, 0.4)end ), + awful.key({ }, "Print", function () teardrop("urxvtc -e alsamixer","top","center", 0.99, 0.4)end ), awful.key({ }, "XF86AudioLowerVolume", function () awful.util.spawn("amixer set Front 2dB-")end ), awful.key({ }, "XF86AudioRaiseVolume", function () awful.util.spawn("amixer set Front 2dB+")end ), awful.key({ }, "XF86AudioMute", function () awful.util.spawn("amixer set Front toggle") end), @@ -93,7 +93,7 @@ globalkeys = awful.util.table.join( -- Prompt awful.key({ modkey }, "r", function () obvious.popup_run_prompt.run_prompt() end), awful.key({ }, "Scroll_Lock", function () awful.util.spawn("wli") end), - awful.key({ }, "F12", function () teardrop("sakura --class=Teardrop -e 'screen -l'","center","center", 0.99, 0.7)end ), + awful.key({ }, "F12", function () teardrop("urxvtc -e screen -l","center","center", 0.99, 0.7)end ), --{{{Default diff --git a/rc.lua b/rc.lua index 1fd564b..599afd4 100644 --- a/rc.lua +++ b/rc.lua @@ -1,5 +1,5 @@ -terminal = "sakura -e screen" -editor_cmd = "sakura -e vim" +terminal = "urxvtc -e screen" +editor_cmd = "urxvt -e vim" modkey = "Mod4" hyper = "Mod3" From d661db0bcce66a3b171af5b585622c3ed340af9d Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 18 Oct 2010 22:57:43 +0200 Subject: [PATCH 07/14] blah --- obvious | 2 +- vicious | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/obvious b/obvious index 58b3b5d..e3a3e05 160000 --- a/obvious +++ b/obvious @@ -1 +1 @@ -Subproject commit 58b3b5dae420955e4e815fc70744ee6ee5442565 +Subproject commit e3a3e05405d6c622326f3faba6ce6b7c188bf1e9 diff --git a/vicious b/vicious index 0d73f6d..ca1d8d7 160000 --- a/vicious +++ b/vicious @@ -1 +1 @@ -Subproject commit 0d73f6d8ae32f1cd48ce9f089b902eb0877605e1 +Subproject commit ca1d8d79e55b7addc28dc442832815692b01b894 From e12208bb85dbde24ca47efd48a55c06bb19ab6d1 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 18 Oct 2010 23:00:30 +0200 Subject: [PATCH 08/14] submodule update --- obvious | 2 +- vicious | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/obvious b/obvious index e3a3e05..ff150db 160000 --- a/obvious +++ b/obvious @@ -1 +1 @@ -Subproject commit e3a3e05405d6c622326f3faba6ce6b7c188bf1e9 +Subproject commit ff150db20a89fa2e086cc4fbb75fefa7cfd16f88 diff --git a/vicious b/vicious index ca1d8d7..c532c0b 160000 --- a/vicious +++ b/vicious @@ -1 +1 @@ -Subproject commit ca1d8d79e55b7addc28dc442832815692b01b894 +Subproject commit c532c0b0803c98a26d56875f0955ed43132bfed2 From 1e0f3e2084e4fe5fd2a0f6bc9e2350cba8133ce9 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 18 Oct 2010 23:07:26 +0200 Subject: [PATCH 09/14] wp command fix --- zenburn/theme.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zenburn/theme.lua b/zenburn/theme.lua index 346a717..121252d 100644 --- a/zenburn/theme.lua +++ b/zenburn/theme.lua @@ -8,7 +8,7 @@ -- {{{ Main theme = {} -theme.wallpaper_cmd = { "nitrogen --restore" } +theme.wallpaper_cmd = { "awsetbg -l" } -- }}} -- {{{ Styles From f708863ea9d397361c814090b6471b94404b40fe Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 18 Oct 2010 23:09:22 +0200 Subject: [PATCH 10/14] update --- obvious | 2 +- vicious | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/obvious b/obvious index ff150db..e3a3e05 160000 --- a/obvious +++ b/obvious @@ -1 +1 @@ -Subproject commit ff150db20a89fa2e086cc4fbb75fefa7cfd16f88 +Subproject commit e3a3e05405d6c622326f3faba6ce6b7c188bf1e9 diff --git a/vicious b/vicious index c532c0b..ca1d8d7 160000 --- a/vicious +++ b/vicious @@ -1 +1 @@ -Subproject commit c532c0b0803c98a26d56875f0955ed43132bfed2 +Subproject commit ca1d8d79e55b7addc28dc442832815692b01b894 From b935ab35ef22aaf28cdeefc5ea50140fd230993e Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 18 Oct 2010 23:09:58 +0200 Subject: [PATCH 11/14] obvious/vicious updated --- obvious | 2 +- vicious | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/obvious b/obvious index e3a3e05..ff150db 160000 --- a/obvious +++ b/obvious @@ -1 +1 @@ -Subproject commit e3a3e05405d6c622326f3faba6ce6b7c188bf1e9 +Subproject commit ff150db20a89fa2e086cc4fbb75fefa7cfd16f88 diff --git a/vicious b/vicious index ca1d8d7..c532c0b 160000 --- a/vicious +++ b/vicious @@ -1 +1 @@ -Subproject commit ca1d8d79e55b7addc28dc442832815692b01b894 +Subproject commit c532c0b0803c98a26d56875f0955ed43132bfed2 From f50eecf51556fcef9f3311653bcd46ec2f5ecdb2 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Wed, 3 Nov 2010 11:33:45 +0100 Subject: [PATCH 12/14] rulefix --- rules.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules.lua b/rules.lua index 71cb7f5..9986c4d 100644 --- a/rules.lua +++ b/rules.lua @@ -17,7 +17,7 @@ awful.rules.rules = { ontop = true, focus = true } }, { rule = { class = "Teardrop" }, - properties = { floating = true } }, + properties = { floating = true, tag = tags[1][12] } }, { rule = { class = "pinentry" }, properties = { floating = true } }, { rule = { class = "gimp" }, From 80f145c267eeb31971d092d44a73727a4433bb28 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Fri, 19 Nov 2010 22:59:26 +0100 Subject: [PATCH 13/14] ram and bat widget fix/change --- rc.lua | 1 + wibox.lua | 26 ++++++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/rc.lua b/rc.lua index cb79132..912ee96 100644 --- a/rc.lua +++ b/rc.lua @@ -37,3 +37,4 @@ dofile (MY_PATH .. "wibox.lua") dofile (MY_PATH .. "bindings.lua") dofile (MY_PATH .. "rules.lua") dofile (MY_PATH .. "signals.lua") +dofile (MY_PATH .. "wp.lua") diff --git a/wibox.lua b/wibox.lua index a640906..7a99b9c 100644 --- a/wibox.lua +++ b/wibox.lua @@ -19,19 +19,29 @@ clock = widget({ type = "textbox" }) vicious.register(clock, vicious.widgets.date, "%b %d, %R", 60) memwidget = widget({ type = "textbox" }) -vicious.register(memwidget, vicious.widgets.mem, "⌸ $1% ($2MB / $3MB) ", 13) +vicious.register(memwidget, vicious.widgets.mem, "RAM: $1% ($2MB / $3MB) ", 13) --batwidget = obvious.battery(); +--batwidget = awful.widget.progressbar() +--batwidget:set_width(60) +--batwidget:set_height(15) +--batwidget:set_vertical(false) +--batwidget:set_background_color("#494B4F") +--batwidget:set_border_color(nil) +--batwidget:set_color("#AECF96") +--batwidget:set_gradient_colors({ "#AECF96", "#88A175", "#FF5656" }) batwidget = widget({ type = "textbox" }) -vicious.register(batwidget, vicious.widgets.bat, "⌁ $1$2% - $3", 61) +--vicious.register(batwidget, vicious.widgets.bat, "BAT: $2%", 61, "BAT1") +vicious.register(batwidget, vicious.widgets.bat, "BAT1: $1$2% - $3", 61, "BAT1") + +--cpuwidget = awful.widget.progressbar() +--cpuwidget:set_width(50) +--cpuwidget:set_background_color("#494B4F") +--cpuwidget:set_color("#FF5656") +--cpuwidget:set_gradient_colors({ "#FF5656", "#88A175", "#AECF96" }) +--vicious.register(cpuwidget, vicious.widgets.cpu, "$1",41) -cpuwidget = awful.widget.progressbar() cpulabel = widget({ type = "textbox" }) -cpuwidget:set_width(50) -cpuwidget:set_background_color("#494B4F") -cpuwidget:set_color("#FF5656") -cpuwidget:set_gradient_colors({ "#FF5656", "#88A175", "#AECF96" }) -vicious.register(cpuwidget, vicious.widgets.cpu, "$1",41) vicious.register(cpulabel, vicious.widgets.cpu, "CPU: $1%") From 185ab9ae3f818f95ddb9745dffe5c6b43a185f57 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Sat, 20 Nov 2010 00:02:06 +0100 Subject: [PATCH 14/14] ignoreupdate --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 751b59a..339a027 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ wp wallpaper +walls