diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | hypr/hyprland.conf | 29 | ||||
| -rw-r--r-- | scroll/config | 17 | ||||
| -rw-r--r-- | waybar/config | 4 |
5 files changed, 32 insertions, 30 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,12 @@ 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 + @mkdir -p scroll/config.d + @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 90cc7b1..ba1f623 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 + } } #}}} @@ -207,6 +205,7 @@ plugin { # Example windowrule v2 # windowrule = float, class:^(kitty)$, title:^(kitty)$ # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more +windowrulev2 = workspace special:easyeffects silent, class: ^(com\.github\.wwmm\.easyeffects)$ #}}} #{{{ Mods @@ -239,12 +238,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 6655223..e689a61 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 # @@ -97,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 @@ -124,8 +124,12 @@ animations { bindsym $mod+e exec $rmenu bindsym $mod+d exec $dmenu + # Launch your file manager bindsym $mod+Alt+f exec $filemanager + # Lock your screen + bindsym $mod+q exec loginctl lock-session + # Drag floating windows by holding down $mod and left mouse button. # Resize them with right mouse button + $mod. # Despite the name, also works for non-floating windows. @@ -575,3 +579,4 @@ bar { #} } # +include /etc/scroll/config.d/* diff --git a/waybar/config b/waybar/config index 7f07eed..77e7e6d 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": { |