diff options
| -rw-r--r-- | alacritty/default.nix | 18 | ||||
| -rw-r--r-- | default.nix | 2 | ||||
| -rw-r--r-- | x/default.nix | 1 |
3 files changed, 16 insertions, 5 deletions
diff --git a/alacritty/default.nix b/alacritty/default.nix index 15fc3a4..d0c08aa 100644 --- a/alacritty/default.nix +++ b/alacritty/default.nix @@ -38,12 +38,22 @@ (builtins.readFile ./alacritty.yml) ); - alacritty = pkgs.writeScriptBin "alacritty" '' - #!${pkgs.bash}/bin/bash + shellEntrypoint = pkgs.writeShellScript "alacritty-shell-entrypoint" '' + unset LD_LIBRARY_PATH + unset __EGL_VENDOR_LIBRARY_DIRS + exec "${zsh}/bin/zsh" "$@" + ''; + + alacritty = pkgs.writeShellScriptBin "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.nixgl}/bin/nixGL ${pkgs.alacritty}/bin/alacritty \ + exec ${pkgs.alacritty}/bin/alacritty \ -o font.size=${builtins.toString config.alacritty.fontSize} \ --config-file ${configFile} \ - -e "${zsh}/bin/zsh" + -e "${shellEntrypoint}" ''; } diff --git a/default.nix b/default.nix index e78f4c5..0955d2e 100644 --- a/default.nix +++ b/default.nix @@ -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 diff --git a/x/default.nix b/x/default.nix index b6d8f98..a060701 100644 --- a/x/default.nix +++ b/x/default.nix @@ -11,7 +11,6 @@ pkgs.xorg.xinit pkgs.xorg.xauth pkgs.xorg.xset - #pkgs.xorg.xf86inputevdev pkgs.xorg.xf86inputlibinput (pkgs.runCommand "xorg-conf-inner" {} '' |