Merge branch 'master' into next

[i3/i3] / i3.config

diff --git a/i3.config b/i3.config
index ff6c9dbe8282f02759cf9d79a9026005cdb102bc..de7e1fec5ae1c3cc603fcac8925824a1a35d17f4 100644 (file)
--- a/i3.config
+++ b/i3.config
@@ -84,6 +84,13 @@ bindsym Mod1+a focus parent
 # focus the child container
 #bindsym Mod1+d focus child
 
+# move the currently focused window to the scratchpad
+bindsym Mod1+Shift+minus move scratchpad
+
+# Show the next scratchpad window or hide the focused scratchpad window.
+# If there are multiple scratchpad windows, this command cycles through them.
+bindsym Mod1+minus scratchpad show
+
 # switch to workspace
 bindsym Mod1+1 workspace 1
 bindsym Mod1+2 workspace 2