aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-02-28 16:52:35 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-02-28 16:52:35 -0300
commit22d4a7316f7639098fa56dbceb981580d6285248 (patch)
tree9f2f477bd07254b9f44968c36b54da8b74b7806d
parent9e7bb0265ad9534ada509478fccc966ba81ed73c (diff)
downloadmetadot-22d4a7316f7639098fa56dbceb981580d6285248.tar.gz
metadot-22d4a7316f7639098fa56dbceb981580d6285248.tar.bz2
Adding awesompd widget
-rw-r--r--.gitmodules3
-rw-r--r--modules/awesome/config.dot/awesome.link/keys.lua3
-rw-r--r--modules/awesome/config.dot/awesome.link/rc.lua2
3 files changed, 8 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 9fca48f..5e658eb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
[submodule "modules/vim/vim.dot.link/bundle/tabular"]
path = modules/vim/vim.dot.link/bundle/tabular
url = https://github.com/godlygeek/tabular.git
+[submodule "modules/awesome/config.dot/awesome.link/awesompd"]
+ path = modules/awesome/config.dot/awesome.link/awesompd
+ url = https://github.com/alexander-yakushev/awesompd
diff --git a/modules/awesome/config.dot/awesome.link/keys.lua b/modules/awesome/config.dot/awesome.link/keys.lua
index 0ec5e0c..46e3428 100644
--- a/modules/awesome/config.dot/awesome.link/keys.lua
+++ b/modules/awesome/config.dot/awesome.link/keys.lua
@@ -23,5 +23,8 @@ globalkeys = awful.util.table.join(root.keys(),
awful.key({ }, "XF86AudioMute", function () awful.util.spawn("amixer sset Master toggle", false) end)
)
+-- Append keys from music widget
+musicwidget:append_global_keys()
+
-- Set keys
root.keys(globalkeys)
diff --git a/modules/awesome/config.dot/awesome.link/rc.lua b/modules/awesome/config.dot/awesome.link/rc.lua
index d8073fd..baebd49 100644
--- a/modules/awesome/config.dot/awesome.link/rc.lua
+++ b/modules/awesome/config.dot/awesome.link/rc.lua
@@ -55,6 +55,7 @@ layouts =
-- {{{ Widgets
-- Leds
dofile(configdir .. "/leds.lua")
+dofile(configdir .. "/awesompd.lua")
--dofile(configdir .. "/volume.lua")
-- }}}
@@ -164,6 +165,7 @@ for s = 1, screen.count() do
mytextclock,
s == 1 and mysystray or nil,
myledbox,
+ musicwidget.widget,
mytasklist[s],
layout = awful.widget.layout.horizontal.rightleft
}