Merge branch 'v017' of josher.dev:rde into v017

1 files changed, 32 insertions, 1 deletions

diff --git a/src/Internal/Keys.hs b/src/Internal/Keys.hs
index bf9b62c..27315cd 100644
--- a/src/Internal/Keys.hs
+++ b/src/Internal/Keys.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE RankNTypes #-}
 module Internal.Keys (applyKeys) where
 
+import Control.Monad.Fix (fix)
 import Graphics.X11.ExtraTypes.XF86;
 import Internal.KeysM
 import Internal.SwapMaster (swapMaster)
@@ -171,7 +172,7 @@ keymap = runKeys $ do
 
   bind xK_minus $ do
     justMod  $ sendMessage (IncMasterN (-1))
-    shiftMod $ withFocused $ sendMessage . expandWindowAlt
+    shiftMod $ withFocused $ sendMessage . shrinkWindowAlt
 
   bind xK_m $ do
     justMod $ subkeys $
@@ -206,6 +207,23 @@ keymap = runKeys $ do
     shiftMod $ withFocused $ windows . W.sink 
     altMod   $ spawn (terminal config ++ " -t Floating\\ Term")
 
+  bind xK_v $
+    -- Allows repeated strokes of M-h and M-l to reduce and increase volume
+    -- respectively.
+    justMod $ fix $ \recur -> subkeys $ do
+      bind xK_h $ do
+        justMod $ do
+           spawn "pactl set-sink-volume @DEFAULT_SINK@ -5%"
+           recur
+
+      bind xK_l $ do
+        justMod $ do
+           spawn "pactl set-sink-volume @DEFAULT_SINK@ +5%"
+           recur
+
+      bind xK_v $ do
+        justMod $ recur
+
   bind xK_w $ do
     justMod windowJump
 
@@ -228,6 +246,9 @@ keymap = runKeys $ do
             str
             (show (map ord str))
 
+      bind xK_n $ do
+        (justMod -|- noMod) $ spawn (terminal config ++ " -t Notes -e notes new")
+
       bind xK_c $ do
         shiftMod CopyWindow.killAllOtherCopies
 
@@ -237,6 +258,16 @@ keymap = runKeys $ do
 
       bind xK_a $
         (justMod -|- noMod) $ spawn "set-sink.sh"
+
+      bind xK_w $
+        (justMod -|- noMod) $ spawn "networkmanager_dmenu"
+
+      bind xK_o $
+        (justMod -|- noMod) $ spawn "library-view.sh"
+
+      bind xK_v $ do
+        (justMod -|- noMod) $ spawn "set-volume.sh"
+        (shiftMod -|- rawMask shiftMask) $ spawn "set-volume.sh -a"
         
 
       -- Double-tap Z to toggle zoom.