diff --git a/nixos/users/tdpeuter/dotfiles.nix b/nixos/users/tdpeuter/dotfiles.nix index 57d5e16..aca5ba8 100644 --- a/nixos/users/tdpeuter/dotfiles.nix +++ b/nixos/users/tdpeuter/dotfiles.nix @@ -37,12 +37,6 @@ in { recursive = true; source = ../../../stow/hyprland/.config/hypr; }; - ".config/hypr/hy3-plugin.conf" = { - inherit (config.sisyphus.desktop.hyprland) enable; - text = '' - plugin = ${pkgs.hyprlandPlugins.hy3}/lib/libhy3.so - ''; - }; ".config/kitty" = { enable = false; recursive = true; diff --git a/stow/hyprland/.config/hypr/hy3.conf b/stow/hyprland/.config/hypr/hy3.conf index 6cd7c06..7d3e999 100644 --- a/stow/hyprland/.config/hypr/hy3.conf +++ b/stow/hyprland/.config/hypr/hy3.conf @@ -1,9 +1,6 @@ -# -# ~/.config/hypr/hy3.conf -# -# Load the plugin. File should contain `plugin = /path/to/lib/libhy3.so` -source = /home/tdpeuter/.config/hypr/hy3-plugin.conf +# TODO Do not hardcode this path +plugin = /nix/store/afivj8v5kfdsadxs4pa45vh0y65s3ajm-hy3-hl0.49.0/lib/libhy3.so general:layout = hy3 diff --git a/stow/hyprland/.config/hypr/hyprland.conf b/stow/hyprland/.config/hypr/hyprland.conf index 1ccbc2e..6dc3b6b 100644 --- a/stow/hyprland/.config/hypr/hyprland.conf +++ b/stow/hyprland/.config/hypr/hyprland.conf @@ -85,6 +85,9 @@ animations { } gestures { + workspace_swipe = true + workspace_swipe_fingers = 3 + workspace_swipe_min_fingers = false workspace_swipe_distance = 300 workspace_swipe_invert = true workspace_swipe_min_speed_to_force = 30 @@ -100,12 +103,6 @@ gestures { workspace_swipe_forever = true workspace_swipe_use_r = false - - # hyprlang if !HYPRLAND_V_0_53 - workspace_swipe = true - workspace_swipe_fingers = 3 - workspace_swipe_min_fingers = false - # hyprlang endif } group { @@ -261,10 +258,6 @@ env = XCURSOR_SIZE,24 # SHIFT CAPS CTRL/CONTROL ALT MOD2 MOD3 SUPER/WIN/LOGO/MOD4 MOD5 $flag = MOD4 -$LMB = mouse:272 -$RMB = mouse:273 -$MMB = mouse:274 - $left = h $down = j $up = k diff --git a/stow/hyprland/.config/hypr/keybinds.conf b/stow/hyprland/.config/hypr/keybinds.conf index f628da6..1a4f1e1 100644 --- a/stow/hyprland/.config/hypr/keybinds.conf +++ b/stow/hyprland/.config/hypr/keybinds.conf @@ -56,10 +56,6 @@ bind = $flag+Shift, s, settiled bind = $flag, F11, fullscreen, 1 bind = $flag+Shift, F11, fullscreen, 0 -bindm = $flag, $LMB, movewindow -bindm = $flag, $RMB, resizewindow -bindc = $flag, $LMB, togglefloating - # Workspaces $ws1 = 1 diff --git a/stow/hyprland/.config/hypr/modes.conf b/stow/hyprland/.config/hypr/modes.conf index 4e11c56..61bbbf0 100644 --- a/stow/hyprland/.config/hypr/modes.conf +++ b/stow/hyprland/.config/hypr/modes.conf @@ -1,62 +1,3 @@ -# Resizing -$mode_resize = Resize -bind = $flag, R, submap, $mode_resize -submap = $mode_resize - -bind = , F, togglefloating - -binde = , $right, resizeactive, 10 0 -binde = , $up, resizeactive, 0 -10 -binde = , $left, resizeactive, -10 0 -binde = , $down, resizeactive, 0 10 - -binde = , Right , resizeactive, 10 0 -binde = , Up, resizeactive, 0 -10 -binde = , Left, resizeactive, -10 0 -binde = , Down, resizeactive, 0 10 - -binde = Shift, $right, resizeactive, 50 0 -binde = Shift, $up, resizeactive, 0 -50 -binde = Shift, $left, resizeactive, -50 0 -binde = Shift, $down, resizeactive, 0 50 - -binde = Shift, Right, resizeactive, 50 0 -binde = Shift, Up, resizeactive, 0 -50 -binde = Shift, Left, resizeactive, -50 0 -binde = Shift, Down, resizeactive, 0 50 - -binde = $flag, $right, moveactive, 10 0 -binde = $flag, $up, moveactive, 0 -10 -binde = $flag, $left, moveactive, -10 0 -binde = $flag, $down, moveactive, 0 10 - -binde = $flag, Right, moveactive, 10 0 -binde = $flag, Up, moveactive, 0 -10 -binde = $flag, Left, moveactive, -10 0 -binde = $flag, Down, moveactive, 0 10 - -binde = $flag+Shift, $right, moveactive, 50 0 -binde = $flag+Shift, $up, moveactive, 0 -50 -binde = $flag+Shift, $left, moveactive, -50 0 -binde = $flag+Shift, $down, moveactive, 0 50 - -binde = $flag+Shift, Right , moveactive, 50 0 -binde = $flag+Shift, Up, moveactive, 0 -50 -binde = $flag+Shift, Left, moveactive, -50 0 -binde = $flag+Shift, Down, moveactive, 0 50 - - -# hyprlang if HYPRLAND_V_0_53 -#gesture = 3, swipe, move -#gesture = 4, swipe, resize -# hyprlang endif - -bind = $flag, R, submap, reset -bind = , Escape, submap, reset -bind = , Return, submap, reset - -submap = reset - # System actions $mode_system = System (l)ock, (s)leep, (h)ibernate, (r)eboot, (Shift+s)hutdown bind = Ctrl+Alt, Delete, submap, $mode_system @@ -95,11 +36,3 @@ bind = , Return, submap, reset submap = reset -# Ignore (all) keybinds. Useful when working with Virtual Machines. -$mode_ignore=Ignore keybinds - Press Control+Alt+Insert to escape. -bind = Ctrl+Alt, Insert, submap, $mode_ignore -submap = $mode_ignore - -bind = Ctrl+Alt, Insert, submap, reset - -submap = reset