Figure out how to not use nixGL for alacritty
This commit is contained in:
parent
4a3f06b73c
commit
42c7e632d7
@ -38,12 +38,24 @@
|
||||
(builtins.readFile ./alacritty.yml)
|
||||
);
|
||||
|
||||
shellEntrypoint = pkgs.writeShellScript "alacritty-shell-entrypoint" ''
|
||||
unset LD_LIBRARY_PATH
|
||||
unset __EGL_VENDOR_LIBRARY_DIRS
|
||||
exec "${zsh}/bin/zsh" "$@"
|
||||
'';
|
||||
|
||||
alacritty = pkgs.writeScriptBin "alacritty" ''
|
||||
#!${pkgs.bash}/bin/bash
|
||||
|
||||
exec ${pkgs.nixgl}/bin/nixGL ${pkgs.alacritty}/bin/alacritty \
|
||||
# TODO this might break things, especially if the machine is not using
|
||||
# nvidia, but more investigation is needed. But it at least lets us get rid
|
||||
# of nixGL.
|
||||
export LD_LIBRARY_PATH=/usr/lib
|
||||
export __EGL_VENDOR_LIBRARY_DIRS=/usr/share/glvnd/egl_vendor.d
|
||||
|
||||
exec ${pkgs.alacritty}/bin/alacritty \
|
||||
-o font.size=${builtins.toString config.alacritty.fontSize} \
|
||||
--config-file ${configFile} \
|
||||
-e "${zsh}/bin/zsh"
|
||||
-e "${shellEntrypoint}"
|
||||
'';
|
||||
}
|
||||
|
@ -87,6 +87,8 @@ in rec {
|
||||
pkgs.tomb
|
||||
pkgs.udiskie
|
||||
|
||||
pkgs.xterm # nice to have a backup
|
||||
|
||||
((import ./nvim) {}).nvim
|
||||
zsh
|
||||
((import ./alacritty) { inherit config zsh; }).alacritty
|
||||
|
@ -11,7 +11,6 @@
|
||||
pkgs.xorg.xinit
|
||||
pkgs.xorg.xauth
|
||||
pkgs.xorg.xset
|
||||
#pkgs.xorg.xf86inputevdev
|
||||
pkgs.xorg.xf86inputlibinput
|
||||
|
||||
(pkgs.runCommand "xorg-conf-inner" {} ''
|
||||
|
Loading…
Reference in New Issue
Block a user