]> git.madduck.net Git - etc/awesome.git/blobdiff - .config/awesome/rc.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

screen swapping keymappings fixed
[etc/awesome.git] / .config / awesome / rc.lua
index b181c1a8ac81f8f3e82604c5205d2362cbf6f854..b281d34652fa684ee8da8f3b4635abce3aa916a9 100644 (file)
@@ -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),
@@ -486,7 +491,7 @@ 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 }, "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)
@@ -506,7 +511,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" },