X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/c831eba29b81b3d52046d342f58dcfeeabee8b1d..13f8fda788cf16ea7269b4e9b4868cd06195577f:/.config/awesome/rc.lua?ds=sidebyside

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 71ec9e1..a56aab0 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -113,8 +113,8 @@ tags.settings = {
     { name = "2", layout = layouts[1] },
     { name = "3", layout = layouts[1] },
     { name = "4", layout = layouts[1] },
-    { name = "5", layout = layouts[5] },
-    { name = "6", layout = layouts[3] },
+    { name = "5", layout = layouts[1] },
+    { name = "6", layout = layouts[1] },
     { name = "7", layout = layouts[3] },
     { name = "8", layout = layouts[3] },
     { name = "9", layout = layouts[3] },
@@ -319,10 +319,8 @@ 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({ modkey, "Shift"   }, "Right", function () awful.screen.focus( 1)       end),
-    awful.key({ modkey, "Shift"   }, "Left", function () awful.screen.focus(-1)       end),
-    awful.key({ modkey, "Shift"   }, "h",   awful.tag.viewprev       ),
-    awful.key({ modkey, "Shift"   }, "l",  awful.tag.viewnext       ),
+    awful.key({ modkey, "Shift"   }, "Right", function () awful.screen.focus_relative( 1)       end),
+    awful.key({ modkey, "Shift"   }, "Left", function () awful.screen.focus_relative(-1)       end),
 
     awful.key({ modkey,           }, "k",
         function ()
@@ -373,7 +371,13 @@ globalkeys = awful.util.table.join(
                   mypromptbox[mouse.screen].widget,
                   awful.util.eval, nil,
                   awful.util.getdir("cache") .. "/history_eval")
-              end)
+              end),
+    awful.key({ modkey }, "F1", function () awful.screen.focus(1) end),
+    awful.key({ modkey }, "F2", function () awful.screen.focus(2) end),
+    awful.key({ modkey }, "F3", function () awful.screen.focus(3) end),
+    awful.key({ modkey, "Shift" }, "F1", function () awful.client.movetoscreen(c, 1) end),
+    awful.key({ modkey, "Shift" }, "F2", function () awful.client.movetoscreen(c, 2) end),
+    awful.key({ modkey, "Shift" }, "F3", function () awful.client.movetoscreen(c, 3) end)
 )
 
 clientkeys = awful.util.table.join(
@@ -381,7 +385,8 @@ clientkeys = awful.util.table.join(
     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",      awful.client.movetoscreen                        ),
+    awful.key({ modkey,           }, "o",      function (c) awful.client.movetoscreen(c, c.screen-1) end),
+    awful.key({ modkey,           }, "p",      function (c) awful.client.movetoscreen(c, c.screen+1) end),
     awful.key({ modkey, "Shift"   }, "r",      function (c) c:redraw()                       end),
     awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end),
     awful.key({ modkey,           }, "n",      function (c) c.minimized = not c.minimized    end),
@@ -401,10 +406,6 @@ clientkeys = awful.util.table.join(
                 c.maximized_horizontal = false
                 c.maximized_vertical = false
             end
-            -- b = c.maximized_horizontal + c.maximized_vertical * 2
-            -- b = (b + 1) % 4
-            -- c.maximized_horizontal = b & 1
-            -- c.maximized_vertical = (b & 2) >>1
         end)
 )
 
@@ -456,12 +457,10 @@ cmdmodkey = "Mod3"
 
 -- xmms2 & sound
 globalkeys = awful.util.table.join(globalkeys,
-  awful.key({ cmdmodkey }, "Prior", function () awful.util.spawn("amixer set Master 2+") end),
-  awful.key({ cmdmodkey }, "Next", function () awful.util.spawn("amixer set Master 2-") end),
-  awful.key({ cmdmodkey }, "Up", function () awful.util.spawn("amixer set PCM 2+") end),
-  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 }, "Prior", function () awful.util.spawn("pactl set-sink-volume 0 +2%") end),
+  awful.key({ cmdmodkey }, "Next", function () awful.util.spawn("pactl set-sink-volume 0 -2%") end),
+  awful.key({ cmdmodkey }, "Home", function () awful.util.spawn("pactl set-source-mute 1 toggle") end),
+  awful.key({ cmdmodkey }, "End", function () awful.util.spawn("pactl set-sink-mute 0 toggle") 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),
@@ -490,8 +489,8 @@ globalkeys = awful.util.table.join(globalkeys,
   awful.key({ cmdmodkey }, "g", function () awful.util.spawn("gscan2pdf") end),
   awful.key({ cmdmodkey }, "o", function () awful.util.spawn("okular") end),
   awful.key({ cmdmodkey }, "l", function () awful.util.spawn("libreoffice") end),
-  awful.key({ cmdmodkey }, "i", function () awful.util.spawn(terminal .. " -title irc -name irc -e mosh -- 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 }, "i", function () awful.util.spawn(terminal .. " -title irc -name irc -e env MOSH_TITLE_NOPREFIX=true mosh -- 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 -- -no-capture-stderr -log ~/.tmp/xscreensaver.log; 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)
 )
@@ -510,7 +509,8 @@ awful.rules.rules = {
                      floating = true,
                      keys = clientkeys,
                      buttons = clientbuttons },
-      callback = awful.placement.centered },
+      callback = awful.placement.centered
+    },
     { rule = { class = "URxvt" },
       properties = { floating = false } },
     { rule = { class = "URxvt", instance = "irc" },
@@ -519,12 +519,6 @@ awful.rules.rules = {
       properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][9], switchtotag = false, floating = false } },
     { rule = { class = "Icedove", instance = "Mail" },
       properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][8], switchtotag = false, floating = false } },
---    { rule = { class = "Iceweasel", instance = "Dialog" },
---      properties = { floating = true } },
-   -- { rule = { name = "OpenOffice.org" },
-  --    properties = { switchtotag = true, floating = true, maximized_vertical = true, maximized_horizontal = true, callback = awful.placement.no_offscreen } },
- --   { rule = { name = "Okular" },
---      properties = { switchtotag = true, floating = true, maximized_vertical = true, maximized_horizontal = true, callback = awful.placement.no_offscreen } },
 }
 -- }}}