Merge branch 'master' into cla

1 files changed, 35 insertions, 27 deletions

diff --git a/scroll/config b/scroll/config
index 4fd9991..29c8cab 100644
--- a/scroll/config
+++ b/scroll/config
@@ -6,7 +6,10 @@
 #
 # Read `man 5 scroll` for a complete reference.
 
-include ~/.config/scroll/config.d/*
+include /etc/scroll/config.d/*
+
+# This includes config.d/user.conf, which should set the $home variable
+include ~/.config/scroll/config.d/user.conf
 
 ### Variables
 #
@@ -123,6 +126,9 @@ animations {
     # Start your launcher
     bindsym $mod+e exec $rmenu
     bindsym $mod+d exec $dmenu
+
+    # Start restart menu
+    bindsym $mod+r exec rs
     
     # Launch your file manager
     bindsym $mod+Alt+f exec $filemanager
@@ -179,36 +185,38 @@ animations {
     bindsym $mod+Shift+j focus output down
     bindsym $mod+Shift+k focus output up
     bindsym $mod+Shift+l focus output right
-#
-# Workspaces:
-#
-    # Switch to workspace
-    bindsym $mod+1 workspace number 1
-    bindsym $mod+2 workspace number 2
-    bindsym $mod+3 workspace number 3
-    bindsym $mod+4 workspace number 4
-    bindsym $mod+5 workspace number 5
-    bindsym $mod+6 workspace number 6
-    bindsym $mod+7 workspace number 7
-    bindsym $mod+8 workspace number 8
-    bindsym $mod+9 workspace number 9
-    # Move focused container to workspace
-    bindsym $mod+Shift+1 move container to workspace number 1; workspace number 1
-    bindsym $mod+Shift+2 move container to workspace number 2; workspace number 2
-    bindsym $mod+Shift+3 move container to workspace number 3; workspace number 3
-    bindsym $mod+Shift+4 move container to workspace number 4; workspace number 4
-    bindsym $mod+Shift+5 move container to workspace number 5; workspace number 5
-    bindsym $mod+Shift+6 move container to workspace number 6; workspace number 6
-    bindsym $mod+Shift+7 move container to workspace number 7; workspace number 7
-    bindsym $mod+Shift+8 move container to workspace number 8; workspace number 8
-    bindsym $mod+Shift+9 move container to workspace number 9; workspace number 9
-    # Note: workspaces can have any name you want, not just numbers.
-    # We just use 1-10 as the default.
 
+    # Move window to other monitors
     bindsym $mod+Shift+Ctrl+h move container to output left
     bindsym $mod+Shift+Ctrl+j move container to output down
     bindsym $mod+Shift+Ctrl+k move container to output up
     bindsym $mod+Shift+Ctrl+l move container to output right
+##
+## Workspaces:
+## NOW USING SWAYSOME
+##
+#    # Switch to workspace
+#    bindsym $mod+1 workspace number 1
+#    bindsym $mod+2 workspace number 2
+#    bindsym $mod+3 workspace number 3
+#    bindsym $mod+4 workspace number 4
+#    bindsym $mod+5 workspace number 5
+#    bindsym $mod+6 workspace number 6
+#    bindsym $mod+7 workspace number 7
+#    bindsym $mod+8 workspace number 8
+#    bindsym $mod+9 workspace number 9
+#    # Move focused container to workspace
+#    bindsym $mod+Shift+1 move container to workspace number 1; workspace number 1
+#    bindsym $mod+Shift+2 move container to workspace number 2; workspace number 2
+#    bindsym $mod+Shift+3 move container to workspace number 3; workspace number 3
+#    bindsym $mod+Shift+4 move container to workspace number 4; workspace number 4
+#    bindsym $mod+Shift+5 move container to workspace number 5; workspace number 5
+#    bindsym $mod+Shift+6 move container to workspace number 6; workspace number 6
+#    bindsym $mod+Shift+7 move container to workspace number 7; workspace number 7
+#    bindsym $mod+Shift+8 move container to workspace number 8; workspace number 8
+#    bindsym $mod+Shift+9 move container to workspace number 9; workspace number 9
+#    # Note: workspaces can have any name you want, not just numbers.
+#    # We just use 1-10 as the default.
 
 # Scaling
     # Workspace
@@ -579,4 +587,4 @@ bar {
     #}
 }
 #
-include /etc/scroll/config.d/*
+include ~/.config/scroll/config.d/*