From 369a8750917c1086abeaab1ffd0e77eb7b4c929d Mon Sep 17 00:00:00 2001 From: crater2150 Date: Sun, 30 May 2010 22:24:50 +0200 Subject: [PATCH 01/19] update --- rc.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rc.lua b/rc.lua index 83109ca..7a8180a 100644 --- a/rc.lua +++ b/rc.lua @@ -410,8 +410,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" }, @@ -433,6 +432,8 @@ awful.rules.rules = { properties = { tag = tags[1][7] } }, { rule = { class = "Xhtop" }, properties = { tag = tags[1][22] } }, + --{ rule = { class = "OpenOffice.org 3.2" }, + --properties = { floating = false } }, } -- }}} From d3fa48bad458b0f714dcbcebd06c4093b1a1a961 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 6 Jun 2010 02:22:14 +0000 Subject: [PATCH 02/19] submodules configured --- .gitmodules | 6 ++++++ obvious | 2 +- vicious | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..7757f61 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "obvious"] + path = obvious + url = git://git.mercenariesguild.net/obvious.git +[submodule "vicious"] + path = vicious + url = http://git.sysphere.org/vicious diff --git a/obvious b/obvious index 58b3b5d..565f11c 160000 --- a/obvious +++ b/obvious @@ -1 +1 @@ -Subproject commit 58b3b5dae420955e4e815fc70744ee6ee5442565 +Subproject commit 565f11c05dd28a2bfe8a96a6ec0950b970f5abcd diff --git a/vicious b/vicious index 0d73f6d..ca1d8d7 160000 --- a/vicious +++ b/vicious @@ -1 +1 @@ -Subproject commit 0d73f6d8ae32f1cd48ce9f089b902eb0877605e1 +Subproject commit ca1d8d79e55b7addc28dc442832815692b01b894 From 9e434b8a593ad5bc1f2fc3568181c6302a54abf9 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Sun, 6 Jun 2010 02:56:07 +0000 Subject: [PATCH 03/19] modularized config file --- bindings.lua | 170 ++++++++++++++ runraise.lua => helpers.lua | 9 + rc.lua | 448 +----------------------------------- rules.lua | 45 ++++ signals.lua | 31 +++ tags.lua | 40 ++++ wibox.lua | 91 ++++++++ 7 files changed, 397 insertions(+), 437 deletions(-) create mode 100644 bindings.lua rename runraise.lua => helpers.lua (85%) create mode 100644 rules.lua create mode 100644 signals.lua create mode 100644 tags.lua create mode 100644 wibox.lua diff --git a/bindings.lua b/bindings.lua new file mode 100644 index 0000000..ea14360 --- /dev/null +++ b/bindings.lua @@ -0,0 +1,170 @@ + +-- {{{ Mouse bindings +root.buttons(awful.util.table.join( +awful.button({ }, 3, function () mymainmenu:toggle() end), +awful.button({ }, 4, awful.tag.viewnext), +awful.button({ }, 5, awful.tag.viewprev) +)) +-- }}} + +-- {{{ Key bindings +globalkeys = awful.util.table.join( +--{{{ + awful.key({ modkey, }, "Left", awful.tag.viewprev ), + awful.key({ modkey, }, "Right", awful.tag.viewnext ), + awful.key({ modkey, }, "Escape", awful.tag.history.restore), + awful.key({ }, "XF86Word", awful.tag.viewprev ), + awful.key({ }, "XF86WebCam", awful.tag.viewnext ), + awful.key({ }, "XF86Away", awful.tag.history.restore), + + awful.key({ modkey, }, "j", + function () + awful.client.focus.byidx( 1) + if client.focus then client.focus:raise() end + end), + awful.key({ modkey, }, "k", + function () + awful.client.focus.byidx(-1) + if client.focus then client.focus:raise() end + end), + awful.key({ modkey, }, "w", function () mymainmenu:show(true) end), +--}}} + --{{{ Layout manipulation + awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end), + awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end), + awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end), + awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end), + awful.key({ modkey, }, "u", awful.client.urgent.jumpto), + awful.key({ modkey, }, "Tab", + function () + awful.client.focus.history.previous() + if client.focus then + client.focus:raise() + end + end), + awful.key({ "Mod1", }, "Tab", + function () + awful.client.focus.history.previous() + if client.focus then + client.focus:raise() + end + end), + --}}} + -- 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({ }, "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), + awful.key({ modkey, "Control" }, "r", awesome.restart), + awful.key({ modkey, "Shift" }, "q", awesome.quit), + + -- Audio control + awful.key({ }, "Print", function () teardrop("sakura --class=Teardrop -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), + awful.key({ modkey , "Shift" }, "m", function () awful.util.spawn("mpdmenu -a") end), + awful.key({ modkey , "Control" }, "m", function () awful.util.spawn("mpdmenu -t") end), + awful.key({ modkey }, "m", function () awful.util.spawn("mpc toggle") end), + awful.key({ modkey }, "n", function () awful.util.spawn("mpc next") end), + awful.key({ modkey , "Shift"}, "n", function () awful.util.spawn("mpc prev") end), + awful.key({ }, "XF86AudioPlay", function () awful.util.spawn("mpc toggle") end), + awful.key({ }, "XF86AudioNext", function () awful.util.spawn("mpc next") end), + awful.key({ }, "XF86AudioPrev", function () awful.util.spawn("mpc prev") end), + awful.key({ }, "XF86AudioStop", function () awful.util.spawn("mpdmenu -a") end), + awful.key({ modkey , "Control" }, "n", function () awful.util.spawn("mpdmenu -j") end), + -- 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 ), + + + --{{{Default + 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, "Shift" }, "h", 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" }, "l", function () awful.tag.incncol(-1) end), + awful.key({ modkey, }, "space", function () awful.layout.inc(layouts, 1) end), + awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, 0) end) + + --}}} +) + +clientkeys = awful.util.table.join( + awful.key({ modkey, "Shift" }, "f", function (c) c.fullscreen = not c.fullscreen end), + awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end), + awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle ), + awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end), + awful.key({ modkey, }, "o", function (c) c.ontop = not c.ontop end), + awful.key({ modkey, }, "a", function (c) c.sticky = not c.sticky end), + awful.key({ modkey, "Shift" }, "r", function (c) c:redraw() end), + awful.key({ modkey, }, "n", function (c) c.minimized = not c.minimized end) +) + +-- Compute the maximum number of digit we need, limited to 9 +keynumber = 0 +for s = 1, screen.count() do + keynumber = math.min(22, math.max(#tags[s], keynumber)); +end + +-- Bind all key numbers to tags. +-- Be careful: we use keycodes to make it works on any keyboard layout. +-- This should map on the top row of your keyboard, usually 1 to 9. +-- FKeys: 67-78 +for i = 1, keynumber do + if i < 10 then + k = "#" .. i + 9 + elseif i == 10 then + k = "#19" + elseif i > 10 then + k = "F" .. i - 10 + end + globalkeys = awful.util.table.join(globalkeys, + awful.key({ modkey }, k, + function () + local screen = mouse.screen + if tags[screen][i] then + awful.tag.viewonly(tags[screen][i]) + end + end), + awful.key({ modkey, "Control" }, k, + function () + local screen = mouse.screen + if tags[screen][i] then + awful.tag.viewtoggle(tags[screen][i]) + end + end), + awful.key({ modkey, "Shift" }, k, + function () + if client.focus and tags[client.focus.screen][i] then + awful.client.movetotag(tags[client.focus.screen][i]) + end + end), + awful.key({ modkey, "Control", "Shift" }, k, + function () + if client.focus and tags[client.focus.screen][i] then + awful.client.toggletag(tags[client.focus.screen][i]) + end + end)) +end + +clientbuttons = awful.util.table.join( + awful.button({ }, 1, function (c) client.focus = c; c:raise() end), + awful.button({ modkey }, 1, awful.mouse.client.move), + awful.button({ modkey }, 3, awful.mouse.client.resize)) + +-- Set keys +root.keys(globalkeys) +-- }}} diff --git a/runraise.lua b/helpers.lua similarity index 85% rename from runraise.lua rename to helpers.lua index 6561f18..0c20f12 100644 --- a/runraise.lua +++ b/helpers.lua @@ -42,3 +42,12 @@ function runraise(cmd, properties) awful.util.spawn(cmd) end +-- Returns true if all pairs in table1 are present in table2 +function match (table1, table2) + for k, v in pairs(table1) do + if table2[k] ~= v and not table2[k]:find(v) then + return false + end + end + return true +end diff --git a/rc.lua b/rc.lua index 7a8180a..b72fdb4 100644 --- a/rc.lua +++ b/rc.lua @@ -1,3 +1,7 @@ +terminal = "sakura -e screen" +editor_cmd = "sakura -e vim" +modkey = "Mod4" + -- Standard awesome library require("awful") require("awful.autofocus") @@ -8,73 +12,12 @@ require("teardrop") require("obvious.battery") require("obvious.popup_run_prompt") require("vicious") ---- 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 -function runraise(cmd, properties) - local clients = client.get() - local focused = awful.client.next(0) - local findex = 0 - local matched_clients = {} - local n = 0 - for i, c in pairs(clients) do - --make an array of matched clients - if match(properties, c) then - n = n + 1 - matched_clients[n] = c - if c == focused then - findex = n - end - end - end - if n > 0 then - local c = matched_clients[1] - -- if the focused window matched switch focus to next in list - if 0 < findex and findex < n then - c = matched_clients[findex+1] - end - local ctags = c:tags() - if table.getn(ctags) == 0 then - -- ctags is empty, show client on current tag - local curtag = awful.tag.selected() - awful.client.movetotag(curtag, c) - else - -- Otherwise, pop to first tag client is visible on - awful.tag.viewonly(ctags[1]) - end - -- And then focus the client - client.focus = c - c:raise() - return - end - awful.util.spawn(cmd) -end --- Returns true if all pairs in table1 are present in table2 -function match (table1, table2) - for k, v in pairs(table1) do - if table2[k] ~= v and not table2[k]:find(v) then - return false - end - end - return true -end --- {{{ Variable definitions + -- Themes define colours, icons, and wallpapers beautiful.init("/home/crater2150/.config/awesome/zenburn/theme.lua") --- This is used later as the default terminal and editor to run. -terminal = "sakura -e screen" -editor_cmd = "sakura -e vim" - --- Default modkey. --- 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. -modkey = "Mod4" -- Table of layouts to cover with awful.layout.inc, order matters. layouts = @@ -89,381 +32,12 @@ layouts = awful.layout.suit.max.fullscreen, awful.layout.suit.floating } --- }}} --- {{{ Tags -local tags = {} -tags.setup = { - { name = "1:⚙", layout = layouts[1] }, - { name = "2:⌘", layout = layouts[7] }, - { name = "3:☻", layout = layouts[2], mwfact = 0.80 }, - { name = "4:✉", layout = layouts[7] }, - { name = "5:☑", layout = layouts[7] }, - { name = "6:♫", layout = layouts[1] }, - { name = "7:☣", layout = layouts[1] }, - { name = "8:☕", layout = layouts[1] }, - { name = "9:⚂", layout = layouts[1] }, - { name = "0:☠", layout = layouts[1] }, - { name = "F1:☭", layout = layouts[1] }, - { name = "F2:♚", layout = layouts[1] }, - { name = "F3:♛", layout = layouts[1] }, - { name = "F4:♜", layout = layouts[1] }, - { name = "F5:♝", layout = layouts[1] }, - { name = "F6:♞", layout = layouts[1] }, - { name = "F7:♟", layout = layouts[1] }, - { name = "F8:⚖", layout = layouts[1] }, - { name = "F9:⚛", layout = layouts[1] }, - { name = "F10:⚡", layout = layouts[1] }, - { name = "F11:⚰", layout = layouts[1] }, - { name = "F12:⚙", layout = layouts[1] } -} - -for s = 1, screen.count() do - tags[s] = {} - for i, t in ipairs(tags.setup) do - tags[s][i] = tag({ name = t.name }) - tags[s][i].screen = s - awful.tag.setproperty(tags[s][i], "layout", t.layout) - awful.tag.setproperty(tags[s][i], "mwfact", t.mwfact) - awful.tag.setproperty(tags[s][i], "hide", t.hide) - end - tags[s][1].selected = true -end --- }}} - --- {{{ Reusable separators -spacer = widget({ type = "textbox", name = "spacer" }) -spacer.text = " " - -separator = widget({ type = "textbox", name = "separator", align = "center" }) -separator.text = " )( " --- }}} - --- {{{ Wibox - ---popup run - --- Create a textclock widget ---clock = awful.widget.textclock({ align = "right" }) -mysystray = widget({ type = "systray" }) - -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) - ---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) -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%") +dofile "./helpers.lua" +dofile "./tags.lua" +dofile "./wibox.lua" +dofile "./bindings.lua" +dofile "./rules.lua" +dofile "./signals.lua" -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 = {} -mylayoutbox = {} -mytaglist = {} -mytaglist.buttons = awful.util.table.join( - awful.button({ }, 1, awful.tag.viewonly), - awful.button({ modkey }, 1, awful.client.movetotag), - 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) - ) - -for s = 1, screen.count() do - -- 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) - mylayoutbox[s]:buttons(awful.util.table.join( - awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end), - awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end), - 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) - - - -- Create the wibox - leftwibox[s] = awful.wibox({ position = "left", screen = s }) - rightwibox[s] = awful.wibox({ position = "right", screen = s }) - -- Add widgets to the wibox - order matters - leftwibox[s].widgets = { - mytaglist[s], - mylayoutbox[s], - spacer, - layout = awful.widget.layout.horizontal.rightleft - } - rightwibox[s].widgets = { - { - clock, - separator, spacer, memwidget, - separator, spacer, batwidget, - separator, spacer, wlanwidget, - separator, spacer, cpulabel, cpuwidget, - spacer, - layout = awful.widget.layout.horizontal.leftright - }, - separator, spacer, s == 1 and mysystray or nil, - layout = awful.widget.layout.horizontal.leftright - } -end --- }}} - --- {{{ Mouse bindings -root.buttons(awful.util.table.join( -awful.button({ }, 3, function () mymainmenu:toggle() end), -awful.button({ }, 4, awful.tag.viewnext), -awful.button({ }, 5, awful.tag.viewprev) -)) --- }}} - --- {{{ Key bindings -globalkeys = awful.util.table.join( ---{{{ - awful.key({ modkey, }, "Left", awful.tag.viewprev ), - awful.key({ modkey, }, "Right", awful.tag.viewnext ), - awful.key({ modkey, }, "Escape", awful.tag.history.restore), - awful.key({ }, "XF86Word", awful.tag.viewprev ), - awful.key({ }, "XF86WebCam", awful.tag.viewnext ), - awful.key({ }, "XF86Away", awful.tag.history.restore), - - awful.key({ modkey, }, "j", - function () - awful.client.focus.byidx( 1) - if client.focus then client.focus:raise() end - end), - awful.key({ modkey, }, "k", - function () - awful.client.focus.byidx(-1) - if client.focus then client.focus:raise() end - end), - awful.key({ modkey, }, "w", function () mymainmenu:show(true) end), ---}}} - --{{{ Layout manipulation - awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end), - awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end), - awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end), - awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end), - awful.key({ modkey, }, "u", awful.client.urgent.jumpto), - awful.key({ modkey, }, "Tab", - function () - awful.client.focus.history.previous() - if client.focus then - client.focus:raise() - end - end), - awful.key({ "Mod1", }, "Tab", - function () - awful.client.focus.history.previous() - if client.focus then - client.focus:raise() - end - end), - --}}} - -- 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({ }, "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), - awful.key({ modkey, "Control" }, "r", awesome.restart), - awful.key({ modkey, "Shift" }, "q", awesome.quit), - - -- Audio control - awful.key({ }, "Print", function () teardrop("sakura --class=Teardrop -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), - awful.key({ modkey , "Shift" }, "m", function () awful.util.spawn("mpdmenu -a") end), - awful.key({ modkey , "Control" }, "m", function () awful.util.spawn("mpdmenu -t") end), - awful.key({ modkey }, "m", function () awful.util.spawn("mpc toggle") end), - awful.key({ modkey }, "n", function () awful.util.spawn("mpc next") end), - awful.key({ modkey , "Shift"}, "n", function () awful.util.spawn("mpc prev") end), - awful.key({ }, "XF86AudioPlay", function () awful.util.spawn("mpc toggle") end), - awful.key({ }, "XF86AudioNext", function () awful.util.spawn("mpc next") end), - awful.key({ }, "XF86AudioPrev", function () awful.util.spawn("mpc prev") end), - awful.key({ }, "XF86AudioStop", function () awful.util.spawn("mpdmenu -a") end), - awful.key({ modkey , "Control" }, "n", function () awful.util.spawn("mpdmenu -j") end), - -- 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 ), - - - --{{{Default - 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, "Shift" }, "h", 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" }, "l", function () awful.tag.incncol(-1) end), - awful.key({ modkey, }, "space", function () awful.layout.inc(layouts, 1) end), - awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, 0) end) - - --}}} -) - -clientkeys = awful.util.table.join( - awful.key({ modkey, "Shift" }, "f", function (c) c.fullscreen = not c.fullscreen end), - awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end), - awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle ), - awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end), - awful.key({ modkey, }, "o", function (c) c.ontop = not c.ontop end), - awful.key({ modkey, }, "a", function (c) c.sticky = not c.sticky end), - awful.key({ modkey, "Shift" }, "r", function (c) c:redraw() end), - awful.key({ modkey, }, "n", function (c) c.minimized = not c.minimized end) -) - --- Compute the maximum number of digit we need, limited to 9 -keynumber = 0 -for s = 1, screen.count() do - keynumber = math.min(22, math.max(#tags[s], keynumber)); -end - --- Bind all key numbers to tags. --- Be careful: we use keycodes to make it works on any keyboard layout. --- This should map on the top row of your keyboard, usually 1 to 9. --- FKeys: 67-78 -for i = 1, keynumber do - if i < 10 then - k = "#" .. i + 9 - elseif i == 10 then - k = "#19" - elseif i > 10 then - k = "F" .. i - 10 - end - globalkeys = awful.util.table.join(globalkeys, - awful.key({ modkey }, k, - function () - local screen = mouse.screen - if tags[screen][i] then - awful.tag.viewonly(tags[screen][i]) - end - end), - awful.key({ modkey, "Control" }, k, - function () - local screen = mouse.screen - if tags[screen][i] then - awful.tag.viewtoggle(tags[screen][i]) - end - end), - awful.key({ modkey, "Shift" }, k, - function () - if client.focus and tags[client.focus.screen][i] then - awful.client.movetotag(tags[client.focus.screen][i]) - end - end), - awful.key({ modkey, "Control", "Shift" }, k, - function () - if client.focus and tags[client.focus.screen][i] then - awful.client.toggletag(tags[client.focus.screen][i]) - end - end)) -end - -clientbuttons = awful.util.table.join( - awful.button({ }, 1, function (c) client.focus = c; c:raise() end), - awful.button({ modkey }, 1, awful.mouse.client.move), - awful.button({ modkey }, 3, awful.mouse.client.resize)) - --- Set keys -root.keys(globalkeys) --- }}} - --- {{{ Rules -awful.rules.rules = { - -- All clients will match this rule. - { rule = { }, - properties = { border_width = beautiful.border_width, - border_color = beautiful.border_normal, - focus = true, - size_hints_honor = false, - keys = clientkeys, - buttons = clientbuttons } }, - { rule = { class = "MPlayer" }, - properties = { floating = true, - size_hints_honor = true } }, - { rule = { class = "Passprompt" }, - properties = { floating = true, - ontop = true, - focus = true } }, - { rule = { class = "Teardrop" }, - properties = { floating = true } }, - { rule = { class = "pinentry" }, - properties = { floating = true } }, - { rule = { class = "gimp" }, - properties = { floating = true } }, - -- Set Firefox to always map on tags number 2 of screen 1. - { rule = { class = "Firefox" }, - properties = { tag = tags[1][2] } }, - { rule = { class = "Pidgin" }, - properties = { tag = tags[1][3] } }, - { rule = { role = "buddy_list" }, - properties = { master = true } }, - { rule = { class = "Thunderbird" }, - properties = { tag = tags[1][4] } }, - { rule = { class = "Sunbird-bin" }, - properties = { tag = tags[1][5] } }, - { rule = { class = "Gmpc" }, - properties = { tag = tags[1][6] } }, - { rule = { class = "Deluge" }, - properties = { tag = tags[1][7] } }, - { rule = { class = "Xhtop" }, - properties = { tag = tags[1][22] } }, - --{ rule = { class = "OpenOffice.org 3.2" }, - --properties = { floating = false } }, -} --- }}} - --- {{{ Signals --- Signal function to execute when a new client appears. -client.add_signal("manage", function (c, startup) - -- Add a titlebar - -- awful.titlebar.add(c, { modkey = modkey }) - - -- Enable sloppy focus - c:add_signal("mouse::enter", function(c) - if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier - and awful.client.focus.filter(c) then - client.focus = c - end - end) - - if not startup then - -- Set the windows at the slave, - -- i.e. put it at the end of others instead of setting it master. - -- awful.client.setslave(c) - - -- Put windows in a smart way, only if they does not set an initial position. - if not c.size_hints.user_position and not c.size_hints.program_position then - awful.placement.no_overlap(c) - awful.placement.no_offscreen(c) - end - end -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) --- }}} diff --git a/rules.lua b/rules.lua new file mode 100644 index 0000000..903b24c --- /dev/null +++ b/rules.lua @@ -0,0 +1,45 @@ + +-- {{{ Rules +awful.rules.rules = { + -- All clients will match this rule. + { rule = { }, + properties = { border_width = beautiful.border_width, + border_color = beautiful.border_normal, + focus = true, + size_hints_honor = false, + keys = clientkeys, + buttons = clientbuttons } }, + { rule = { class = "MPlayer" }, + properties = { floating = true, + size_hints_honor = true } }, + { rule = { class = "Passprompt" }, + properties = { floating = true, + ontop = true, + focus = true } }, + { rule = { class = "Teardrop" }, + properties = { floating = true } }, + { rule = { class = "pinentry" }, + properties = { floating = true } }, + { rule = { class = "gimp" }, + properties = { floating = true } }, + -- Set Firefox to always map on tags number 2 of screen 1. + { rule = { class = "Firefox" }, + properties = { tag = tags[1][2] } }, + { rule = { class = "Pidgin" }, + properties = { tag = tags[1][3] } }, + { rule = { role = "buddy_list" }, + properties = { master = true } }, + { rule = { class = "Thunderbird" }, + properties = { tag = tags[1][4] } }, + { rule = { class = "Sunbird-bin" }, + properties = { tag = tags[1][5] } }, + { rule = { class = "Gmpc" }, + properties = { tag = tags[1][6] } }, + { rule = { class = "Deluge" }, + properties = { tag = tags[1][7] } }, + { rule = { class = "Xhtop" }, + properties = { tag = tags[1][22] } }, + --{ rule = { class = "OpenOffice.org 3.2" }, + --properties = { floating = false } }, +} +-- }}} diff --git a/signals.lua b/signals.lua new file mode 100644 index 0000000..8f5f0c2 --- /dev/null +++ b/signals.lua @@ -0,0 +1,31 @@ + +-- {{{ Signals +-- Signal function to execute when a new client appears. +client.add_signal("manage", function (c, startup) + -- Add a titlebar + -- awful.titlebar.add(c, { modkey = modkey }) + + -- Enable sloppy focus + c:add_signal("mouse::enter", function(c) + if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier + and awful.client.focus.filter(c) then + client.focus = c + end + end) + + if not startup then + -- Set the windows at the slave, + -- i.e. put it at the end of others instead of setting it master. + -- awful.client.setslave(c) + + -- Put windows in a smart way, only if they does not set an initial position. + if not c.size_hints.user_position and not c.size_hints.program_position then + awful.placement.no_overlap(c) + awful.placement.no_offscreen(c) + end + end +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) +-- }}} diff --git a/tags.lua b/tags.lua new file mode 100644 index 0000000..836ed58 --- /dev/null +++ b/tags.lua @@ -0,0 +1,40 @@ + +-- {{{ Tags +local tags = {} +tags.setup = { + { name = "1:⚙", layout = layouts[1] }, + { name = "2:⌘", layout = layouts[7] }, + { name = "3:☻", layout = layouts[2], mwfact = 0.80 }, + { name = "4:✉", layout = layouts[7] }, + { name = "5:☑", layout = layouts[7] }, + { name = "6:♫", layout = layouts[1] }, + { name = "7:☣", layout = layouts[1] }, + { name = "8:☕", layout = layouts[1] }, + { name = "9:⚂", layout = layouts[1] }, + { name = "0:☠", layout = layouts[1] }, + { name = "F1:☭", layout = layouts[1] }, + { name = "F2:♚", layout = layouts[1] }, + { name = "F3:♛", layout = layouts[1] }, + { name = "F4:♜", layout = layouts[1] }, + { name = "F5:♝", layout = layouts[1] }, + { name = "F6:♞", layout = layouts[1] }, + { name = "F7:♟", layout = layouts[1] }, + { name = "F8:⚖", layout = layouts[1] }, + { name = "F9:⚛", layout = layouts[1] }, + { name = "F10:⚡", layout = layouts[1] }, + { name = "F11:⚰", layout = layouts[1] }, + { name = "F12:⚙", layout = layouts[1] } +} + +for s = 1, screen.count() do + tags[s] = {} + for i, t in ipairs(tags.setup) do + tags[s][i] = tag({ name = t.name }) + tags[s][i].screen = s + awful.tag.setproperty(tags[s][i], "layout", t.layout) + awful.tag.setproperty(tags[s][i], "mwfact", t.mwfact) + awful.tag.setproperty(tags[s][i], "hide", t.hide) + end + tags[s][1].selected = true +end +-- }}} diff --git a/wibox.lua b/wibox.lua new file mode 100644 index 0000000..0afbebd --- /dev/null +++ b/wibox.lua @@ -0,0 +1,91 @@ + +-- {{{ Reusable separators +spacer = widget({ type = "textbox", name = "spacer" }) +spacer.text = " " + +separator = widget({ type = "textbox", name = "separator", align = "center" }) +separator.text = " )( " +-- }}} + +-- {{{ Wibox + +--popup run + +-- Create a textclock widget +--clock = awful.widget.textclock({ align = "right" }) +mysystray = widget({ type = "systray" }) + +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) + +--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) +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%") + + +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 = {} +mylayoutbox = {} +mytaglist = {} +mytaglist.buttons = awful.util.table.join( + awful.button({ }, 1, awful.tag.viewonly), + awful.button({ modkey }, 1, awful.client.movetotag), + 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) + ) + +for s = 1, screen.count() do + -- 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) + mylayoutbox[s]:buttons(awful.util.table.join( + awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end), + awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end), + 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) + + + -- Create the wibox + leftwibox[s] = awful.wibox({ position = "left", screen = s }) + rightwibox[s] = awful.wibox({ position = "right", screen = s }) + -- Add widgets to the wibox - order matters + leftwibox[s].widgets = { + mytaglist[s], + mylayoutbox[s], + spacer, + layout = awful.widget.layout.horizontal.rightleft + } + rightwibox[s].widgets = { + { + clock, + separator, spacer, memwidget, + separator, spacer, batwidget, + separator, spacer, wlanwidget, + separator, spacer, cpulabel, cpuwidget, + spacer, + layout = awful.widget.layout.horizontal.leftright + }, + separator, spacer, s == 1 and mysystray or nil, + layout = awful.widget.layout.horizontal.leftright + } +end +-- }}} From 7589790d73234403334fb06583aca3929c2abc99 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Sun, 6 Jun 2010 03:37:20 +0000 Subject: [PATCH 04/19] bugfix path --- rc.lua | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/rc.lua b/rc.lua index b72fdb4..254a1fa 100644 --- a/rc.lua +++ b/rc.lua @@ -33,11 +33,13 @@ layouts = awful.layout.suit.floating } -dofile "./helpers.lua" -dofile "./tags.lua" -dofile "./wibox.lua" -dofile "./bindings.lua" -dofile "./rules.lua" -dofile "./signals.lua" +MY_PATH = os.getenv("HOME") .. "/.config/awesome/" + +dofile (MY_PATH .. "helpers.lua") +dofile (MY_PATH .. "tags.lua") +dofile (MY_PATH .. "wibox.lua") +dofile (MY_PATH .. "bindings.lua") +dofile (MY_PATH .. "rules.lua") +dofile (MY_PATH .. "signals.lua") From 4692e9aed402a49d674ccbe026b34b292f934701 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 7 Jun 2010 09:05:22 +0000 Subject: [PATCH 05/19] updated --- rc.lua | 1 - tags.lua | 2 +- zenburn/theme.lua | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/rc.lua b/rc.lua index 254a1fa..9f315b4 100644 --- a/rc.lua +++ b/rc.lua @@ -9,7 +9,6 @@ require("awful.rules") require("beautiful") require("naughty") require("teardrop") -require("obvious.battery") require("obvious.popup_run_prompt") require("vicious") diff --git a/tags.lua b/tags.lua index 836ed58..ec24163 100644 --- a/tags.lua +++ b/tags.lua @@ -1,6 +1,6 @@ -- {{{ Tags -local tags = {} +tags = {} tags.setup = { { name = "1:⚙", layout = layouts[1] }, { name = "2:⌘", layout = layouts[7] }, diff --git a/zenburn/theme.lua b/zenburn/theme.lua index 756d611..141bc25 100644 --- a/zenburn/theme.lua +++ b/zenburn/theme.lua @@ -8,7 +8,7 @@ -- {{{ Main theme = {} -theme.wallpaper_cmd = { "awsetbg -a /home/crater2150/.config/awesome/wallpaper" } +theme.wallpaper_cmd = { "nitrogen --restore" } -- }}} -- {{{ Styles From ab55d384dceff5028de8225c468a1c32d8c8d229 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Thu, 17 Jun 2010 20:20:38 +0200 Subject: [PATCH 06/19] vicious --- vicious | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vicious b/vicious index ca1d8d7..0d73f6d 160000 --- a/vicious +++ b/vicious @@ -1 +1 @@ -Subproject commit ca1d8d79e55b7addc28dc442832815692b01b894 +Subproject commit 0d73f6d8ae32f1cd48ce9f089b902eb0877605e1 From 3cc330e234b76031ab07bef06c8853a50c6d7529 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Fri, 18 Jun 2010 23:13:19 +0200 Subject: [PATCH 07/19] added claws-mail rule --- rules.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules.lua b/rules.lua index 903b24c..fb78759 100644 --- a/rules.lua +++ b/rules.lua @@ -31,6 +31,8 @@ awful.rules.rules = { properties = { master = true } }, { 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" }, From 30fd81b3a3e9046f94137b4584ff6d72a55f488c Mon Sep 17 00:00:00 2001 From: crater2150 Date: Thu, 24 Jun 2010 18:14:00 +0200 Subject: [PATCH 08/19] rules --- rules.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/rules.lua b/rules.lua index 903b24c..991b00b 100644 --- a/rules.lua +++ b/rules.lua @@ -29,6 +29,8 @@ awful.rules.rules = { properties = { tag = tags[1][3] } }, { rule = { role = "buddy_list" }, properties = { master = true } }, + { rule = { class = "Claws-mail" }, + properties = { tag = tags[1][4] } }, { rule = { class = "Thunderbird" }, properties = { tag = tags[1][4] } }, { rule = { class = "Sunbird-bin" }, @@ -41,5 +43,13 @@ awful.rules.rules = { properties = { tag = tags[1][22] } }, --{ rule = { class = "OpenOffice.org 3.2" }, --properties = { floating = false } }, + { rule = { class = "Cellwriter" }, + properties = { tag = tags[1][1], + ontop = true, + size_hints_honor = true, + float = true, + sticky = true, + fullscreen = true + } }, } -- }}} From 7bf8e56a3523f4b298e7c85037416b1256a2b1eb Mon Sep 17 00:00:00 2001 From: crater2150 Date: Thu, 24 Jun 2010 18:15:08 +0200 Subject: [PATCH 09/19] zenburn --- zenburn/theme.lua | 30 +++++++++--------- zenburn/titlebar/close_normal.png | Bin 370 -> 370 bytes zenburn/titlebar/floating_focus_inactive.png | Bin 339 -> 339 bytes zenburn/titlebar/floating_normal_active.png | Bin 361 -> 361 bytes zenburn/titlebar/floating_normal_inactive.png | Bin 328 -> 328 bytes zenburn/titlebar/maximized_focus_inactive.png | Bin 337 -> 337 bytes zenburn/titlebar/maximized_normal_active.png | Bin 369 -> 369 bytes .../titlebar/maximized_normal_inactive.png | Bin 349 -> 349 bytes zenburn/titlebar/ontop_focus_inactive.png | Bin 333 -> 333 bytes zenburn/titlebar/ontop_normal_active.png | Bin 349 -> 349 bytes zenburn/titlebar/ontop_normal_inactive.png | Bin 334 -> 334 bytes zenburn/titlebar/sticky_focus_inactive.png | Bin 330 -> 330 bytes zenburn/titlebar/sticky_normal_active.png | Bin 361 -> 361 bytes zenburn/titlebar/sticky_normal_inactive.png | Bin 329 -> 329 bytes 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/zenburn/theme.lua b/zenburn/theme.lua index 756d611..dae417f 100644 --- a/zenburn/theme.lua +++ b/zenburn/theme.lua @@ -8,25 +8,25 @@ -- {{{ Main theme = {} -theme.wallpaper_cmd = { "awsetbg -a /home/crater2150/.config/awesome/wallpaper" } +theme.wallpaper_cmd = { "nitrogen --restore" } -- }}} -- {{{ Styles theme.font = "sans 8" -- {{{ Colors -theme.fg_normal = "#8888FF" -theme.fg_focus = "#000000" -theme.fg_urgent = "#FF0000" -theme.bg_normal = "#000000" -theme.bg_focus = "#8888FF" -theme.bg_urgent = "#880000" +theme.fg_normal = "#DCDCCC" +theme.fg_focus = "#F0DFAF" +theme.fg_urgent = "#CC9393" +theme.bg_normal = "#3F3F3F" +theme.bg_focus = "#1E2320" +theme.bg_urgent = "#3F3F3F" -- }}} -- {{{ Borders theme.border_width = "2" -theme.border_normal = "#DDDDFF" -theme.border_focus = "#8888FF" +theme.border_normal = "#3F3F3F" +theme.border_focus = "#6F6F6F" theme.border_marked = "#CC9393" -- }}} @@ -83,12 +83,12 @@ theme.tasklist_floating_icon = "/usr/share/awesome/themes/default/tasklist/float -- }}} -- {{{ Layout -theme.layout_tile = "/usr/share/awesome/themes/zenburn/layouts/tilebottom.png" -theme.layout_tileleft = "/usr/share/awesome/themes/zenburn/layouts/tiletop.png" -theme.layout_tilebottom = "/usr/share/awesome/themes/zenburn/layouts/tileleft.png" -theme.layout_tiletop = "/usr/share/awesome/themes/zenburn/layouts/tile.png" -theme.layout_fairv = "/usr/share/awesome/themes/zenburn/layouts/fairh.png" -theme.layout_fairh = "/usr/share/awesome/themes/zenburn/layouts/fairv.png" +theme.layout_tile = "/usr/share/awesome/themes/zenburn/layouts/tile.png" +theme.layout_tileleft = "/usr/share/awesome/themes/zenburn/layouts/tileleft.png" +theme.layout_tilebottom = "/usr/share/awesome/themes/zenburn/layouts/tilebottom.png" +theme.layout_tiletop = "/usr/share/awesome/themes/zenburn/layouts/tiletop.png" +theme.layout_fairv = "/usr/share/awesome/themes/zenburn/layouts/fairv.png" +theme.layout_fairh = "/usr/share/awesome/themes/zenburn/layouts/fairh.png" theme.layout_spiral = "/usr/share/awesome/themes/zenburn/layouts/spiral.png" theme.layout_dwindle = "/usr/share/awesome/themes/zenburn/layouts/dwindle.png" theme.layout_max = "/usr/share/awesome/themes/zenburn/layouts/max.png" diff --git a/zenburn/titlebar/close_normal.png b/zenburn/titlebar/close_normal.png index c5266d7979efa7744480f32c87505f7e9cc3934a..bc97b7c651fc86d7f806dc11fc564ec5df9554df 100644 GIT binary patch delta 108 zcmeyw^oeOgG3S2mdKI;Vst E0NAi0L;wH) delta 108 zcmeyw^oeOgF((5E{B+)3Ke1+Bgn^~5p@FWENr-`^m9eFjiLthUft7(l?P=$kKvk+G yt`Q|Ei6yC4x%nxXX_X8{22c$KA%+%KCWcmq77z_DOdEE9%=L8jb6Mw<&;$Uu@E)Q7 diff --git a/zenburn/titlebar/floating_focus_inactive.png b/zenburn/titlebar/floating_focus_inactive.png index 6a8bd86f0a48341134834ed34260a9bae03d75c0..f442d7863e1d5e05447b70db96ffbcd9ae3688b4 100644 GIT binary patch delta 104 zcmcc2beU;FG3)>K{xkb0Ry0Q#8t59B=^B}Y7+P2vm|7WHY8x0?85o#u`@_n>z@S>< z8c~vxSdwa$o1c=IR>@#w0McNpYiJN+Xkuk-X=Q2-(Xf_%{sEu{22WQ%mvv4FO#tIj B9`67E delta 104 zcmcc2beU;FF)PEWUS*?+70nR_mb!)px<)1;29{RFmR2Ul+6D$z1_rgKoo6yIFsPQe yMwFx^mZVzc=BH$)RWcYEKs6YI7+P4F7+M)xKs3BCZP)?Sz~JfX=d#Wzp$Pyn#T{1w diff --git a/zenburn/titlebar/floating_normal_active.png b/zenburn/titlebar/floating_normal_active.png index 609a2a2f0b47e6b48eba9c5261c5f18106cf0262..1355a55527934580d4bcce3aacd18bc05e0d2ce8 100644 GIT binary patch delta 108 zcmaFK^pa^pG3S2mdKI;Vst E0L}m*DF6Tf delta 108 zcmaFK^pa^pF((5E{B+)3Ke1+Ngn^~5p@FWENr-`^m9eFjiLthUft7(l?P=$kKvk+G yt`Q|Ei6yC4x%nxXX_X8{22c$KA%+%KCWcmq77z_DOdEE9%=L8jb6Mw<&;$UkKpuwx diff --git a/zenburn/titlebar/floating_normal_inactive.png b/zenburn/titlebar/floating_normal_inactive.png index 579ebd3749c589c075c5fd5acbad36c9aae6ccf1..e6731a33686be5d5f8c3a655d12f5b79e548ef6e 100644 GIT binary patch delta 104 zcmX@Xbb@I@G3)>K{xkb0R#Ze78t59B=^B}Y7+P2vm|7W`Xd4(=85rDpH%pCyfkCyz nHKHUXu_VK{xkb0Ry0N!8t59B=^B}Y7+P2vm|7WHY8x0?85o#u`@_n>z@S>< z8c~vxSdwa$o1c=IR>@#w0McNpYiJN+Xkuk-X=Q2-(Xf_%{sEu{22WQ%mvv4FO#tBm B9_au8 delta 104 zcmcb}bdhO7F)PEWUS*?+6^#)Fmb!)px<)1;29{RFmR2Ul+6D$z1_rgKoo6yIFsPQe yMwFx^mZVzc=BH$)RWcYEKs6YI7+P4F7+M)xKs3BCZP)?Sz~JfX=d#Wzp$PylbsbRv diff --git a/zenburn/titlebar/maximized_normal_active.png b/zenburn/titlebar/maximized_normal_active.png index f98030eb9109ed68125e40d094d567f47253b7c4..ba5139abfcf1eedb14d84ccb174a36185ff80aee 100644 GIT binary patch delta 108 zcmey!^pR;oG3S2mdKI;Vst E0M~#aK>z>% delta 108 zcmey!^pR;oF((5E{B+)3Ke1+Rgn^~5p@FWENr-`^m9eFjiLthUft7(l?P=$kKvk+G yt`Q|Ei6yC4x%nxXX_X8{22c$KA%+%KCWcmq77z_DOdEE9%=L8jb6Mw<&;$Utz#g9f diff --git a/zenburn/titlebar/maximized_normal_inactive.png b/zenburn/titlebar/maximized_normal_inactive.png index d84c2be4976fcb40f0241ac600a8b5171112cab9..debd21f25778608e3cc5d9b47c6d28e44c6bd6a8 100644 GIT binary patch delta 87 zcmcc1beCyDG3)>K{xkb0R`g068t59B=^B}Y7+P2vm|7W`Xd4(=85rDpH%o1@0;8BZ V4*Auam1Z#jfv2mV%Q~loCIIL+8SwxB delta 87 zcmcc1beCyDF)PEWUS*?+6}{31mb!)px<)1;29{RFmR6=F+6D$z1_mX^YC9(@Fp8<; VkY}BJ)RX}TJYD@<);T3K0RS`87b^e& diff --git a/zenburn/titlebar/ontop_focus_inactive.png b/zenburn/titlebar/ontop_focus_inactive.png index dd29ebedae49694f96beb23c6a8f3b9808191bd7..3b8b5c33ce6d1c8c87dff15f33fbae3cf588f55d 100644 GIT binary patch delta 87 zcmX@hbe3sCG3)>K{xkb0R@6!x8t59B=^B}Y7+P2vm|7WHY8x0?85o#u`@=d}fKf~x kByXx~Xb@s(Vr6V;WoizQU&}uK00R(sy85}Sb4q9e0Jw)46#xJL delta 87 zcmX@hbe3sCF)PEWUS*?+6}8d^mb!)px<)1;29{RFmR2Ul+6D$z1_rgKoo7xKU=&k_ g${U0jT3DGFS{YhE|g)_Pgg&ebxsLQ0472geEQH%u5JL+q6GJOQ3yAy+(}o=&V?15`T-G@yGywpM9~i3u diff --git a/zenburn/titlebar/ontop_normal_inactive.png b/zenburn/titlebar/ontop_normal_inactive.png index 05ed63fc8cc81a364399f0c9fd1bed2ad6c330e4..136f3f07d2181839cf5e0f361385fd956a18fc64 100644 GIT binary patch delta 87 zcmX@dbdG64G3)>K{xkb0R@6xw8t59B=^B}Y7+P2vm|7W`Xd4(=85rDpH%o1@AfuQ% V4*Auam1Z#jfv2mV%Q~loCIHu08MOca delta 87 zcmX@dbdG64F)PEWUS*?+6?M`Emb!)px<)1;29{RFmR6=F+6D$z1_mX^YC9(jGK#6= VkY}BJ)RX}TJYD@<);T3K0RSTN7ViK6 diff --git a/zenburn/titlebar/sticky_focus_inactive.png b/zenburn/titlebar/sticky_focus_inactive.png index 93ea06f0707281e14b2a55bab261a112276ab9da..b83ceffde2cd803c049c4e41811aeb0f41344918 100644 GIT binary patch delta 104 zcmX@bbc$(0G3)>K{xkb0R#Zh88t59B=^B}Y7+P2vm|7WHY8x0?85o#u`@_n>z@S>< z8c~vxSdwa$o1c=IR>@#w0McNpYiJN+Xkuk-X=Q2-(Xf_%{sEu{22WQ%mvv4FO#s;G B9@GE; delta 104 zcmX@bbc$(0F)PEWUS*?+6;%-imb!)px<)1;29{RFmR2Ul+6D$z1_rgKoo6yIFsPQe yMwFx^mZVzc=BH$)RWcYEKs6YI7+P4F7+M)xKs3BCZP)?Sz~JfX=d#Wzp$PydT^&3C diff --git a/zenburn/titlebar/sticky_normal_active.png b/zenburn/titlebar/sticky_normal_active.png index 57984a0e91b0f59206294d383acf9ec6865d3f83..9b740568e587207f24e6b7dfa60aa8b6d14a418c 100644 GIT binary patch delta 108 zcmaFK^pa^pG3S2mdKI;Vst E0L}m*DF6Tf delta 108 zcmaFK^pa^pF((5E{B+)3Ke1+Ngn^~5p@FWENr-`^m9eFjiLthUft7(l?P=$kKvk+G yt`Q|Ei6yC4x%nxXX_X8{22c$KA%+%KCWcmq77z_DOdEE9%=L8jb6Mw<&;$UkKpuwx diff --git a/zenburn/titlebar/sticky_normal_inactive.png b/zenburn/titlebar/sticky_normal_inactive.png index 617c51716fd4bd90e60bcd71abcebdfd47aba0c2..0e2978084fdd2ecbe310b209f4ab25825480a56b 100644 GIT binary patch delta 104 zcmX@fbdqU8G3)>K{xkb0R#Zk98t59B=^B}Y7+P2vm|7W`Xd4(=85rDpH%pCyfkCyz nHKHUXu_V Date: Thu, 24 Jun 2010 18:15:35 +0200 Subject: [PATCH 10/19] submodules --- obvious | 2 +- vicious | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/obvious b/obvious index 565f11c..e3a3e05 160000 --- a/obvious +++ b/obvious @@ -1 +1 @@ -Subproject commit 565f11c05dd28a2bfe8a96a6ec0950b970f5abcd +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 5bf889823d85e33f6f7c927f1eaf27b29f218bc0 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Thu, 24 Jun 2010 18:15:57 +0200 Subject: [PATCH 11/19] tags no more local --- tags.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tags.lua b/tags.lua index 836ed58..68484da 100644 --- a/tags.lua +++ b/tags.lua @@ -1,6 +1,6 @@ -- {{{ Tags -local tags = {} +tags={} tags.setup = { { name = "1:⚙", layout = layouts[1] }, { name = "2:⌘", layout = layouts[7] }, From 21b9bf3edc3f5f7e27f3b51bfb76877bf6702ee9 Mon Sep 17 00:00:00 2001 From: Alexander Date: Tue, 29 Jun 2010 12:27:30 +0200 Subject: [PATCH 12/19] zenburn fixed, bindings for tabletkeys --- bindings.lua | 17 ++++--- rc.lua | 1 + zenburn.lua | 141 --------------------------------------------------- 3 files changed, 12 insertions(+), 147 deletions(-) delete mode 100644 zenburn.lua diff --git a/bindings.lua b/bindings.lua index ea14360..b4a806b 100644 --- a/bindings.lua +++ b/bindings.lua @@ -1,7 +1,6 @@ -- {{{ Mouse bindings root.buttons(awful.util.table.join( -awful.button({ }, 3, function () mymainmenu:toggle() end), awful.button({ }, 4, awful.tag.viewnext), awful.button({ }, 5, awful.tag.viewprev) )) @@ -57,16 +56,22 @@ globalkeys = awful.util.table.join( -- 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("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({ }, "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), awful.key({ modkey, "Control" }, "r", awesome.restart), awful.key({ modkey, "Shift" }, "q", awesome.quit), + + + --tabletpc keys + awful.key({ hyper }, "6", function () awful.util.spawn("/usr/local/bin/rotate") end), + awful.key({ modkey }, "x", function () awful.util.spawn("cellwriter --show-window") end), + 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 ), diff --git a/rc.lua b/rc.lua index 254a1fa..9400fa6 100644 --- a/rc.lua +++ b/rc.lua @@ -1,6 +1,7 @@ terminal = "sakura -e screen" editor_cmd = "sakura -e vim" modkey = "Mod4" +hyper = "Mod3" -- Standard awesome library require("awful") diff --git a/zenburn.lua b/zenburn.lua deleted file mode 100644 index c293633..0000000 --- a/zenburn.lua +++ /dev/null @@ -1,141 +0,0 @@ -------------------------------- --- "Zenburn" awesome theme -- --- By Adrian C. (anrxc) -- -------------------------------- - - --- {{{ Main -theme = {} -theme.confdir = awful.util.getdir("config") -theme.wallpaper_cmd = { "/usr/bin/nitrogen --restore" } ---theme.wallpaper_cmd = { "awsetbg /usr/share/awesome/themes/zenburn/zenburn-background.png" } --- }}} - - --- {{{ Styles -theme.font = "Profont 8" - --- {{{ Colors -theme.fg_normal = "#DCDCCC" -theme.fg_focus = "#F0DFAF" -theme.fg_urgent = "#CC9393" -theme.bg_normal = "#3F3F3F" -theme.bg_focus = "#1E2320" -theme.bg_urgent = "#ff0000" --- }}} - --- {{{ Borders -theme.border_width = "1" -theme.border_normal = "#3F3F3F" -theme.border_focus = "#6F6F6F" -theme.border_marked = "#CC9393" --- }}} - --- {{{ Titlebars -theme.titlebar_bg_focus = "#3F3F3F" -theme.titlebar_bg_normal = "#3F3F3F" --- theme.titlebar_[normal|focus] --- }}} - --- {{{ Widgets -theme.fg_widget = "#AECF96" -theme.fg_center_widget = "#88A175" -theme.fg_end_widget = "#FF5656" -theme.fg_off_widget = "#494B4F" -theme.fg_netup_widget = "#7F9F7F" -theme.fg_netdn_widget = "#CC9393" -theme.bg_widget = "#3F3F3F" -theme.border_widget = "#3F3F3F" --- }}} - --- {{{ Mouse finder -theme.mouse_finder_color = "#CC9393" --- theme.mouse_finder_[timeout|animate_timeout|radius|factor] --- }}} - --- {{{ Tooltips --- theme.tooltip_[font|opacity|fg_color|bg_color|border_width|border_color] --- }}} - --- {{{ Taglist and Tasklist --- theme.[taglist|tasklist]_[bg|fg]_[focus|urgent] --- }}} - --- {{{ Menu --- theme.menu_[bg|fg]_[normal|focus] --- theme.menu_[height|width|border_color|border_width] --- }}} --- }}} - - --- {{{ Icons --- --- {{{ Taglist icons -theme.taglist_squares_sel = theme.confdir .. "/icons/taglist/squarefz.png" -theme.taglist_squares_unsel = theme.confdir .. "/icons/taglist/squareza.png" ---theme.taglist_squares_resize = "false" --- }}} - --- {{{ Misc icons ---theme.awesome_icon = theme.confdir .. "/icons/awesome.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 icons -theme.layout_tile = theme.confdir .. "/icons/layouts/tile.png" -theme.layout_tileleft = theme.confdir .. "/icons/layouts/tileleft.png" -theme.layout_tilebottom = theme.confdir .. "/icons/layouts/tilebottom.png" -theme.layout_tiletop = theme.confdir .. "/icons/layouts/tiletop.png" -theme.layout_fairv = theme.confdir .. "/icons/layouts/fairv.png" -theme.layout_fairh = theme.confdir .. "/icons/layouts/fairh.png" -theme.layout_spiral = theme.confdir .. "/icons/layouts/spiral.png" -theme.layout_dwindle = theme.confdir .. "/icons/layouts/dwindle.png" -theme.layout_max = theme.confdir .. "/icons/layouts/max.png" -theme.layout_fullscreen = theme.confdir .. "/icons/layouts/fullscreen.png" -theme.layout_magnifier = theme.confdir .. "/icons/layouts/magnifier.png" -theme.layout_floating = theme.confdir .. "/icons/layouts/floating.png" --- }}} - --- {{{ Widget icons -theme.widget_cpu = theme.confdir .. "/icons/cpu.png" -theme.widget_bat = theme.confdir .. "/icons/bat.png" -theme.widget_mem = theme.confdir .. "/icons/mem.png" -theme.widget_fs = theme.confdir .. "/icons/disk.png" -theme.widget_net = theme.confdir .. "/icons/down.png" -theme.widget_netup = theme.confdir .. "/icons/up.png" -theme.widget_mail = theme.confdir .. "/icons/mail.png" -theme.widget_vol = theme.confdir .. "/icons/vol.png" -theme.widget_org = theme.confdir .. "/icons/cal.png" -theme.widget_date = theme.confdir .. "/icons/time.png" -theme.widget_crypto = theme.confdir .. "/icons/crypto.png" --- }}} - --- {{{ Titlebar icons -theme.titlebar_close_button_focus = theme.confdir .. "/icons/titlebar/close_focus.png" -theme.titlebar_close_button_normal = theme.confdir .. "/icons/titlebar/close_normal.png" - -theme.titlebar_ontop_button_focus_active = theme.confdir .. "/icons/titlebar/ontop_focus_active.png" -theme.titlebar_ontop_button_normal_active = theme.confdir .. "/icons/titlebar/ontop_normal_active.png" -theme.titlebar_ontop_button_focus_inactive = theme.confdir .. "/icons/titlebar/ontop_focus_inactive.png" -theme.titlebar_ontop_button_normal_inactive = theme.confdir .. "/icons/titlebar/ontop_normal_inactive.png" - -theme.titlebar_sticky_button_focus_active = theme.confdir .. "/icons/titlebar/sticky_focus_active.png" -theme.titlebar_sticky_button_normal_active = theme.confdir .. "/icons/titlebar/sticky_normal_active.png" -theme.titlebar_sticky_button_focus_inactive = theme.confdir .. "/icons/titlebar/sticky_focus_inactive.png" -theme.titlebar_sticky_button_normal_inactive = theme.confdir .. "/icons/titlebar/sticky_normal_inactive.png" - -theme.titlebar_floating_button_focus_active = theme.confdir .. "/icons/titlebar/floating_focus_active.png" -theme.titlebar_floating_button_normal_active = theme.confdir .. "/icons/titlebar/floating_normal_active.png" -theme.titlebar_floating_button_focus_inactive = theme.confdir .. "/icons/titlebar/floating_focus_inactive.png" -theme.titlebar_floating_button_normal_inactive = theme.confdir .. "/icons/titlebar/floating_normal_inactive.png" - -theme.titlebar_maximized_button_focus_active = theme.confdir .. "/icons/titlebar/maximized_focus_active.png" -theme.titlebar_maximized_button_normal_active = theme.confdir .. "/icons/titlebar/maximized_normal_active.png" -theme.titlebar_maximized_button_focus_inactive = theme.confdir .. "/icons/titlebar/maximized_focus_inactive.png" -theme.titlebar_maximized_button_normal_inactive = theme.confdir .. "/icons/titlebar/maximized_normal_inactive.png" --- }}} --- }}} - - -return theme From 3820f1882e181b46b77f4f463a0b0c70aaf45976 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Wed, 1 Sep 2010 17:52:20 +0200 Subject: [PATCH 13/19] foo --- bindings.lua | 3 ++- rules.lua | 7 ++++++- tags.lua | 2 +- zenburn/theme.lua | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bindings.lua b/bindings.lua index b4a806b..3f04c85 100644 --- a/bindings.lua +++ b/bindings.lua @@ -70,7 +70,8 @@ globalkeys = awful.util.table.join( --tabletpc keys awful.key({ hyper }, "6", function () awful.util.spawn("/usr/local/bin/rotate") end), - awful.key({ modkey }, "x", function () awful.util.spawn("cellwriter --show-window") end), + --awful.key({ modkey }, "x", function () awful.util.spawn("cellwriter --show-window") end), + awful.key({ modkey }, "x", function () teardrop("cellwriter","top","center", 0.99, 0.4)end ), awful.key({ modkey, "Control" }, "Delete", function () awful.util.spawn("xlock") end), -- Audio control diff --git a/rules.lua b/rules.lua index 991b00b..fc16100 100644 --- a/rules.lua +++ b/rules.lua @@ -26,9 +26,14 @@ awful.rules.rules = { { rule = { class = "Firefox" }, properties = { tag = tags[1][2] } }, { rule = { class = "Pidgin" }, - properties = { tag = tags[1][3] } }, + properties = { tag = tags[1][3]} }, { rule = { role = "buddy_list" }, properties = { master = true } }, + { rule = { role = "conversation" }, + callback = awful.client.setslave}, + { rule = { class = "Irssi"}, + properties = { tag = tags[1][3]} , + callback = awful.client.setslave}, { rule = { class = "Claws-mail" }, properties = { tag = tags[1][4] } }, { rule = { class = "Thunderbird" }, diff --git a/tags.lua b/tags.lua index 68484da..1af42e9 100644 --- a/tags.lua +++ b/tags.lua @@ -4,7 +4,7 @@ tags={} tags.setup = { { name = "1:⚙", layout = layouts[1] }, { name = "2:⌘", layout = layouts[7] }, - { name = "3:☻", layout = layouts[2], mwfact = 0.80 }, + { name = "3:☻", layout = layouts[2], mwfact = 0.20 }, { name = "4:✉", layout = layouts[7] }, { name = "5:☑", layout = layouts[7] }, { name = "6:♫", layout = layouts[1] }, diff --git a/zenburn/theme.lua b/zenburn/theme.lua index dae417f..ae93bb1 100644 --- a/zenburn/theme.lua +++ b/zenburn/theme.lua @@ -8,7 +8,7 @@ -- {{{ Main theme = {} -theme.wallpaper_cmd = { "nitrogen --restore" } +theme.wallpaper_cmd = { "awsetbg /usr/share/awesome/themes/zenburn/zenburn-background.png" } -- }}} -- {{{ Styles From ade6d89c41085c3f22056a0fcb9407767e7c2d25 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Sat, 4 Sep 2010 00:52:38 +0200 Subject: [PATCH 14/19] update --- bindings.lua | 1 + rc.lua | 2 ++ rules.lua | 3 ++- zenburn/theme.lua | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bindings.lua b/bindings.lua index 3f04c85..86095b4 100644 --- a/bindings.lua +++ b/bindings.lua @@ -66,6 +66,7 @@ globalkeys = awful.util.table.join( awful.key({ modkey }, "XF86Mail", function () awful.util.spawn("urslock") end), awful.key({ modkey, "Control" }, "r", awesome.restart), awful.key({ modkey, "Shift" }, "q", awesome.quit), + awful.key({ }, "Menu", aweswt.switch), --tabletpc keys diff --git a/rc.lua b/rc.lua index 9400fa6..7ae56bc 100644 --- a/rc.lua +++ b/rc.lua @@ -13,6 +13,8 @@ require("teardrop") require("obvious.battery") require("obvious.popup_run_prompt") require("vicious") +require("aweswt") + diff --git a/rules.lua b/rules.lua index fc16100..15ca44f 100644 --- a/rules.lua +++ b/rules.lua @@ -24,7 +24,8 @@ awful.rules.rules = { properties = { floating = true } }, -- Set Firefox to always map on tags number 2 of screen 1. { rule = { class = "Firefox" }, - properties = { tag = tags[1][2] } }, + properties = { tag = tags[1][2], + floating = false } }, { rule = { class = "Pidgin" }, properties = { tag = tags[1][3]} }, { rule = { role = "buddy_list" }, diff --git a/zenburn/theme.lua b/zenburn/theme.lua index ae93bb1..dae417f 100644 --- a/zenburn/theme.lua +++ b/zenburn/theme.lua @@ -8,7 +8,7 @@ -- {{{ Main theme = {} -theme.wallpaper_cmd = { "awsetbg /usr/share/awesome/themes/zenburn/zenburn-background.png" } +theme.wallpaper_cmd = { "nitrogen --restore" } -- }}} -- {{{ Styles From c7985df86a5d9cc053ff37bc1aff962365a84a68 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Sat, 4 Sep 2010 01:09:24 +0200 Subject: [PATCH 15/19] some things --- aweswt.lua | 50 +++++++++++++++++++++++++++++++++++++++++++++++ rc.lua | 6 ++---- tags.lua | 6 +++--- zenburn/theme.lua | 20 +++++++++---------- 4 files changed, 65 insertions(+), 17 deletions(-) create mode 100644 aweswt.lua diff --git a/aweswt.lua b/aweswt.lua new file mode 100644 index 0000000..2ccf363 --- /dev/null +++ b/aweswt.lua @@ -0,0 +1,50 @@ + -- aweswt.lua + local io=io + local table=table + local pairs=pairs + local awful=awful + local client=client + local string=string + local USE_T=true + module("aweswt") + function get_out (a) + local f=io.popen (a) + t={} + for line in f:lines() do + table.insert(t, line ) + end + return t + end + function get_input (a) + s1='echo -e "'..a..'"|dmenu' + return get_out(s1) + end + + function switch() + local clients = client.get() + if table.getn(clients) == 0 then + return + end + local m1="" + local t2={} + local tmp + for i, c in pairs(clients) do + if USE_T then do + tmp=i..':'..string.sub(c['name'], 1, 20) + end + else do + tmp=i..':'..c['instance']..'.'..c['class'] + end + end + m1=m1..tmp..'\n' + t2[tmp]=c + end + local t6=t2[get_input(m1)[1]] + if t6 then + local ctags = t6:tags() + awful.tag.viewonly(ctags[1]) + client.focus = t6 + t6:raise() + end + end + diff --git a/rc.lua b/rc.lua index 7ae56bc..1fd564b 100644 --- a/rc.lua +++ b/rc.lua @@ -25,12 +25,10 @@ beautiful.init("/home/crater2150/.config/awesome/zenburn/theme.lua") -- 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.fair, awful.layout.suit.fair.horizontal, + awful.layout.suit.tile, + awful.layout.suit.tile.bottom, awful.layout.suit.max, awful.layout.suit.max.fullscreen, awful.layout.suit.floating diff --git a/tags.lua b/tags.lua index 1af42e9..4bc1ef9 100644 --- a/tags.lua +++ b/tags.lua @@ -3,10 +3,10 @@ tags={} tags.setup = { { name = "1:⚙", layout = layouts[1] }, - { name = "2:⌘", layout = layouts[7] }, + { name = "2:⌘", layout = layouts[5] }, { name = "3:☻", layout = layouts[2], mwfact = 0.20 }, - { name = "4:✉", layout = layouts[7] }, - { name = "5:☑", layout = layouts[7] }, + { name = "4:✉", layout = layouts[5] }, + { name = "5:☑", layout = layouts[1] }, { name = "6:♫", layout = layouts[1] }, { name = "7:☣", layout = layouts[1] }, { name = "8:☕", layout = layouts[1] }, diff --git a/zenburn/theme.lua b/zenburn/theme.lua index dae417f..346a717 100644 --- a/zenburn/theme.lua +++ b/zenburn/theme.lua @@ -15,12 +15,12 @@ theme.wallpaper_cmd = { "nitrogen --restore" } theme.font = "sans 8" -- {{{ Colors -theme.fg_normal = "#DCDCCC" +theme.fg_normal = "#DCDCDC" theme.fg_focus = "#F0DFAF" theme.fg_urgent = "#CC9393" -theme.bg_normal = "#3F3F3F" -theme.bg_focus = "#1E2320" -theme.bg_urgent = "#3F3F3F" +theme.bg_normal = "#121212" +theme.bg_focus = "#3F3F3F" +theme.bg_urgent = "#DA4E4E" -- }}} -- {{{ Borders @@ -83,12 +83,12 @@ theme.tasklist_floating_icon = "/usr/share/awesome/themes/default/tasklist/float -- }}} -- {{{ Layout -theme.layout_tile = "/usr/share/awesome/themes/zenburn/layouts/tile.png" -theme.layout_tileleft = "/usr/share/awesome/themes/zenburn/layouts/tileleft.png" -theme.layout_tilebottom = "/usr/share/awesome/themes/zenburn/layouts/tilebottom.png" -theme.layout_tiletop = "/usr/share/awesome/themes/zenburn/layouts/tiletop.png" -theme.layout_fairv = "/usr/share/awesome/themes/zenburn/layouts/fairv.png" -theme.layout_fairh = "/usr/share/awesome/themes/zenburn/layouts/fairh.png" +theme.layout_tiletop = "/usr/share/awesome/themes/zenburn/layouts/tile.png" +theme.layout_tilebottom = "/usr/share/awesome/themes/zenburn/layouts/tileleft.png" +theme.layout_tile = "/usr/share/awesome/themes/zenburn/layouts/tilebottom.png" +theme.layout_tileleft = "/usr/share/awesome/themes/zenburn/layouts/tiletop.png" +theme.layout_fairh = "/usr/share/awesome/themes/zenburn/layouts/fairv.png" +theme.layout_fairv = "/usr/share/awesome/themes/zenburn/layouts/fairh.png" theme.layout_spiral = "/usr/share/awesome/themes/zenburn/layouts/spiral.png" theme.layout_dwindle = "/usr/share/awesome/themes/zenburn/layouts/dwindle.png" theme.layout_max = "/usr/share/awesome/themes/zenburn/layouts/max.png" From 4542e5ac2ecd0d523c25e3e4dbe0fc0c5ba196b1 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Sat, 4 Sep 2010 01:11:13 +0200 Subject: [PATCH 16/19] fixing --- tags.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tags.lua b/tags.lua index 4bc1ef9..f36117e 100644 --- a/tags.lua +++ b/tags.lua @@ -4,7 +4,7 @@ tags={} tags.setup = { { name = "1:⚙", layout = layouts[1] }, { name = "2:⌘", layout = layouts[5] }, - { name = "3:☻", layout = layouts[2], mwfact = 0.20 }, + { name = "3:☻", layout = layouts[3], mwfact = 0.20 }, { name = "4:✉", layout = layouts[5] }, { name = "5:☑", layout = layouts[1] }, { name = "6:♫", layout = layouts[1] }, From cdab953dbdefadc71a67781893ec07d87005acfc Mon Sep 17 00:00:00 2001 From: crater2150 Date: Tue, 7 Sep 2010 17:07:00 +0200 Subject: [PATCH 17/19] 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 24d275a18a8fb71eac20e736cf3df02d01b8042c Mon Sep 17 00:00:00 2001 From: crater2150 Date: Tue, 7 Sep 2010 17:22:03 +0200 Subject: [PATCH 18/19] 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 787dfa94bdfeb4128b94effac8d4694fc516b810 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Tue, 7 Sep 2010 17:35:08 +0200 Subject: [PATCH 19/19] batwidget correction --- wibox.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wibox.lua b/wibox.lua index 0afbebd..a640906 100644 --- a/wibox.lua +++ b/wibox.lua @@ -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" })