From ec7ffbf3a8a37d8c7f5398143846827d2716f02c Mon Sep 17 00:00:00 2001
From: David Morgan <djm_uk@protonmail.com>
Date: Fri, 7 Jun 2024 20:52:39 +0100
Subject: More changes for 24.05

---
 nix-conf/machines/egalmoth/configuration.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nix-conf/machines/egalmoth/configuration.nix b/nix-conf/machines/egalmoth/configuration.nix
index 51d3241..2284b4b 100644
--- a/nix-conf/machines/egalmoth/configuration.nix
+++ b/nix-conf/machines/egalmoth/configuration.nix
@@ -70,14 +70,14 @@
   services.gnome.gnome-keyring.enable = true;
   security.pam.services.login.enableGnomeKeyring = true;
   security.pam.services.passwd.enableGnomeKeyring = true;
-  services.xserver.displayManager.sessionPackages = [ pkgs.sway ];
-  services.xserver.displayManager.defaultSession = "none+i3";
+  services.displayManager.sessionPackages = [ pkgs.sway ];
+  services.displayManager.defaultSession = "none+i3";
   #services.xserver.displayManager.defaultSession = "sway";
 
   services.xserver.windowManager.i3.enable = true;
   services.upower.enable = true;
 
-  services.xserver.layout = "gb";
+  services.xserver.xkb.layout = "gb";
 
   services.printing.enable = true;
   services.printing.drivers = [ pkgs.gutenprint pkgs.hplipWithPlugin ];
@@ -99,7 +99,7 @@
     })
   ];
 
-  services.xserver.libinput = {
+  services.libinput = {
     enable = true;
     touchpad = {
       clickMethod = "clickfinger";
-- 
cgit 1.4.1-2-gfad0