bmenu: patch and remove fullscreen workarounds

This commit is contained in:
Leonardo Eugênio 2023-01-21 12:55:29 -03:00
parent a45bfd9c36
commit 19524b20dd
3 changed files with 9 additions and 14 deletions

View file

@ -16,6 +16,13 @@
demoji = inputs.demoji.packages.${system}.demoji; demoji = inputs.demoji.packages.${system}.demoji;
devenv = inputs.devenv.packages.${system}.devenv; devenv = inputs.devenv.packages.${system}.devenv;
mpvpaper = inputs.wegank.packages.${prev.system}.mpvpaper; mpvpaper = inputs.wegank.packages.${prev.system}.mpvpaper;
bemenu = prev.bemenu.overrideAttrs (o: {
preBuild = ''
sed -i 's/ZWLR_LAYER_SHELL_V1_LAYER_TOP/ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY/g' lib/renderers/wayland/window.c
'';
});
sea-orm-cli = sea-orm-cli =
inputs.sea-orm-cli.legacyPackages.${prev.system}.sea-orm-cli; inputs.sea-orm-cli.legacyPackages.${prev.system}.sea-orm-cli;
webcord = inputs.webcord.legacyPackages.${prev.system}.webcord; webcord = inputs.webcord.legacyPackages.${prev.system}.webcord;

View file

@ -19,11 +19,6 @@ if test "$argv[1]" = "run"
end end
if test -n "$SWAYSOCK" if test -n "$SWAYSOCK"
swaymsg -t get_tree |
jq -je '..|select(.focused? and .fullscreen_mode? == 1)|""' &&
swaymsg -q fullscreen off &&
set fullscreen
swaymsg -t get_outputs | swaymsg -t get_outputs |
jq -r 'map(.focused)|reverse|index(true)' | jq -r 'map(.focused)|reverse|index(true)' |
read focused_output read focused_output
@ -32,19 +27,12 @@ if test -n "$SWAYSOCK"
and set focused_output "-m $focused_output" and set focused_output "-m $focused_output"
end end
function clean_exit
set -q fullscreen
and swaymsg -q fullscreen on &
end
trap clean_exit EXIT
set -l config "$HOME/.config/bmenu.conf" set -l config "$HOME/.config/bmenu.conf"
if test -f $config if test -f $config
source $config source $config
end end
dhist wrap -- bemenu \ exec dhist wrap -- bemenu \
$focused_output\ $focused_output\
--ignorecase\ --ignorecase\
--bottom\ --bottom\

View file

@ -20,7 +20,7 @@
lib.mapAttrs (name: deps: create_script name ./${name} deps); lib.mapAttrs (name: deps: create_script name ./${name} deps);
in create_scripts { in create_scripts {
br = [ ]; br = [ ];
bmenu = [ bemenu final.dhist fish j4-dmenu-desktop jq sway ]; bmenu = [ final.bemenu final.dhist fish j4-dmenu-desktop jq sway ];
_diffr = [ diffr ]; _diffr = [ diffr ];
_thunar-terminal = [ final.terminal ]; _thunar-terminal = [ final.terminal ];
kak-pager = [ fish final._diffr ]; kak-pager = [ fish final._diffr ];