From 71588497f68a9d2bc550b755444df42d12f997bc Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@tvl.su>
Date: Mon, 26 Feb 2024 14:42:47 +0300
Subject: [PATCH] fix(users/aspen): fix warnings for renamed NixOS options

Change-Id: Ia83e826c49e7f9567f906c430ca1636ad19e42bd
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11031
Reviewed-by: aspen <root@gws.fyi>
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
---
 users/aspen/system/system/machines/bumblebee.nix | 2 +-
 users/aspen/system/system/machines/yeren.nix     | 2 +-
 users/aspen/system/system/modules/xserver.nix    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/users/aspen/system/system/machines/bumblebee.nix b/users/aspen/system/system/machines/bumblebee.nix
index 0fec21409..8bb52f75f 100644
--- a/users/aspen/system/system/machines/bumblebee.nix
+++ b/users/aspen/system/system/machines/bumblebee.nix
@@ -19,5 +19,5 @@
     thresholdPercentage = 5;
   };
 
-  services.xserver.xkbOptions = "caps:swapescape";
+  services.xserver.xkb.options = "caps:swapescape";
 }
diff --git a/users/aspen/system/system/machines/yeren.nix b/users/aspen/system/system/machines/yeren.nix
index 9208d76d5..653f0cd44 100644
--- a/users/aspen/system/system/machines/yeren.nix
+++ b/users/aspen/system/system/machines/yeren.nix
@@ -20,7 +20,7 @@
 
   services.avahi = {
     enable = true;
-    nssmdns = true;
+    nssmdns4 = true;
   };
 
   boot = {
diff --git a/users/aspen/system/system/modules/xserver.nix b/users/aspen/system/system/modules/xserver.nix
index 35ee44112..f78edb207 100644
--- a/users/aspen/system/system/modules/xserver.nix
+++ b/users/aspen/system/system/modules/xserver.nix
@@ -3,7 +3,7 @@
   # Enable the X11 windowing system.
   services.xserver = {
     enable = true;
-    layout = "us";
+    xkb.layout = "us";
 
     libinput.enable = true;