diff --git a/systems/x86_64-linux/aspi/default.nix b/systems/x86_64-linux/aspi/default.nix
index 3e765bb..c10fecc 100644
--- a/systems/x86_64-linux/aspi/default.nix
+++ b/systems/x86_64-linux/aspi/default.nix
@@ -142,11 +142,11 @@
     displayManager.gdm.enable = true;
     xkb.layout = "de";
     xkb.variant = "";
-
-    # Enable touchpad support (enabled default in most desktopManager).
-    libinput.enable = true;
   };
 
+  # Enable touchpad support (enabled default in most desktopManager).
+  services.libinput.enable = true;
+
   # Configure console keymap
   console.keyMap = "de";
   # or use this
@@ -259,6 +259,7 @@
 
   xdg.portal.enable = true;
   xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+  xdg.portal.config.common.default = "*"; # Use first portal implementation found
   # hyprland desktop portal added automatically
 
   # services.emacs.enable = true;
diff --git a/systems/x86_64-linux/kardorf/default.nix b/systems/x86_64-linux/kardorf/default.nix
index 70d5a14..efecb67 100644
--- a/systems/x86_64-linux/kardorf/default.nix
+++ b/systems/x86_64-linux/kardorf/default.nix
@@ -148,7 +148,7 @@
   };
 
   # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
+  # services.libinput.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.julian = {
@@ -206,6 +206,7 @@
 
   xdg.portal.enable = true;
   xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+  xdg.portal.config.common.default = "*"; # Use first portal implementation found
 
   # services.emacs.enable = true;