X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/8cf8042cb57edbb51072a37cbcaaf455a902b9b4..8b4070b51e98191e73b51fc28c42b8a10e0d92dc:/awesome/bindings.lua

diff --git a/awesome/bindings.lua b/awesome/bindings.lua
index 6a72d0b..fd2246e 100644
--- a/awesome/bindings.lua
+++ b/awesome/bindings.lua
@@ -5,7 +5,7 @@
 -- However, you can use another modifier like Mod1, but it may interact with others.
 modkey = "Mod4"
 
--- {{{ Mouse bindings
+-- {{{1 Mouse bindings
 root.buttons(awful.util.table.join(
     awful.button({ }, 3, function () mymainmenu:toggle() end),
     awful.button({ }, 4, awful.tag.viewnext),
@@ -16,14 +16,12 @@ clientbuttons = awful.util.table.join(
     awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
     awful.button({ modkey }, 1, awful.mouse.client.move),
     awful.button({ modkey }, 3, awful.mouse.client.resize))
--- }}}
 
--- {{{ Global Keys
-globalkeys = awful.util.table.join(
-    -- {{{ Awesome Keys
+-- {{{1 Global Keys
+globalkeys = awful.util.table.join(globalkeys,
+    -- {{{2 Awesome Keys
     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,           }, "j",
         function ()
@@ -51,10 +49,9 @@ globalkeys = awful.util.table.join(
     -- Standard program
     awful.key({ modkey,           }, "Return", function () awful.util.spawn(terminal) end),
     awful.key({ modkey, "Control" }, "r", awesome.restart),
-    awful.key({ modkey, "Shift"   }, "q", awesome.quit),
 
-    awful.key({ modkey,           }, "l",     function () awful.tag.incmwfact( 0.05)    end),
     awful.key({ modkey,           }, "h",     function () awful.tag.incmwfact(-0.05)    end),
+    awful.key({ modkey,           }, "l",     function () awful.tag.incmwfact( 0.05)    end),
     awful.key({ modkey, "Shift"   }, "h",     function () awful.tag.incnmaster( 1)      end),
     awful.key({ modkey, "Shift"   }, "l",     function () awful.tag.incnmaster(-1)      end),
     awful.key({ modkey, "Control" }, "h",     function () awful.tag.incncol( 1)         end),
@@ -71,13 +68,10 @@ globalkeys = awful.util.table.join(
               end),
     -- Menubar
     awful.key({ modkey }, "p", function() menubar.show() end),
-    -- }}}
 
-    -- {{{ My Keys
+    -- {{{2 My Keys
     -- Menu
     awful.key({ modkey }, "w", function () mymainmenu:show({ coords = { x = 0, y = 0}}) end),
-    -- Lock
-    awful.key({ modkey, "Control" }, "l", function () awful.util.spawn("i3lock -c 000000") end),
     -- Prompt
     awful.key({ modkey }, "space", function () mypromptbox[mouse.screen]:run() end),
     -- switch layout
@@ -90,26 +84,19 @@ globalkeys = awful.util.table.join(
     awful.key({        }, "F13",   function () awful.util.spawn("ksnapshot") end),
     awful.key({        }, "Print", function () awful.util.spawn("ksnapshot") end),
     -- Layout manipulation
-    awful.key({ modkey,           }, "#94",   function () awful.screen.focus_relative( 1) end), -- that's the key left of 1
-    awful.key({ modkey, "Control" }, "Left",  function () awful.screen.focus_relative( 1) end),
-    awful.key({ modkey, "Control" }, "Right", function () awful.screen.focus_relative(-1) end),
+    awful.key({ modkey,           }, "Escape", awful.tag.history.restore),
+    awful.key({ modkey,           }, "#94",    function () awful.screen.focus_relative( 1) end), -- that's the key left of 1
+    awful.key({ modkey, "Control" }, "Left",   function () awful.screen.focus_relative( 1) end),
+    awful.key({ modkey, "Control" }, "Right",  function () awful.screen.focus_relative(-1) end),
     -- Volume
     awful.key({ }, "XF86AudioRaiseVolume",  function () awful.util.spawn("ponymix increase 5") end),
     awful.key({ }, "XF86AudioLowerVolume",  function () awful.util.spawn("ponymix decrease 5") end),
-    awful.key({ }, "XF86AudioMute",         function () awful.util.spawn("ponymix toggle")     end),
-    -- Clementine
-    awful.key({ }, "XF86AudioPlay",         function () awful.util.spawn("clementine -t")     end),
-    awful.key({ }, "XF86AudioNext",         function () awful.util.spawn("clementine -f")     end),
-    awful.key({ }, "XF86AudioPrev",         function () awful.util.spawn("clementine -r")     end),
-    awful.key({ "Shift" }, "XF86AudioRaiseVolume",  function () awful.util.spawn("clementine --volume-increase-by 5") end),
-    awful.key({ "Shift" }, "XF86AudioLowerVolume",  function () awful.util.spawn("clementine --volume-decrease-by 5") end)
-    -- }}}
+    awful.key({ }, "XF86AudioMute",         function () awful.util.spawn("ponymix toggle")     end)
 )
--- }}}
 
--- {{{ Client keys
+-- {{{1 Client keys
 clientkeys = awful.util.table.join(
-    -- {{{ Awesome Client Keys
+    -- {{{2 Awesome Client Keys
     awful.key({ modkey,           }, "f",      function (c) c.fullscreen = not c.fullscreen  end),
     awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end),
     awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ),
@@ -125,9 +112,8 @@ clientkeys = awful.util.table.join(
             c.maximized_horizontal = not c.maximized_horizontal
             c.maximized_vertical   = not c.maximized_vertical
         end),
-    -- }}}
 
-    -- {{{ My Client Keys
+    -- {{{2 My Client Keys
     -- Move client to screen
     awful.key({ modkey, "Shift" }, "#94",      awful.client.movetoscreen ),
     -- ontop and below
@@ -135,8 +121,8 @@ clientkeys = awful.util.table.join(
     awful.key({ modkey,           }, "b",      function (c) c.below = not c.below            end)
     -- }}}
 )
--- }}}
 
+-- {{{1 Tags
 -- Bind all key numbers to tags.
 -- Be careful: we use keycodes to make it works on any keyboard layout.
 -- This should map on the top row of your keyboard, usually 1 to 9.
@@ -173,5 +159,3 @@ for i = 1, 9 do
                       end
                   end))
 end
-
--- }}}