diff --git a/modules/wms/wayland/hyprland/binds.nix b/modules/wms/wayland/hyprland/binds.nix index 5c99d3a..2547eee 100644 --- a/modules/wms/wayland/hyprland/binds.nix +++ b/modules/wms/wayland/hyprland/binds.nix @@ -34,26 +34,6 @@ in { "$mainMod, D, exec, ${pkgs.procps}/bin/pkill fuzzel || ${pkgs.fuzzel}/bin/fuzzel" "$mainMod, SPACE, togglefloating, active" - # Move Windows - "$mainMod SHIFT, H, hy3:movewindow, l" - "$mainMod SHIFT, J, hy3:movewindow, d" - "$mainMod SHIFT, K, hy3:movewindow, u" - "$mainMod SHIFT, L, hy3:movewindow, r" - - "$mainMod CTRL, H, movewindow, mon:l" - "$mainMod CTRL, J, movefocus, r" - "$mainMod CTRL, K, movefocus, l" - "$mainMod CTRL, L, movewindow, mon:r" - - # Hy3 fun - "$mainMod, C, hy3:makegroup, h" - "$mainMod, Y, hy3:makegroup, v" - "$mainMod, B, hy3:makegroup, tab" - - - "$mainMod, A, hy3:movefocus, raise" - "$mainMod SHIFT, A, hy3:movefocus, lower" - # Screenshotting "$mainMod, S, exec, ${pkgs.grimblast}/bin/grimblast copy area" # only copy "$mainMod SHIFT, S, exec, ${pkgs.grimblast}/bin/grimblast save area - | ${pkgs.satty}/bin/satty -f -" # edit with satty @@ -75,10 +55,16 @@ in { binde = [ # window focus - "$mainMod, H, hy3:movefocus, l" - "$mainMod, J, hy3:movefocus, d" - "$mainMod, K, hy3:movefocus, u" - "$mainMod, L, hy3:movefocus, r" + "$mainMod, H, movefocus, l" + "$mainMod, J, movefocus, d" + "$mainMod, K, movefocus, u" + "$mainMod, L, movefocus, r" + + # Move Windows + "$mainMod SHIFT, H, movewindow, l" + "$mainMod SHIFT, J, movewindow, d" + "$mainMod SHIFT, K, movewindow, u" + "$mainMod SHIFT, L, movewindow, r" ]; # Media controls @@ -115,10 +101,6 @@ in { "$mainMod, mouse:272, movewindow" "$mainMod, mouse:273, resizewindow" ]; - bindn = [ - ", mouse_down, hy3:focustab, l, require_hovered" - ", mouse_up, hy3:focustab, r, require_hovered" - ]; # Some more movement-related settings binds = { diff --git a/modules/wms/wayland/hyprland/module.nix b/modules/wms/wayland/hyprland/module.nix index 52787c2..c4d0589 100644 --- a/modules/wms/wayland/hyprland/module.nix +++ b/modules/wms/wayland/hyprland/module.nix @@ -7,12 +7,7 @@ }: let cfg = config.modules.usrEnv.desktops.hyprland; inherit (config.meta.mainUser) username; - inherit - (inputs'.split-monitor-workspaces.packages) - split-monitor-workspaces - ; inherit (inputs'.hyprsplit.packages) hyprsplit; - inherit (inputs'.hy3.packages) hy3; inherit (lib) mkIf mkDefault; in { imports = [ @@ -52,7 +47,6 @@ in { # Split-monitor-workspaces provides awesome-like workspace behaviour plugins = [ - hy3 hyprsplit ]; diff --git a/modules/wms/wayland/hyprland/settings.nix b/modules/wms/wayland/hyprland/settings.nix index 1a9f258..a17eaa2 100644 --- a/modules/wms/wayland/hyprland/settings.nix +++ b/modules/wms/wayland/hyprland/settings.nix @@ -47,7 +47,7 @@ in { }; general = { - layout = "hy3"; + layout = "dwindle"; gaps_in = 0; gaps_out = 0; border_size = 2; @@ -57,24 +57,10 @@ in { }; plugin = { - hy3 = { - no_gaps_when_only = 1; - tabs = { - height = 4; - padding = 5; - from_top = true; - render_text = false; - }; - autotile.enable = true; - }; hyprsplit = { num_workspaces = 10; persistent_workspaces = true; }; - split-monitor-workspaces = { - count = 10; - keep_focused = 0; - }; }; }; };