From 3cd69e013903b053395d323d24fd71327a7018d3 Mon Sep 17 00:00:00 2001 From: zachir Date: Sun, 27 Jul 2025 20:24:12 -0500 Subject: Use movewindowto for all directions --- hypr/hyprland.conf | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 059ba5a..68948f5 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -240,11 +240,13 @@ $secdMod = ALT # hyprscrolling layout binds #bind = $mainMod+SHIFT, H, layoutmsg, move -1 #HYPRSCROLLING #bind = $mainMod+SHIFT, L, layoutmsg, move +1 #HYPRSCROLLING -bind = $mainMod+CTRL, H, layoutmsg, movewindowto l #HYPRSCROLLING -bind = $mainMod+CTRL, L, layoutmsg, movewindowto r #HYPRSCROLLING +bind = $mainMod+SHIFT, H, layoutmsg, movewindowto l #HYPRSCROLLING +bind = $mainMod+SHIFT, J, layoutmsg, movewindowto d #HYPRSCROLLING +bind = $mainMod+SHIFT, K, layoutmsg, movewindowto u #HYPRSCROLLING +bind = $mainMod+SHIFT, L, layoutmsg, movewindowto r #HYPRSCROLLING #bind = $mainMod+SHIFT, H, movewindow, l #HYPRSCROLLING -bind = $mainMod+SHIFT, L, movewindow, r #HYPRSCROLLING -bind = $mainMod+SHIFT, K, movewindow, u #HYPRSCROLLING +#bind = $mainMod+SHIFT, L, movewindow, r #HYPRSCROLLING +#bind = $mainMod+SHIFT, K, movewindow, u #HYPRSCROLLING #bind = $mainMod+SHIFT, J, movewindow, d #HYPRSCROLLING bind = $mainMod, H, layoutmsg, focus l #HYPRSCROLLING bind = $mainMod, J, layoutmsg, focus d #HYPRSCROLLING -- cgit v1.2.3 From a0abeab1c719c59f0c97adc3353e832826701938 Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 28 Jul 2025 12:22:27 -0500 Subject: Use swaysome for more awesome scroll workspaces --- scroll/config | 59 +++++++++++++++++++----------------- scroll/config.d/swaysome.conf | 69 +++++++++++++++++++++++++++++++++++++++++++ waybar/config | 51 +++++++++++++++++++++++++------- 3 files changed, 142 insertions(+), 37 deletions(-) create mode 100644 scroll/config.d/swaysome.conf diff --git a/scroll/config b/scroll/config index e689a61..8117844 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 # @@ -179,36 +182,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 +584,4 @@ bar { #} } # -include /etc/scroll/config.d/* +include ~/.config/scroll/config.d/* diff --git a/scroll/config.d/swaysome.conf b/scroll/config.d/swaysome.conf new file mode 100644 index 0000000..eebf6a3 --- /dev/null +++ b/scroll/config.d/swaysome.conf @@ -0,0 +1,69 @@ +# vim: ft=swayconfig +# +# Use (un)bindcode or (un)bindsym, depending on what you used in your main sway config file. +# The `--no-warn` setting is only added to shortcuts that exist in the default config. You may want to add or remove +# that flag on some bindings depending on your config. + + +# Change focus between workspaces +bindsym --no-warn $mod+1 exec "swaysome focus 1" +bindsym --no-warn $mod+2 exec "swaysome focus 2" +bindsym --no-warn $mod+3 exec "swaysome focus 3" +bindsym --no-warn $mod+4 exec "swaysome focus 4" +bindsym --no-warn $mod+5 exec "swaysome focus 5" +bindsym --no-warn $mod+6 exec "swaysome focus 6" +bindsym --no-warn $mod+7 exec "swaysome focus 7" +bindsym --no-warn $mod+8 exec "swaysome focus 8" +bindsym --no-warn $mod+9 exec "swaysome focus 9" +#bindsym --no-warn $mod+0 exec "swaysome focus 0" + +# Move containers between workspaces +bindsym --no-warn $mod+Shift+1 exec "swaysome move 1" +bindsym --no-warn $mod+Shift+2 exec "swaysome move 2" +bindsym --no-warn $mod+Shift+3 exec "swaysome move 3" +bindsym --no-warn $mod+Shift+4 exec "swaysome move 4" +bindsym --no-warn $mod+Shift+5 exec "swaysome move 5" +bindsym --no-warn $mod+Shift+6 exec "swaysome move 6" +bindsym --no-warn $mod+Shift+7 exec "swaysome move 7" +bindsym --no-warn $mod+Shift+8 exec "swaysome move 8" +bindsym --no-warn $mod+Shift+9 exec "swaysome move 9" +#bindsym --no-warn $mod+Shift+0 exec "swaysome move 0" + +# Focus workspace groups +bindsym $mod+Alt+1 exec "swaysome focus-group 1" +bindsym $mod+Alt+2 exec "swaysome focus-group 2" +bindsym $mod+Alt+3 exec "swaysome focus-group 3" +bindsym $mod+Alt+4 exec "swaysome focus-group 4" +bindsym $mod+Alt+5 exec "swaysome focus-group 5" +bindsym $mod+Alt+6 exec "swaysome focus-group 6" +bindsym $mod+Alt+7 exec "swaysome focus-group 7" +bindsym $mod+Alt+8 exec "swaysome focus-group 8" +bindsym $mod+Alt+9 exec "swaysome focus-group 9" +#bindsym $mod+Alt+0 exec "swaysome focus-group 0" + +# Move containers to other workspace groups +bindsym $mod+Alt+Shift+1 exec "swaysome move-to-group 1" +bindsym $mod+Alt+Shift+2 exec "swaysome move-to-group 2" +bindsym $mod+Alt+Shift+3 exec "swaysome move-to-group 3" +bindsym $mod+Alt+Shift+4 exec "swaysome move-to-group 4" +bindsym $mod+Alt+Shift+5 exec "swaysome move-to-group 5" +bindsym $mod+Alt+Shift+6 exec "swaysome move-to-group 6" +bindsym $mod+Alt+Shift+7 exec "swaysome move-to-group 7" +bindsym $mod+Alt+Shift+8 exec "swaysome move-to-group 8" +bindsym $mod+Alt+Shift+9 exec "swaysome move-to-group 9" +#bindsym $mod+Alt+Shift+0 exec "swaysome move-to-group 0" + +# Move focused container to next output +bindsym $mod+o exec "swaysome next-output" +# Move focused container to previous output +bindsym $mod+Shift+o exec "swaysome prev-output" + +# Move focused workspace group to next output +bindsym $mod+Alt+o exec "swaysome workspace-group-next-output" +# Move focused workspace group to previous output +bindsym $mod+Alt+Shift+o exec "swaysome workspace-group-prev-output" + +# Init workspaces for every screen +exec "swaysome init 1" + + diff --git a/waybar/config b/waybar/config index 77e7e6d..b480559 100644 --- a/waybar/config +++ b/waybar/config @@ -18,17 +18,48 @@ "sway/workspaces": { "all-outputs": false, "persistent-workspaces": { - "1": ["eDP-1"], - "2": ["eDP-1"], - "3": ["eDP-1"], - "4": ["eDP-1"], - "5": ["eDP-1"], - "6": ["eDP-1"], - "7": ["eDP-1"], - "8": ["eDP-1"], - "9": ["eDP-1"], + "11": ["DP-2"], + "12": ["DP-2"], + "13": ["DP-2"], + "14": ["DP-2"], + "15": ["DP-2"], + "16": ["DP-2"], + "17": ["DP-2"], + "18": ["DP-2"], + "19": ["DP-2"], + }, + "format": "{icon}", + "format-icons": { + "1": "1", + "2": "2", + "3": "3", + "4": "4", + "5": "5", + "6": "6", + "7": "7", + "8": "8", + "9": "9", + "10": "0", + "11": "1", + "12": "2", + "13": "3", + "14": "4", + "15": "5", + "16": "6", + "17": "7", + "18": "8", + "19": "9", + "20": "0", + "21": "1", + "22": "2", + "23": "3", + "24": "4", + "25": "5", + "26": "6", + "27": "7", + "28": "8", + "29": "9", }, - "format": "{value}", }, "niri/workspaces": { "format": "{value}", -- cgit v1.2.3 From 0de3a40a14d40a74947ca84396bf0a5b76152377 Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 28 Jul 2025 12:22:55 -0500 Subject: Add restart script keybind to scroll --- scroll/config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scroll/config b/scroll/config index 8117844..15c9f1d 100644 --- a/scroll/config +++ b/scroll/config @@ -126,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 -- cgit v1.2.3 From 8a2c32014dc380cf9fc92e60c2ebe5f01f2930e3 Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 28 Jul 2025 13:01:03 -0500 Subject: Fix formatting in waybar cnofig --- waybar/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/waybar/config b/waybar/config index b480559..d9fcbda 100644 --- a/waybar/config +++ b/waybar/config @@ -5,7 +5,7 @@ //"output": "%%DISPLAY%%", "spacing": 4, //"margin-top": 5, - //"margin-bottom":5, + //"margin-bottom": 5, // Choose the order of the modules -- cgit v1.2.3 From 8bc4e11ba7d4ad30f09c376e5ba31d5563471cba Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 28 Jul 2025 13:01:17 -0500 Subject: eDP-1 is the only display in master --- waybar/config | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/waybar/config b/waybar/config index d9fcbda..25fb4dc 100644 --- a/waybar/config +++ b/waybar/config @@ -18,15 +18,15 @@ "sway/workspaces": { "all-outputs": false, "persistent-workspaces": { - "11": ["DP-2"], - "12": ["DP-2"], - "13": ["DP-2"], - "14": ["DP-2"], - "15": ["DP-2"], - "16": ["DP-2"], - "17": ["DP-2"], - "18": ["DP-2"], - "19": ["DP-2"], + "11": ["eDP-1"], + "12": ["eDP-1"], + "13": ["eDP-1"], + "14": ["eDP-1"], + "15": ["eDP-1"], + "16": ["eDP-1"], + "17": ["eDP-1"], + "18": ["eDP-1"], + "19": ["eDP-1"], }, "format": "{icon}", "format-icons": { -- cgit v1.2.3 From 15c221f1edd7b623edf4bcfb79ee2e993ca7d04c Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 28 Jul 2025 13:14:20 -0500 Subject: Remove debugging stuff from scratchpad.lua --- scroll/scripts/scratchpad.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/scroll/scripts/scratchpad.lua b/scroll/scripts/scratchpad.lua index 6972843..2235c33 100644 --- a/scroll/scripts/scratchpad.lua +++ b/scroll/scripts/scratchpad.lua @@ -11,7 +11,6 @@ for i, arg in ipairs(args) do terminal = true else command = arg - --terminal = true end elseif (terminal == true) then command = arg @@ -19,7 +18,6 @@ for i, arg in ipairs(args) do end end ---scroll.command(nil, "exec notify-send \"Spawn command\" \"" .. command .. "\"") local function exists(id) local is_in_array = false -- cgit v1.2.3 From 98d4473f1c9783c7bc8f01208f1996b2e40e53ce Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 28 Jul 2025 13:14:42 -0500 Subject: Add fallback to scrathpad.lua so command should always be defind --- scroll/scripts/scratchpad.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scroll/scripts/scratchpad.lua b/scroll/scripts/scratchpad.lua index 2235c33..e581cc1 100644 --- a/scroll/scripts/scratchpad.lua +++ b/scroll/scripts/scratchpad.lua @@ -6,6 +6,9 @@ local command = nil for i, arg in ipairs(args) do if i <= 1 then id = arg + if #args == 1 then + command = arg + end elseif i == 2 then if (arg == "kitty") then terminal = true @@ -18,6 +21,7 @@ for i, arg in ipairs(args) do end end +command = command or "kitty" local function exists(id) local is_in_array = false -- cgit v1.2.3