From 0166446504337f0e7b1c5e80a0cf67c5af22d868 Mon Sep 17 00:00:00 2001 From: Felix Wittwer Date: Wed, 22 Jun 2022 14:19:19 +0200 Subject: [PATCH] Attempt to fix driver issue --- entropy/nixos/configuration.nix | 3 +++ entropy/nixos/modules/sway.nix | 27 ++++++++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/entropy/nixos/configuration.nix b/entropy/nixos/configuration.nix index f568b32..6e29e05 100644 --- a/entropy/nixos/configuration.nix +++ b/entropy/nixos/configuration.nix @@ -46,6 +46,9 @@ in boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + # ------------ kernel ------------------------------------------------------- + boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_10; + # ------------ networking --------------------------------------------------- networking.hostName = "entropy"; # Define your hostname. networking.wireless = { diff --git a/entropy/nixos/modules/sway.nix b/entropy/nixos/modules/sway.nix index 6bad02a..721137a 100644 --- a/entropy/nixos/modules/sway.nix +++ b/entropy/nixos/modules/sway.nix @@ -27,6 +27,9 @@ export _JAVA_AWT_WM_NONREPARENTING=1 # firefox x11 <-> wayland interoperability export MOZ_DBUS_REMOTE=1 + + # override VA-API driver + export LIBVA_DRIVER_NAME=iHD ''; }; @@ -40,13 +43,27 @@ # ------------ Display Manager ---------------------------------------------- - # use sddm for authentication - services.xserver.enable = true; + services.xserver = { + # under protest + enable = true; + + # graphics + #videoDrivers = [ "modesetting" ]; + useGlamor = true; + + # use sddm for authentication + displayManager.sddm.enable = true; + }; + #services.xserver.videoDrivers = [ + #"intel" + #"amdgpu" + #"radeon" + #"nouveau" + #"modesetting" + #"fbdev" + #]; #services.xserver.displayManager.gdm = { #enable = true; #wayland = true; #}; - services.xserver.displayManager.sddm = { - enable = true; - }; }