From 94d8d8d70176278d225cb41926166576532bba60 Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Sun, 3 Sep 2023 23:58:37 -0600 Subject: [PATCH] gpu died :( klfsjd --- configuration.org | 5 ----- hardware-configuration.nix | 24 ++++++++++++++++-------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/configuration.org b/configuration.org index 188d7fd..1ececb9 100755 --- a/configuration.org +++ b/configuration.org @@ -130,7 +130,6 @@ undesirable packages from installing. services = { xserver = { enable = true; - videoDrivers = [ "nvidia" ]; displayManager.gdm.enable = true; desktopManager.gnome.enable = true; layout = "us"; @@ -210,9 +209,6 @@ packages. #+begin_src nix nixpkgs.config = { allowUnfree = true; - packageOverrides = pkgs: { - vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; - }; permittedInsecurePackages = [ "nodejs-14.21.3" "openssl-1.1.1v" @@ -816,7 +812,6 @@ docker-compose images using [[https://nixos.wiki/wiki/Docker][Arion]]. Could be virtualisation.docker = { enable = true; storageDriver = "btrfs"; - enableNvidia = true; }; #+end_src diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 59ab0ba..dbca09a 100755 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -159,7 +159,17 @@ in { nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; + # nixpkgs.config.packageOverrides = pkgs: { + # vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; + # }; + + # virtualisation.docker.enableNvidia = true; + # services.xserver.videoDrivers = [ "nvidia" ]; hardware = { + # nvidia = { + # modesetting.enable = true; + # powerManagement.enable = true; + # }; sane = { enable = true; extraBackends = [ pkgs.hplip pkgs.hplipWithPlugin ]; @@ -171,18 +181,16 @@ in { # package = unstable.opentabletdriver; # daemon.enable = false; # }; - nvidia.modesetting.enable = true; opengl = { enable = true; - setLdLibraryPath = true; driSupport = true; driSupport32Bit = true; - extraPackages = with pkgs; [ - intel-media-driver # LIBVA_DRIVER_NAME=iHD - vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) - vaapiVdpau - libvdpau-va-gl - ]; + # extraPackages = with pkgs; [ + # intel-media-driver # LIBVA_DRIVER_NAME=iHD + # vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) + # vaapiVdpau + # libvdpau-va-gl + # ]; }; }; }