X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/bdcc166013e8057c7ef2412903eb4598a753272f..ac23353125e9b9812ae33243e15a0e40883547bc:/.config/awesome/rc.lua?ds=sidebyside;pf=etc

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 382ee9e..5e1b06a 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -312,13 +312,13 @@ globalkeys = awful.util.table.join(
     awful.key({ modkey,           }, "Escape", awful.tag.history.restore,
               {description = "go back", group = "tag"}),
 
-    awful.key({ modkey,           }, "j",
+    awful.key({ modkey,           }, "k",
         function ()
             awful.client.focus.byidx( 1)
         end,
         {description = "focus next by index", group = "client"}
     ),
-    awful.key({ modkey,           }, "k",
+    awful.key({ modkey,           }, "j",
         function ()
             awful.client.focus.byidx(-1)
         end,
@@ -328,13 +328,13 @@ globalkeys = awful.util.table.join(
               {description = "show main menu", group = "awesome"}),
 
     -- Layout manipulation
-    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end,
+    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx(  1)    end,
               {description = "swap with next client by index", group = "client"}),
-    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx( -1)    end,
+    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx( -1)    end,
               {description = "swap with previous client by index", group = "client"}),
-    awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end,
+    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative( 1) end,
               {description = "focus the next screen", group = "screen"}),
-    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end,
+    awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative(-1) end,
               {description = "focus the previous screen", group = "screen"}),
     awful.key({ modkey,           }, "u", awful.client.urgent.jumpto,
               {description = "jump to urgent client", group = "client"}),
@@ -523,6 +523,13 @@ root.keys(globalkeys)
 
 -- {{{ Rules
 -- Rules to apply to new clients (through the "manage" signal).
+
+local function move_to_tag(s, t)
+    return function(c)
+        c:move_to_tag(tags[s][t])
+    end
+end
+
 awful.rules.rules = {
     -- All clients will match this rule.
     { rule = { },
@@ -553,42 +560,40 @@ awful.rules.rules = {
                } },
     { rule = { class = "URxvt", instance = "irc" },
                properties = {
---                   screen = screen.count(),
---                   tag = screen.count() == 1 and "2" or "1"
+                   switch_to_tag = true
                },
-               callback = function(c) c:move_to_tag(tags[1][2]) end
+               callback = move_to_tag(screen.count(), screen.count() == 1 and 2 or 1)
            },
     { rule = { class = "Firefox" },
                properties = {
                    floating = false,
---                   screen = screen.count(),
---                   tag = screen.count() == 1 and "2" or "1"
                },
-               callback = function(c) c:move_to_tag(tags[1][9]) end
+               callback = move_to_tag(screen.count() == 1 and 1 or 2, 9)
            },
     { rule = { class = "Icedove" },
                properties = {
                    floating = false,
---                   screen = screen.count(),
---                   tag = screen.count() == 1 and "2" or "1"
                },
-               callback = function(c) c:move_to_tag(tags[1][8]) end
+               callback = move_to_tag(screen.count() == 1 and 1 or 2, 8)
            },
     { rule = { class = "chromium" },
                properties = {
                    floating = false,
---                   screen = screen.count(),
---                   tag = screen.count() == 1 and "2" or "1"
                },
-               callback = function(c) c:move_to_tag(tags[1][9]) end
+               callback = move_to_tag(screen.count() == 1 and 1 or 2, 9)
            },
     { rule = { class = "Gscan2pdf" },
                properties = {
-                   floating = false,
                    screen = 1,
-                   tag = "7"
+                   tag = "5"
+               },
+               callback = move_to_tag(1, 5)
+           },
+    { rule = { name = "gscan2pdf .*" },
+               properties = {
+                   floating = false,
                },
---               callback = function(c) c:move_to_tag(tags[1][9]) end
+               callback = move_to_tag(1, 5)
            },
 }
 -- }}}