Add ability to include extra xorg conf from the config

alacritty/default.nix

@@ -38,24 +38,12 @@
       (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
 
-    # 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 \
+    exec ${pkgs.nixgl}/bin/nixGL ${pkgs.alacritty}/bin/alacritty \
       -o font.size=${builtins.toString config.alacritty.fontSize} \
       --config-file ${configFile} \
-      -e "${shellEntrypoint}"
+      -e "${zsh}/bin/zsh"
   '';
 }

default.nix

@@ -87,8 +87,6 @@ in rec {
       pkgs.tomb
       pkgs.udiskie
 
-      pkgs.xterm # nice to have a backup
-
       ((import ./nvim) {}).nvim
       zsh
       ((import ./alacritty) { inherit config zsh; }).alacritty

x/default.nix

@@ -11,6 +11,7 @@
       pkgs.xorg.xinit
       pkgs.xorg.xauth
       pkgs.xorg.xset
+      #pkgs.xorg.xf86inputevdev
       pkgs.xorg.xf86inputlibinput
 
       (pkgs.runCommand "xorg-conf-inner" {} ''

x/xorg.conf

@@ -4,3 +4,13 @@ Section "InputClass"
         Option "XkbLayout" "us"
         Option "XkbOptions" "caps:swapescape"
 EndSection
+
+Section "OutputClass"
+    Identifier "nvidia"
+    MatchDriver "nvidia-drm"
+    Driver "nvidia"
+    Option "AllowEmptyInitialConfiguration"
+    ModulePath "/usr/lib/nvidia/xorg"
+    ModulePath "/usr/lib/xorg/modules"
+EndSection
+