diff --git a/machines/myork/default.nix b/machines/myork/default.nix index 6a5c3fa..0acc98f 100644 --- a/machines/myork/default.nix +++ b/machines/myork/default.nix @@ -36,7 +36,7 @@ in { master = { mfact = mkForce 0.5; - orientation = mkForce "top"; + orientation = mkForce "left"; always_center_master = mkForce false; }; diff --git a/options/custom/desktops/hyprland/binds.nix b/options/custom/desktops/hyprland/binds.nix index 7b6e397..db64a60 100644 --- a/options/custom/desktops/hyprland/binds.nix +++ b/options/custom/desktops/hyprland/binds.nix @@ -107,9 +107,8 @@ in { bindr = [ (key "Alt_L" "Super+Alt" "togglespecialworkspace" "wallpaper") (key "Alt_L" "Super+Alt+Shift" "movetoworkspacesilent" "special:wallpaper") - (key "Control_L" "Super+Ctrl" "layoutmsg" "swapwithmaster master") - (key "Control_L" "Super+Ctrl+Alt+Shift" "layoutmsg" "removemaster") - (key "Control_L" "Super+Ctrl+Shift" "layoutmsg" "addmaster") + (key "Control_L" "Super+Ctrl" "layoutmsg" "swapnext") + (key "Control_L" "Super+Ctrl+Shift" "layoutmsg" "swapprev") (key "Shift_L" "Super+Shift" "workspace" "previous") (key "Super_L" "Super" "exec" "${menu}") (key "Super_L" "Super+Alt" "exec" "${menu} --passwords") @@ -120,19 +119,19 @@ in { # Regular binds bind = [ - (key "mouse:274" "Super" "layoutmsg" "swapwithmaster master") + (key "mouse:274" "Super" "layoutmsg" "swapwithmaster auto") (key "mouse:274" "Super+Shift" "layoutmsg" "addmaster") (key "mouse:274" "Super+Ctrl+Shift" "layoutmsg" "removemaster") - (key "Backslash" "Super" "layoutmsg" "orientationcenter") + (key "Backslash" "Super" "layoutmsg" "orientationcycle center left") (key "Backslash" "Super+Shift" "splitratio" "exact 0.5") # Reset layout ratio (key "Backspace" "Super" "changegroupactive" "f") (key "Backspace" "Super+Ctrl" "togglegroup" null) (key "Backspace" "Super+Ctrl+Shift" "lockactivegroup" "toggle") (key "Backspace" "Super+Shift" "movegroupwindow" null) - (key "Bracketleft" "Super" "layoutmsg" "orientationprev") + (key "Bracketleft" "Super" "layoutmsg" "rollnext") (key "Bracketleft" "Super+Shift" "splitratio" "-0.1") - (key "Bracketright" "Super" "layoutmsg" "orientationnext") + (key "Bracketright" "Super" "layoutmsg" "rollprev") (key "Bracketright" "Super+Shift" "splitratio" "+0.1") (key "Delete" "Super" "exec" "${swayosd-client} --output-volume mute-toggle") (key "Down" "Super" "movewindow" "d") @@ -185,7 +184,7 @@ in { "'^Picture.in.[Pp]icture$'" "${toString (gap + border)},${toString (gap + border)}" ])) - (key "Tab" "Super" "cyclenext" "tiled") + (key "Tab" "Super" "layoutmsg" "cyclenext") (key "Tab" "Super+Shift" "alterzorder" "top") (key "Tab" "Super+Shift" "cyclenext" "floating") (key "Up" "Super" "movewindow" "u") diff --git a/options/custom/desktops/hyprland/settings.nix b/options/custom/desktops/hyprland/settings.nix index 1b091af..748cffa 100644 --- a/options/custom/desktops/hyprland/settings.nix +++ b/options/custom/desktops/hyprland/settings.nix @@ -81,7 +81,15 @@ in { force_zero_scaling = true; }; - # https://wiki.hyprland.org/Configuring/Master-Layout + # https://wiki.hyprland.org/Configuring/Dwindle-Layout/ + dwindle = { + default_split_ratio = 1.25; + force_split = 2; # Right + split_bias = 1; # Larger active window + split_width_multiplier = 1.5; + }; + + # https://wiki.hyprland.org/Configuring/Master-Layout/ # Optimized for ultrawide use by default master = { allow_small_split = true; @@ -131,6 +139,7 @@ in { "col.border_inactive" = "rgba(6c71c440)"; "col.border_locked_active" = "rgb(d33682)"; "col.border_locked_inactive" = "rgba(d3368240)"; + auto_group = false; insert_after_current = false; # https://wiki.hyprland.org/Configuring/Variables/#groupbar @@ -178,14 +187,14 @@ in { input = { accel_profile = "flat"; float_switch_override_focus = 0; # Disable float to tile hover focus - focus_on_close = 1; # Focus window under mouse + #// focus_on_close = 1; # Focus window under mouse follow_mouse = 1; # Hover focus mouse_refocus = false; # Required to focus last window on close repeat_delay = 300; repeat_rate = 40; sensitivity = 0.5; #// scroll_factor = 0.75; - special_fallthrough = true; # Alternative to toggle script + special_fallthrough = true; # Focus windows under special workspace touchpad = { clickfinger_behavior = true; # Multi-finger clicks @@ -197,7 +206,7 @@ in { # https://wiki.hyprland.org/Configuring/Variables/#cursor cursor = { hide_on_key_press = true; - hotspot_padding = config.custom.gap; + #// hotspot_padding = config.custom.gap; #// min_refresh_rate = 60; # !! Hardware dependent #// no_break_fs_vrr = true; #// no_hardware_cursors = true;