From 8ac342a589e61841db8df3647594d90638c0e637 Mon Sep 17 00:00:00 2001 From: Antoine Viallon Date: Thu, 14 Aug 2025 14:47:06 +0200 Subject: [PATCH 1/2] [Desktop/SDDM] force-enable --- desktop/sddm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/sddm.nix b/desktop/sddm.nix index 8799f61..0fd6401 100644 --- a/desktop/sddm.nix +++ b/desktop/sddm.nix @@ -2,7 +2,7 @@ with lib; let cfg = config.aviallon.desktop; - sddmCfg = config.services.xserver.displayManager.sddm; + sddmCfg = config.services.displayManager.sddm; in { options.aviallon.desktop.sddm.unstable = mkEnableOption "bleeding-edge SDDM"; options.aviallon.desktop.sddm.enable = mkEnableOption "custom SDDM configuration"; @@ -11,7 +11,7 @@ in { # Prevents blinking cursor services.displayManager.sddm = { - enable = true; + enable = mkOverride 20 true; wayland.enable = mkDefault true; wayland.compositor = "kwin"; settings = { From a64e11dd6aa02c14f7fb03fc57e0f9a7e49c259a Mon Sep 17 00:00:00 2001 From: Antoine Viallon Date: Fri, 15 Aug 2025 15:34:23 +0200 Subject: [PATCH 2/2] [Hardware/Mesa] no longer use deprecated 'drivers' output --- hardware/mesa.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hardware/mesa.nix b/hardware/mesa.nix index 4587727..a2cba06 100644 --- a/hardware/mesa.nix +++ b/hardware/mesa.nix @@ -72,8 +72,8 @@ in { }; hardware.graphics = { - package = with pkgs; cfg.internal.package.drivers; - package32 = with pkgs; cfg.internal.package32.drivers; + package = with pkgs; cfg.internal.package; + package32 = with pkgs; cfg.internal.package32; extraPackages = optional (hasAttr "opencl" cfg.internal.package.out) cfg.internal.package.out.opencl; extraPackages32 = optional (hasAttr "opencl" cfg.internal.package32.out) cfg.internal.package32.out.opencl;