diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 3b7fcb1..2fa8861 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -97,14 +97,17 @@ in { mode="$1" case "$mode" in - fullscreen) + screen) mode="output" ;; area) mode="area" ;; + window) + mode="active" + ;; *) - echo "usage: $0 [fullscreen|area]" >&2 + echo "usage: $0 [screen|area|window]" >&2 exit 2 ;; esac @@ -126,11 +129,15 @@ in { ;; esac ''; + pickerScript = pkgs.writeShellScript "color-picker" '' + ${lib.getExe pkgs.zenity} --color-selection --color $(${lib.getExe pkgs.hyprpicker}) + ''; in [ "$mod, Q, killactive, " "$mod, F, togglefloating, " "$mod, P, pseudo, " # dwindle "$mod, J, togglesplit, " # dwindle + "$mod SHIFT, F, fullscreen, " # move focus with mod + arrow keys "$mod, left, movefocus, l" @@ -163,9 +170,14 @@ in { # area ", Print, exec, ${screenshotScript} area" "$mod SHIFT, S, exec, ${screenshotScript} area" - # fullscreen - "CTRL, Print, exec, ${screenshotScript} fullscreen" - "$mod SHIFT CTRL, S, exec, ${screenshotScript} fullscreen" + # screen + "CTRL, Print, exec, ${screenshotScript} screen" + "$mod SHIFT CTRL, S, exec, ${screenshotScript} screen" + # window + "ALT, Print, exec, ${screenshotScript} window" + "$mod SHIFT ALT, S, exec, ${screenshotScript} window" + # pick color + "$mod SHIFT, C, exec, ${pickerScript}" ", XF86LaunchA, exec, ${screenshotScript} area" ", XF86LaunchB, exec, ${lib.getExe pkgs.rofi-rbw-wayland} -a copy -t password --clear-after 20" @@ -348,14 +360,10 @@ in { }; dwindle = { - pseudotile = "yes"; # master swtich for pseudotiling. enabling is mod + P in the keybinds section + pseudotile = "yes"; # master switch for pseudotiling. enabling is mod + P in the keybinds section preserve_split = "yes"; }; - master = { - new_status = "master"; - }; - gestures = { workspace_swipe = true; workspace_swipe_min_speed_to_force = 0;