diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index f6df893..e18119e 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -26,8 +26,9 @@ in {
       # Enable the X11 windowing system / wayland depending on DE
       xserver = {
         enable = true;
-        libinput.enable = true;
-      };
+              };
+
+      libinput.enable = true;
 
       # flatpak xdg-portal-kde crashes, otherwise this would be global
       flatpak.enable = true;
diff --git a/modules/desktop/gnome.nix b/modules/desktop/gnome.nix
index 12cde3d..c5d6643 100644
--- a/modules/desktop/gnome.nix
+++ b/modules/desktop/gnome.nix
@@ -17,10 +17,11 @@ in {
         desktopManager.gnome.enable = true;
         displayManager = {
           gdm.enable = true;
-          defaultSession = "gnome";
-        };
+                  };
       };
 
+      displayManager.defaultSession = "gnome";
+
       gnome = {
         tracker-miners.enable = false;
         tracker.enable = false;
diff --git a/modules/desktop/printing.nix b/modules/desktop/printing.nix
index 5f958aa..e4ab50d 100644
--- a/modules/desktop/printing.nix
+++ b/modules/desktop/printing.nix
@@ -15,7 +15,7 @@ in {
       
       avahi = {
         enable = true; # runs the Avahi daemon
-        nssmdns = true; # enables the mDNS NSS plug-in
+        nssmdns4 = true; # enables the mDNS NSS plug-in
         openFirewall = true; # opens the firewall for UDP port 5353
       };
     };
diff --git a/modules/hardware/amd.nix b/modules/hardware/amd.nix
index 94b959a..06f3a85 100644
--- a/modules/hardware/amd.nix
+++ b/modules/hardware/amd.nix
@@ -32,7 +32,7 @@ in {
       };
 
       environment.systemPackages = with pkgs; [
-        nvtop-amd
+        nvtopPackages.amd
       ];
     })
 
diff --git a/modules/hardware/intel.nix b/modules/hardware/intel.nix
index 2c51461..c84a3bb 100644
--- a/modules/hardware/intel.nix
+++ b/modules/hardware/intel.nix
@@ -33,7 +33,7 @@ in {
         ];
       };
       environment.systemPackages = with pkgs; [
-        nvtop-intel
+        nvtopPackages.intel
       ];
     })
   ];
diff --git a/modules/i18n.nix b/modules/i18n.nix
index 3d38ec1..d3fbebc 100644
--- a/modules/i18n.nix
+++ b/modules/i18n.nix
@@ -16,10 +16,10 @@
       };
     };
 
-    services.xserver = {
+    services.xserver.xkb = {
       # Configure keymap in X11
       layout = "de";
-      xkbVariant = "";
+      variant = "";
     };
 
     # Configure console keymap
diff --git a/modules/users/home-shared-modules.nix b/modules/users/home-shared-modules.nix
index 12f12cf..3ad3365 100644
--- a/modules/users/home-shared-modules.nix
+++ b/modules/users/home-shared-modules.nix
@@ -22,7 +22,7 @@
       zsh = {
         enable = true;
         syntaxHighlighting.enable = true;
-        enableAutosuggestions = true;
+        autosuggestion.enable = true;
         enableVteIntegration = true;
       };
     };
diff --git a/modules/users/vinzenz-home.nix b/modules/users/vinzenz-home.nix
index 942f5e9..622bec6 100644
--- a/modules/users/vinzenz-home.nix
+++ b/modules/users/vinzenz-home.nix
@@ -146,8 +146,7 @@ in
           enable = true;
           git = true;
           icons = true;
-          enableAliases = true;
-          extraOptions = [
+                    extraOptions = [
             "--group-directories-first"
             "--header"
           ];