diff --git a/hosts/iso/hardware-configuration.nix b/hosts/iso/hardware-configuration.nix index feada92..a9cc699 100644 --- a/hosts/iso/hardware-configuration.nix +++ b/hosts/iso/hardware-configuration.nix @@ -4,12 +4,20 @@ ... }: { - config.hardware = { - enableAllFirmware = pkgs.config.allowUnfree; - enableRedistributableFirmware = lib.mkForce true; + config = { + hardware = { + enableAllFirmware = pkgs.config.allowUnfree; + enableRedistributableFirmware = lib.mkForce true; - cpu = lib.genAttrs [ "amd" "intel" ] (_: { - updateMicrocode = true; - }); + cpu = lib.genAttrs [ "amd" "intel" ] (_: { + updateMicrocode = true; + }); + }; + + # Enable NVIDIA support for installation hosts using their GPUs + hardware.graphics.enable = true; + services.xserver.videoDrivers = [ "nvidia" ]; + hardware.nvidia.open = true; # NOTE: only supports RTX 20+, or GTX 16+ + hardware.nvidia.modesetting.enable = true; # needed for Wayland }; } \ No newline at end of file diff --git a/modules/home-manager/my/programs/microsoft-edge/package.nix b/modules/home-manager/my/programs/microsoft-edge/package.nix index 3b85c34..140352c 100644 --- a/modules/home-manager/my/programs/microsoft-edge/package.nix +++ b/modules/home-manager/my/programs/microsoft-edge/package.nix @@ -1,25 +1,8 @@ { microsoft-edge, - fetchurl, - commandLineArgs ? "", }: -# Some fatal bug was messing with user files in version 145.0.3800.53, which has -# since been removed from their sources, causing a build failure. -# -# The PR that bumped the version has not landed in unstable, so we will override -# in-place until then. -# -# TODO: drop when the relevant PR lands in unstable. -# see: https://github.com/NixOS/nixpkgs/issues/492012 -(microsoft-edge.overrideAttrs (finalAttrs: prevAttrs: { - version = "145.0.3800.70"; - - src = fetchurl { - url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-gUyh9AD1ntnZb2iLRwKLxy0PxY0Dist73oT9AC2pFQI="; - }; -})).override { +microsoft-edge.override { inherit commandLineArgs; } \ No newline at end of file diff --git a/modules/nixos/documentation/man/module.nix b/modules/nixos/documentation/man/module.nix index 33c503f..4873edb 100644 --- a/modules/nixos/documentation/man/module.nix +++ b/modules/nixos/documentation/man/module.nix @@ -12,12 +12,7 @@ in { # They usually exist on most other distros, and I'm very used to that # availability, so let's bring them back here too. environment.systemPackages = with pkgs; [ - # Something changed in the `linux-manual` build, and the fix PR hasn't - # laned in unstable, so we pull it here. - # - # TODO: drop this fix once the relevant PR is merged - # see: https://github.com/NixOS/nixpkgs/issues/489956 - (callPackage ./package.nix {}) + linux-manual man-pages ]; }; diff --git a/modules/nixos/documentation/man/package.nix b/modules/nixos/documentation/man/package.nix deleted file mode 100644 index 442f427..0000000 --- a/modules/nixos/documentation/man/package.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - lib, - stdenv, - linuxPackages_latest, - python3, - man, -}: - -stdenv.mkDerivation { - pname = "linux-manual"; - inherit (linuxPackages_latest.kernel) version src; - - nativeBuildInputs = [ python3 ]; - nativeInstallCheckInputs = [ man ]; - - dontConfigure = true; - doInstallCheck = true; - - postPatch = '' - patchShebangs --build \ - tools/docs \ - scripts/kernel-doc.py - ''; - - buildPhase = '' - runHook preBuild - - # avoid Makefile because it checks for unnecessary Python dependencies - KBUILD_BUILD_TIMESTAMP="$(date -u -d "@$SOURCE_DATE_EPOCH")" \ - tools/docs/sphinx-build-wrapper mandocs - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/share/man" - cp -r output/man "$out/share/man/man9" - - runHook postInstall - ''; - - installCheckPhase = '' - runHook preInstallCheck - - # Check for well‐known man page - man -M "$out/share/man" -P cat 9 kmalloc >/dev/null - - runHook postInstallCheck - ''; - - meta = { - homepage = "https://kernel.org/"; - description = "Linux kernel API manual pages"; - license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ mvs ]; - platforms = lib.platforms.linux; - }; -} \ No newline at end of file