From bf23a0b97f0f7729605cf995b5389cff3fb9d892 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Fri, 28 Jun 2024 17:03:53 +0200
Subject: Adapt to 24.05

---
 host/athena.nix                   | 12 ++++++------
 host/software/desktop/default.nix | 18 ++++++++++--------
 2 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'host')

diff --git a/host/athena.nix b/host/athena.nix
index 2c58a51..7124ebc 100644
--- a/host/athena.nix
+++ b/host/athena.nix
@@ -54,12 +54,12 @@
 
     xserver = {
       videoDrivers = [ "nvidia" ];
+    };
 
-      libinput = {
-        enable = true;
-        touchpad = {
-          accelSpeed = "2.0";
-        };
+    libinput = {
+      enable = true;
+      touchpad = {
+        accelSpeed = "2.0";
       };
     };
 
@@ -70,7 +70,7 @@
 
     avahi = {
       enable  = true;
-      nssmdns = true;
+      nssmdns4 = true;
     };
   };
 
diff --git a/host/software/desktop/default.nix b/host/software/desktop/default.nix
index da15c8f..d557f5a 100644
--- a/host/software/desktop/default.nix
+++ b/host/software/desktop/default.nix
@@ -29,14 +29,16 @@
 
     xserver = {
       enable = true;
-      layout = "de";
-      xkbOptions = "caps:escape";
-
-      displayManager = {
-        autoLogin = {
-          enable = true;
-          user   = "common";
-        };
+      xkb = {
+        options = "caps:escape";
+        layout = "de";
+      };
+    };
+
+    displayManager = {
+      autoLogin = {
+        enable = true;
+        user   = "common";
       };
     };
 
-- 
cgit v1.2.3