diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | hypr/hyprland.conf | 29 | ||||
| -rw-r--r-- | scroll/config | 34 | ||||
| -rw-r--r-- | scroll/scripts/maximize.lua | 42 | ||||
| -rw-r--r-- | waybar/config | 6 |
6 files changed, 84 insertions, 38 deletions
@@ -237,7 +237,7 @@ RVXX EXEX.settings RVXX v2/ RVXX v2.settings SchildiChat/ -scroll/user.conf +scroll/config.d/user.conf Serenity/ Session/ Shibalba EXEX.settings @@ -29,14 +29,11 @@ install-hyprland-plugins: @hyprpm enable hyprscrolling @echo "Done." -install-scrollconf: scroll/user.conf - @echo "Installing user.conf..." - @sudo ln -sf `pwd`/scroll/user.conf /etc/scroll/config.d/user.conf - @echo "Done." +install-scrollconf: scroll/config.d/user.conf -scroll/user.conf: +scroll/config.d/user.conf: @echo "Generating user.conf..." - @echo 'set $$home' $(shell echo $(HOME)) > scroll/user.conf + @echo 'set $$home' $(shell echo $(HOME)) > scroll/config.d/user.conf @echo "Done." install-bashconfigs: $(BCONFS) install-shconfigs diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index bfaa36c..c72fec4 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -139,7 +139,7 @@ decoration { #{{{ Animations options animations { - enabled = no + enabled = yes # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more bezier = myBezier, 0.05, 0.9, 0.1, 1.05 animation = windows, 1, 7, myBezier @@ -175,16 +175,6 @@ master { } #}}} -#{{{ Hyprscrolling layout options -plugin:hyprscrolling { - fullscreen_on_one_column = true - column_width = 0.5 - explicit_column_widths = 0.333, 0.5, 0.667, 1.0 - focus_fit_method = 1 - follow_focus = true -} -#}}} - #{{{ Gestures options gestures { # See https://wiki.hyprland.org/Configuring/Variables/ for more @@ -198,6 +188,14 @@ plugin { num_workspaces = 9 persistent_workspaces = true } + + hyprscrolling { + fullscreen_on_one_column = true + column_width = 0.5 + explicit_column_widths = 0.333, 0.5, 0.667, 1.0 + focus_fit_method = 1 + follow_focus = true + } } #}}} @@ -225,6 +223,7 @@ windowrule = tile, class:^(REAPER)$, title:^(.*REAPER v[0-9.]* - Licensed for pe windowrule = tile, class:^(WebApp-Qobuz[0-9]*)$ windowrule = float, title:^(menu)$ windowrule = move cursor -50% -50%, class:^(yabridge-host.exe.so)$, title:^(menu)$ +windowrulev2 = workspace special:easyeffects silent, class: ^(com\.github\.wwmm\.easyeffects)$ #}}} #{{{ Mods @@ -257,12 +256,12 @@ $secdMod = ALT # hyprscrolling layout binds #bind = $mainMod+SHIFT, H, layoutmsg, move -1 #HYPRSCROLLING #bind = $mainMod+SHIFT, L, layoutmsg, move +1 #HYPRSCROLLING -bind = $mainMod+ALT, H, layoutmsg, movewindowto l #HYPRSCROLLING -bind = $mainMod+ALT, L, layoutmsg, movewindowto r #HYPRSCROLLING -bind = $mainMod+SHIFT, H, movewindow, l #HYPRSCROLLING +bind = $mainMod+CTRL, H, layoutmsg, movewindowto l #HYPRSCROLLING +bind = $mainMod+CTRL, 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, J, movewindow, d #HYPRSCROLLING +#bind = $mainMod+SHIFT, J, movewindow, d #HYPRSCROLLING bind = $mainMod, H, layoutmsg, focus l #HYPRSCROLLING bind = $mainMod, J, layoutmsg, focus d #HYPRSCROLLING bind = $mainMod, K, layoutmsg, focus u #HYPRSCROLLING diff --git a/scroll/config b/scroll/config index 34eaaee..c115cd9 100644 --- a/scroll/config +++ b/scroll/config @@ -6,7 +6,7 @@ # # Read `man 5 scroll` for a complete reference. -include /etc/scroll/config.d/* +include ~/.config/scroll/config.d/* ### Variables # @@ -43,6 +43,10 @@ exec hyprpaper # # You can get the names of your outputs by running: scrollmsg -t get_outputs +#output eDP-1 resolution 1920x1080 position 0 0 +#output HDMI-A-1 resolution 1920x1080 position 1920 0 +#output DP-2 resolution 1920x1080 position 0 0 + ### Idle configuration # # Example configuration: @@ -78,9 +82,9 @@ exec hyprpaper default_border pixel 2 gaps inner 4 gaps outer 20 -client.focused #15439e #000000 #e0e0e0 #2e9ef4 #15439e -client.focused_inactive #595959 #000000 #e0e0e0 #2e9ef4 #595959 -client.unfocused #595959 #000000 #e0e0e0 #2e9ef4 #595959 +client.focused #198844 #000000 #e0e0e0 #198844 #198844 +client.focused_inactive #1b1d1c #000000 #e0e0e0 #1b1d1c #1b1d1c +client.unfocused #1b1d1c #000000 #e0e0e0 #1b1d1c #1b1d1c # Idle inhibit for fullscreen windows for_window [all] inhibit_idle fullscreen @@ -93,15 +97,15 @@ layout_heights [0.33333333 0.5 0.666666667 1.0] fullscreen_movefocus true -mouse_warping container +mouse_warping none # Animations animations { enabled yes - default yes 300 var 3 [ 0.215 0.61 0.355 1 ] - window_open yes 300 var 3 [ 0 0 1 1 ] - window_move yes 300 var 3 [ 0.215 0.61 0.355 1 ] off 0.05 6 [0 0.6 0.4 0 1 0 0.4 -0.6 1 -0.6] - window_size yes 300 var 3 [ -0.35 0 0 0.5 ] + default yes 100 var 3 [ 0.215 0.61 0.355 1 ] + window_open yes 100 var 3 [ 0 0 1 1 ] + window_move yes 100 var 3 [ 0.215 0.61 0.355 1 ] off 0.05 6 [0 0.6 0.4 0 1 0 0.4 -0.6 1 -0.6] + window_size yes 100 var 3 [ -0.35 0 0 0.5 ] } ### Key bindings @@ -184,7 +188,6 @@ animations { bindsym $mod+7 workspace number 7 bindsym $mod+8 workspace number 8 bindsym $mod+9 workspace number 9 - bindsym $mod+0 workspace number 10 # 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 @@ -195,12 +198,13 @@ animations { 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 - bindsym $mod+Shift+0 move container to workspace number 10; workspace number 10 # Note: workspaces can have any name you want, not just numbers. # We just use 1-10 as the default. - bindsym $mod+Ctrl+1 move workspace to output left - bindsym $mod+Ctrl+2 move workspace to output right + 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 # Scaling # Workspace @@ -240,6 +244,9 @@ animations { bindsym $mod+Shift+f fullscreen_application toggle bindsym $mod+Ctrl+Alt+f fullscreen_application reset + # Maximize, not fullscreen + bindsym $mod+m lua $scripts/maximize.lua toggle + # Toggle the current focus between tiling and floating mode bindsym $mod+y focus mode_toggle # Toggle layout type (h<->v) @@ -568,3 +575,4 @@ bar { #} } # +include /etc/scroll/config.d/* diff --git a/scroll/scripts/maximize.lua b/scroll/scripts/maximize.lua new file mode 100644 index 0000000..f0df156 --- /dev/null +++ b/scroll/scripts/maximize.lua @@ -0,0 +1,42 @@ +local args, state = ... + +-- Set up views table +local views = scroll.state_get_value(state, "views") +if views == nil then + scroll.state_set_value(state, "views", {}) + views = scroll.state_get_value(state, "views") +end + +local function find_view(view) + for _, v in ipairs(views) do + if v["object"] == view then + return v + end + end + return nil +end + +if args[1] == 'toggle' then + local focused_view = scroll.focused_view() + local view = find_view(focused_view) + if view == nil then + view = { + object = focused_view, + maximized = false, + wf = 0, + hf = 0 + } + table.insert(views, view) + end + view["maximized"] = not view["maximized"] + if view["maximized"] then + local container = scroll.view_get_container(focused_view) + view["wf"] = scroll.container_get_width_fraction(container) + view["hf"] = scroll.container_get_height_fraction(container) + scroll.command(nil, "set_size h 1.0") + scroll.command(nil, "set_size v 1.0") + else + scroll.command(nil, "set_size h " .. view["wf"]) + scroll.command(nil, "set_size v " .. view["hf"]) + end +end diff --git a/waybar/config b/waybar/config index db34678..0b50c66 100644 --- a/waybar/config +++ b/waybar/config @@ -62,8 +62,8 @@ "persistent-workspaces": { "eDP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], }, - "on-scroll-up": "hyprctl dispatch split-workspace e+1", - "on-scroll-down": "hyprctl dispatch split-workspace e-1", + "on-scroll-up": "hyprctl dispatch split:workspace r+1", + "on-scroll-down": "hyprctl dispatch split:workspace r-1", "on-click": "activate" }, "sway/window": { @@ -82,7 +82,7 @@ "separate-outputs": true, "icon": true, "format": "{title}", - "espand": true, + "expand": true, }, "keyboard-state": { "numlock": true, |