diff --git a/desktop/general.nix b/desktop/general.nix
index 33cf33b..c896f0a 100644
--- a/desktop/general.nix
+++ b/desktop/general.nix
@@ -68,8 +68,8 @@ in {
       systemd.services."autovt@tty1".enable = mkOverride 50 false;
 
       # Configure keymap in X11
-      services.xserver.layout = cfg.layout;
-      services.xserver.xkbOptions = "eurosign:e";
+      services.xserver.xkb.layout = cfg.layout;
+      services.xserver.xkb.options = "eurosign:e";
 
 
       aviallon.boot.cmdline = {
@@ -95,7 +95,7 @@ in {
       programs.xwayland.enable = true;
       
       # Enable touchpad support (enabled default in most desktopManager).
-      services.xserver.libinput.enable = true;
+      services.libinput.enable = true;
 
       # Enable color management
       services.colord.enable = true;
diff --git a/programs/nvtop.nix b/programs/nvtop.nix
index 655fa72..2330d66 100644
--- a/programs/nvtop.nix
+++ b/programs/nvtop.nix
@@ -9,7 +9,7 @@ in {
     package = mkOption {
       internal = true;
       description = "Which nvtop package to use";
-      default = pkgs.nvtop-amd;
+      default = pkgs.nvtopPackages.amd;
       type = myLib.types.package';
     };
   };
diff --git a/services/general.nix b/services/general.nix
index d896b1c..374bc2f 100644
--- a/services/general.nix
+++ b/services/general.nix
@@ -136,7 +136,7 @@ in {
 
     services.avahi = {
       enable = !generalCfg.minimal; # .lan/.local resolution
-      nssmdns = true; # .lan/.local resolution
+      nssmdns4 = true; # .lan/.local resolution
       openFirewall = true;
       reflector = true;
       publish = {