Merge remote-tracking branch 'gum/master' into HEAD

1 files changed, 17 insertions, 4 deletions

diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index d96b61ad6..86b401cfa 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -376,6 +376,12 @@ 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"}),
@@ -492,9 +498,16 @@ awful.rules.rules = {
       properties = { floating = true } },
     --{ rule = { class = "gimp" },
     --  properties = { floating = true } },
-    -- Set Firefox to always map on tags number 2 of screen 1.
-    -- { rule = { class = "Firefox" },
-    --   properties = { tag = tags[1][2] } },
+    { rule = { class = "Firefox" },
+       properties = { tag = tags[3] } },
+    { rule = { class = "signal-desktop" },
+       properties = { tag = tags[4] } },
+    { rule = { class = "telegram-desktop" },
+       properties = { tag = tags[4] } },
+    { rule = { class = "mutt" },
+       properties = { tag = tags[5] } },
+    { rule = { class = "mosh" },
+       properties = { tag = tags[2] } },
 }
 -- }}}
 
@@ -569,7 +582,7 @@ local os = {
 
 -- {{{ autostart
 do
-  awful.spawn("urxvt", { tag = tags[1] }) -- dev shell
+  -- awful.spawn("urxvt", { tag = tags[1] }) -- dev shell
   awful.spawn("urxvt -e mosh makefu@gum.i", { tag = tags[2] })
   awful.spawn("firefox", { tag = tags[3] })
   awful.spawn("telegram-desktop", { tag = tags[4] })