Merge remote-tracking branch 'gum/master'

2 files changed, 2 insertions, 18 deletions

diff --git a/makefu/5pkgs/awesomecfg/default.nix b/makefu/5pkgs/awesomecfg/default.nix
index 7a4d30137..8552634ff 100644
--- a/makefu/5pkgs/awesomecfg/default.nix
+++ b/makefu/5pkgs/awesomecfg/default.nix
@@ -16,7 +16,6 @@
   full = lib.makeOverridable pkgs.substituteAll {
     name = "awesome_full_config";
     inherit alsaUtils locker xbacklight modkey networkmanagerapplet blueman clipit flameshot ;
-    chaptermarker = chapter-marker;
     isExecutable = false;
     src = ./full.cfg;
   };
diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index 86b401cfa..bbf15e603 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -303,16 +303,6 @@ globalkeys = awful.util.table.join(
     awful.key({ modkey,           }, "Right",  awful.tag.viewnext       ),
     awful.key({ modkey,           }, "Escape", awful.tag.history.restore),
 
-    awful.key({ modkey,           }, "j",
-        function ()
-            awful.client.focus.byidx( 1)
-            if client.focus then client.focus:raise() end
-        end),
-    awful.key({ modkey,           }, "k",
-        function ()
-            awful.client.focus.byidx(-1)
-            if client.focus then client.focus:raise() end
-        end),
     awful.key({ modkey,           }, "w", function () mymainmenu:show() end),
 
     -- Layout manipulation
@@ -376,12 +366,6 @@ globalkeys = awful.util.table.join(
     awful.key({ }, "XF86AudioMute", function ()
         awful.util.spawn("@alsaUtils@/bin/amixer -q -D default sset Master toggle", false) end),
 
-    -- chapter-marker
-    awful.key({ "Control" }, "u", function () awful.spawn("@chaptermarker@/bin/chapter-start") end,
-              {description = "start the chapter marker",}),
-    awful.key({ "Control" }, "j", function () awful.spawn("@chaptermarker@/bin/chapter-mark") end,
-              {description = "create a chapter mark",}),
-
     -- Prompt
     awful.key({ modkey },            "r",     function () awful.screen.focused().mypromptbox:run() end,
               {description = "run prompt", group = "launcher"}),
@@ -485,12 +469,13 @@ root.keys(globalkeys)
 
 -- {{{ Rules
 awful.rules.rules = {
-    -- All clients will match this rule.
+--    -- All clients will match this rule.
     { rule = { },
       properties = { border_width = beautiful.border_width,
                      border_color = beautiful.border_normal,
                      focus = awful.client.focus.filter,
                      keys = clientkeys,
+                     screen = awful.screen.focused,
                      buttons = clientbuttons } },
     --{ rule = { class = "MPlayer" },
     --  properties = { floating = true } },