Changeset 909bc1c77c7b14ddb74df5eb488a2cd9288e0327

Timestamp:

09/01/10 15:49:58 (17 months ago)

Author:

Luper Rouch luper.rouch@…>

Children:

e7bf52cedc5410a62a59bfc22946d72454d3a5ac

Parents:

cadb525021a211c188d97fc9f03e59b3534cf108

git-author:

Luper Rouch <luper.rouch@…> (09/01/10 15:48:42)

git-committer:

Luper Rouch luper.rouch@…> (09/01/10 15:49:58)

Message:

update config

Location:

various/config

Files:

• awesome/rc.lua (modified) (7 diffs)
• awesome/themes/zenburn/icons/bat.png (added)
• awesome/themes/zenburn/theme.lua (modified) (1 diff)
• awesome/vicious/widgets/bat.lua (modified) (2 diffs)
• dot-xchat2/.gitignore (added)
• dot-xchat2/ignore.conf (modified) (1 diff)
• dot-xchat2/xchat.conf (modified) (3 diffs)

various/config/awesome/rc.lua

@@ -58 +58 @@
     ["qt"] = { position = 3, layout = awful.layout.suit.max },
     ["p2p"] = { position = 4 },
-
-    ["chat"] = { position = 1, screen = 2, init = true },
+    ["gimp"] = { position = 5, layout = awful.layout.suit.tile, 
+                 mwfact = 0.18, icon="/usr/share/pixmaps/gimp.png"  },
+    ["palette"] = { position = 2, exclusive = true },
+
+    ["chat"] = { position = 10, screen = 2, init = true },
 }
 
@@ -72 +75 @@
      { match = { "Qt Assistant", "Qt Designer" }, tag = "qt", float = false },
      { match = { "Ktorrent" }, tag = "p2p" },
+     { match = { "Gimp" }, tag = "gimp" },
+     { match = { "gimp%-image%-window" }, tag = "gimp", slave = true },
+     { match = { "palette-editor.py", "palette-client.py" }, tag = "palette" },
      { match = { "" }, buttons = awful.util.table.join(
             awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
@@ -114 +120 @@
 vicious.register(memwidget, vicious.widgets.mem, " $2MB/$3MB", 13)
 
--- CPU Widget
+-- CPU Widgets
 cpuwidget = widget({ type = "textbox" })
 vicious.register(cpuwidget, vicious.widgets.cpu, "$1%")
+cpufreqwidget = widget({ type = "textbox" })
+vicious.register(cpufreqwidget, vicious.widgets.cpufreq, "($1MHz)", 1, "cpu0")
 
 -- Net Widget
@@ -125 +133 @@
 -- tempwidget  = widget({ type = "textbox", name = "tempwidget" })
 -- vicious.register(tempwidget, vicious.widgets.thermal, "$1°C", 20, "thermal_zone2")
+
+baticon = widget({ type = "imagebox" })
+baticon.image = image(beautiful.widget_bat)
+-- Initialize widget
+batwidget = widget({ type = "textbox" })
+-- Register widget
+vicious.register(batwidget, vicious.widgets.bat, "$1$2% ($4)", 1, "BAT0")
 
 -- Icones
@@ -156 +171 @@
 mymemicon.image = image(beautiful.widget_mem)
 
+mybaticon = widget({ type = "imagebox", name = "mybaticon" })
+mybaticon.image = image(beautiful.widget_bat)
 -- }}}
 
@@ -239 +256 @@
         myneticonup, netwidget, myneticon,
         myspacer,
-        cpuwidget, mycpuicon,
+        cpufreqwidget, myspacer, cpuwidget, mycpuicon,
         myspacer,
         memwidget, mymemicon,
+        batwidget, mybaticon,
         mytasklist[s],
         layout = awful.widget.layout.horizontal.rightleft,
@@ -407 +425 @@
 
 awful.util.spawn_with_shell("gnome-settings-daemon")
+awful.util.spawn_with_shell("gnome-volume-control-applet")
+awful.util.spawn_with_shell("gnome-power-manager")
 awful.util.spawn_with_shell("xchat-gnome --class xchat")
 awful.util.spawn_with_shell("pidgin")
 awful.util.spawn_with_shell("chromium-browser")
-awful.util.spawn_with_shell("gnome-volume-control-applet")
-
--- }}}
+awful.util.spawn_with_shell("nm-applet")
+awful.util.spawn_with_shell("ssh-add")
+
+-- }}}

various/config/awesome/themes/zenburn/theme.lua

@@ -134 +134 @@
 theme.widget_fs = prefix .. "icons/disk.png"
 theme.widget_mem = prefix .. "icons/mem.png"
+theme.widget_bat = prefix .. "icons/bat.png"
 -- }}}
 

various/config/awesome/vicious/widgets/bat.lua

@@ -7 +7 @@
 local tonumber = tonumber
 local setmetatable = setmetatable
-local string = { format = string.format }
+local string = { 
+    format = string.format, 
+    match = string.match,
+    find = string.find
+}
+local io = { open = io.open }
 local helpers = require("vicious.helpers")
 local math = {
@@ -74 +79 @@
     local time = string.format("%02d:%02d", hoursleft, minutesleft)
 
-    return {state, percent, time}
+    -- Get charge/discharge rate
+    local batstate = io.open("/proc/acpi/battery/"..warg.."/state"):read("*all")
+    local charge_rate = string.match(batstate, "present rate: +([0-9]+ mW)")
+
+    return {state, percent, time, charge_rate}
 end
 -- }}}

various/config/dot-xchat2/ignore.conf

@@ -1 @@
-mask = *!*@adsl-177-221-238.msy.bellsouth.net
-type = 8
-
-mask = *!*@ip24-251-118-125.ph.ph.cox.net
-type = 8
-
-mask = *!*@174-24-58-172.clsp.qwest.net
-type = 8
-
-mask = *!*@ip-66-80-74-18.iad.megapath.net
-type = 8
-
-mask = *!*@dialin.inttek.net
-type = 8
-
-mask = *!*@bl8-6-36.dsl.telepac.pt
-type = 8
-
-mask = zdczxlynbnd!*@*
-type = 159
-
-mask = lwahddcn!*@*
-type = 159
-
-mask = dntvewessa!*@*
-type = 159
-
-mask = kyczxffm!*@*
-type = 159
-
-mask = ftzsoqdct!*@*
-type = 159
-
-mask = vyhxdpmse!*@*
-type = 159
-
-mask = uqyxmw!*@*
-type = 159
-
-mask = oOo!*@*
-type = 159
-

various/config/dot-xchat2/xchat.conf

@@ -17 +17 @@
 dcc_auto_send = 2
 dcc_blocksize = 1024
-dcc_completed_dir = /home/flupke/.xchat2/downloads
+dcc_completed_dir = 
 dcc_dir = /home/flupke/.xchat2/downloads
 dcc_fast_send = 1
@@ -50 +50 @@
 gui_input_spell = 1
 gui_input_style = 0
-gui_join_dialog = 0
+gui_join_dialog = 1
 gui_lagometer = 1
 gui_mode_buttons = 0
-gui_pane_left_size = 196
-gui_pane_right_size = 0
-gui_quit_dialog = 0
-gui_slist_select = 31
+gui_pane_left_size = 100
+gui_pane_right_size = 100
+gui_quit_dialog = 1
+gui_slist_select = 0
 gui_slist_skip = 0
 gui_throttlemeter = 1
@@ -74 +74 @@
 gui_url_mod = 4
 gui_usermenu = 0
-gui_win_height = 1125
+gui_win_height = 400
 gui_win_left = 0
 gui_win_save = 1
-gui_win_state = 1
-gui_win_top = 24
-gui_win_width = 1920
+gui_win_state = 0
+gui_win_top = 0
+gui_win_width = 640
 input_balloon_chans = 0
 input_balloon_hilight = 0