X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/8963bd775e3f732e12d7894091b0a12af72fffa1..ba6a24aecf23aab3b7b1b2cd59dbbad773860f1b:/.config/awesome/rc.lua?ds=inline

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 955e239..7b2ae0e 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -19,6 +19,8 @@ theme_path = "/usr/share/awesome/themes/default/theme.lua"
 -- Uncommment this for a lighter theme
 -- theme_path = "/usr/share/awesome/themes/sky/theme.lua"
 
+wallpaper_cmd = { "awsetbg -t .config/awesome/bgstripes.png" } 
+
 -- Actually load theme
 beautiful.init(theme_path)
 
@@ -438,17 +440,17 @@ globalkeys = awful.util.table.join(globalkeys,
   awful.key({ cmdmodkey }, "Down", function () awful.util.spawn("amixer set PCM 2-") end),
   awful.key({ cmdmodkey }, "Home", function () awful.util.spawn("amixer set Mic toggle") end),
   awful.key({ cmdmodkey }, "End", function () awful.util.spawn("amixer set Master toggle") end),
-  awful.key({ cmdmodkey }, "Left", function () awful.util.spawn("xmms2 prev") end),
-  awful.key({ cmdmodkey }, "Right", function () awful.util.spawn("xmms2 next") end),
-  awful.key({ cmdmodkey }, "space", function () awful.util.spawn("xmms2 toggleplay") end),
+  awful.key({ cmdmodkey }, "Left", function () awful.util.spawn("nyxmms2 prev") end),
+  awful.key({ cmdmodkey }, "Right", function () awful.util.spawn("nyxmms2 next") end),
+  awful.key({ cmdmodkey }, "space", function () awful.util.spawn("nyxmms2 toggle") end),
   awful.key({ cmdmodkey }, "backslash", function ()
-    local f = io.popen('xmms2 current', 'r')
+    local f = io.popen('nyxmms2 status', 'r')
     naughty.notify({ title = "Now playing", text = f:read(), timeout = 5 })
     f:close()
   end),
   awful.key({ cmdmodkey, "Shift" }, "backslash", function ()
-    local f = io.popen('xmms2 list', 'r')
-    naughty.notify({ title = "Playlist", text = f:read(), timeout = 15 })
+    local f = io.popen('nyxmms2 list', 'r')
+    naughty.notify({ title = "Playlist", text = f:read("*a"), timeout = 15 })
     f:close()
   end)
 )
@@ -461,7 +463,7 @@ globalkeys = awful.util.table.join(globalkeys,
   awful.key({ cmdmodkey }, "c", function () awful.util.spawn(terminal .. " -e python") end),
   awful.key({ cmdmodkey }, "r", function () mypromptbox[mouse.screen]:run() end),
   awful.key({ cmdmodkey }, "j", function () awful.util.spawn("jpilot") end),
-  awful.key({ cmdmodkey }, "i", function () awful.util.spawn(terminal .. " -title irc -name irc -e ssh -t irc screen -dr irc") end),
+  awful.key({ cmdmodkey }, "i", function () awful.util.spawn(terminal .. " -title irc -name irc -e ssh -Snone -t irc screen -dr irc") end),
   awful.key({ cmdmodkey }, "x", function () awful.util.spawn_with_shell("/sbin/start-stop-daemon --start --background --exec /usr/bin/xscreensaver; xscreensaver-command -lock") end),
   awful.key({ cmdmodkey, "Shift" }, "x", function () awful.util.spawn("xscreensaver-command -exit") end),
   awful.key(nil, "XF86ScreenSaver", function () awful.util.spawn("xset dpms force off") end)
@@ -472,39 +474,6 @@ 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,
-                     keys = clientkeys,
-                     buttons = clientbuttons } },
-    { rule = { class = "MPlayer" },
-      properties = { floating = true } },
-    { rule = { class = "pinentry" },
-      properties = { floating = true } },
-    { rule = { class = "gimp" },
-      properties = { floating = true } },
-    { rule = { class = "twinkle" },
-      properties = { floating = true } },
-    { rule = { class = "Play stream" },
-      properties = { floating = true } },
-    { rule = { class = "gscan2pdf" },
-      properties = { floating = true } },
-    { rule = { class = "Gxmessage" },
-      properties = { floating = true } },
-    { rule = { class = "Add-ons" },
-      properties = { floating = true } },
-    { rule = { class = "Okular" },
-      properties = { maximised = true } },
-    { rule = { class = "Iceweasel" },
-      properties = { tag = tags[1][9], switchtotag = false } },
-    { rule = { class = "Iceweasel", role = "Dialog" },
-      properties = { floating = true } },
-    { rule = { class = "Jpilot" },
-      properties = { tag = screen.count()>1 and tags[3][2] or tags[1][8], switchtotag = false } },
-}
 awful.rules.rules = {
     -- All clients will match this rule.
     { rule = { },
@@ -513,25 +482,18 @@ awful.rules.rules = {
                      focus = true,
                      floating = true,
                      keys = clientkeys,
-                     buttons = clientbuttons } },
+                     buttons = clientbuttons },
+      callback = awful.placement.centered },
     { rule = { class = "URxvt" },
       properties = { floating = false } },
     { rule = { class = "URxvt", instance = "irc" },
-      properties = { tag = screen.count()>1 and tags[3][1] or tags[1][4], switchtotag = true, floating = false } },
-    { rule = { class = "Okular" },
-      properties = { tag = tags[1][7], switchtotag = true, floating = false } },
-    { rule = { class = "Evince" },
-      properties = { tag = tags[1][7], switchtotag = true, floating = false } },
-    { rule = { class = "OpenOffice.org 3.1" },
-      properties = { tag = tags[1][7], switchtotag = true, floating = false } },
-    { rule = { class = "Vinagre" },
-      properties = { tag = tags[1][6], switchtotag = false, floating = false } },
+      properties = { floating = false, tag = tags[screen.count()][screen.count() == 1 and 2 or 1], switchtotag = true } },
     { rule = { class = "Iceweasel" },
-      properties = { tag = tags[1][9], switchtotag = false, floating = false } },
+      properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][9], switchtotag = false, floating = false } },
     { rule = { class = "Iceweasel", instance = "Dialog" },
       properties = { floating = true } },
     { rule = { class = "Jpilot" },
-      properties = { tag = tags[1][8], switchtotag = false, floating = false } },
+      properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][8], switchtotag = true, floating = false } },
 }
 -- }}}
 
@@ -562,6 +524,7 @@ client.add_signal("manage", function (c, startup)
             awful.placement.no_offscreen(c)
         end
     end
+    c.size_hints_honor = false
 end)
 
 client.add_signal("focus", function(c) c.border_color = beautiful.border_focus end)