diff --git a/home/programs/graphical/wms/hyprland/config/keybinds.nix b/home/programs/graphical/wms/hyprland/config/keybinds.nix index af94159..e1f632e 100644 --- a/home/programs/graphical/wms/hyprland/config/keybinds.nix +++ b/home/programs/graphical/wms/hyprland/config/keybinds.nix @@ -24,10 +24,8 @@ in { # "SUPER, W, killactive," "SUPER, F, togglefloating," - "SUPER, Space, fullscreen, 0" # regular fullscreen - "SUPER_SHIFT, Space, fullscreen, 1" # maximize without client fullscreen - "SUPER_CTRL, Space, fullscreenstate, 2, 0" # fullscreen without client knowing - "SUPER_CTRL_SHIFT, Space, fullscreenstate, 1, 2" # maximize with client being full-screen + "SUPER, Space, fullscreen, 0" + "SUPER_SHIFT, Space, fullscreen, 1" # maximize "CTRL_SHIFT, Space, exec, toggle-fake-fullscreen" # fake fullscreen + custom border "SUPER_SHIFT, S, layoutmsg, togglesplit" diff --git a/home/programs/graphical/wms/hyprland/packages/toggle-fake-fullscreen/toggle-fake-fullscreen.sh b/home/programs/graphical/wms/hyprland/packages/toggle-fake-fullscreen/toggle-fake-fullscreen.sh index 5e102ae..69f2666 100644 --- a/home/programs/graphical/wms/hyprland/packages/toggle-fake-fullscreen/toggle-fake-fullscreen.sh +++ b/home/programs/graphical/wms/hyprland/packages/toggle-fake-fullscreen/toggle-fake-fullscreen.sh @@ -4,19 +4,19 @@ ACTIVE_BORDER_COLOR="0xFFFF6600" DEFAULT_BORDER_COLOR="0xFFFFA500" -hyprctl dispatch fullscreenstate -1 2 +hyprctl dispatch fakefullscreen "" -fullscreen_status="$(hyprctl activewindow -j | jq '.fullscreenClient')" +fullscreen_status="$(hyprctl activewindow -j | jq '.fakeFullscreen')" if [ "$fullscreen_status" = "null" ]; then echo "Update your hyprland, 'fakeFullscreen' window property not found." exit 1 -elif [ "$fullscreen_status" = "2" ]; then +elif [ "$fullscreen_status" = "true" ]; then window_address="$(hyprctl activewindow -j | jq -r '.address')" hyprctl setprop "address:$window_address" activebordercolor "$ACTIVE_BORDER_COLOR" lock -elif [ "$fullscreen_status" = "0" ]; then +elif [ "$fullscreen_status" = "false" ]; then window_address="$(hyprctl activewindow -j | jq -r '.address')" hyprctl setprop "address:$window_address" activebordercolor "$DEFAULT_BORDER_COLOR" else - echo "Unexpected output from 'fullscreenClient' window property: $fullscreen_status" + echo "Unexpected output from 'fakeFullscreen' window property: $fullscreen_status" exit 1 fi diff --git a/home/programs/terminal/tools/git/aliases.nix b/home/programs/terminal/tools/git/aliases.nix index ec407d1..ea2ea75 100644 --- a/home/programs/terminal/tools/git/aliases.nix +++ b/home/programs/terminal/tools/git/aliases.nix @@ -71,8 +71,6 @@ in { staash = "stash --all"; stash-staged = "!sh -c 'git stash --keep-index; git stash push -m \"staged\" --keep-index; git stash pop stash@{1}'"; - reauthor-all = "rebase --root -r --exec 'git commit --amend --no-edit --reset-author --no-verify'"; - find-merge = "!sh -c 'commit=$0 && branch=\${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'"; show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'";