Add ability to include extra xorg conf from the config

Update edge in order to update lagrange, so that .config/lagrange copying works
4 changed files with 17 additions and 2 deletions
--- a/config/default.nix
+++ b/config/default.nix
@ -26,4 +26,6 @@
  };

  binExtra = [];
+
+  xorgConfExtra = "";
 }
--- a/pkgs.nix
+++ b/pkgs.nix
@ -44,7 +44,7 @@ rec {

  edge = mkPkgs (builtins.fetchTarball {
    name = "nixpkgs-edge";
-    url = "https://github.com/nixos/nixpkgs/archive/f9418c4c7fab906c52ae07cf27a618de7722d1e9.tar.gz";
-    sha256 = "sha256:067m1gzj1n06m3anshwgabd1liaja8gcvd90spmnyi3a6vhqdvq0";
+    url = "https://github.com/nixos/nixpkgs/archive/3ae06c380004ab1bb4146c986f38ed75ac3ec677.tar.gz";
+    sha256 = "sha256:0x4wjqa78ik21kja5lcy6421jjg7m7pzh2vz582rv646l69a94cl";
  });
 }
--- a/x/default.nix
+++ b/x/default.nix
@ -26,11 +26,14 @@
 Section "Files"
    ModulePath "${innerEnv}/lib/xorg/modules"
 EndSection
+
+${config.xorgConfExtra}
 EOF

    for f in $(ls ${innerEnv}/share/X11/xorg.conf.d | sort); do
      cat ${innerEnv}/share/X11/xorg.conf.d/"$f" >> "$out"
    done
+
  '';

  startx = pkgs.writeShellScriptBin "startx" ''
--- a/x/xorg.conf
+++ b/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
+
Author	SHA1	Message	Date
mediocregopher	8e64d42b7d	Add ability to include extra xorg conf from the config	5 months ago
mediocregopher	6ecd5ca8ec	Update edge in order to update lagrange, so that .config/lagrange copying works	5 months ago