From 470af133c07be1ab24687b3fd6dcd3d6cf34ff2e Mon Sep 17 00:00:00 2001
From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com>
Date: Mon, 2 Dec 2024 12:43:57 +0100
Subject: [PATCH] Fix nix warnings

---
 home/features/desktop/common/flatpak.nix | 2 +-
 hosts/common/global/locale.nix           | 2 +-
 hosts/common/optional/desktop/gnome.nix  | 2 +-
 hosts/common/optional/desktop/x11.nix    | 5 +++--
 hosts/common/optional/printing.nix       | 3 ++-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/home/features/desktop/common/flatpak.nix b/home/features/desktop/common/flatpak.nix
index 2ed3ee2..b525f24 100644
--- a/home/features/desktop/common/flatpak.nix
+++ b/home/features/desktop/common/flatpak.nix
@@ -1,5 +1,5 @@
 {inputs, ...}: {
-  imports = [inputs.flatpaks.homeManagerModules.default];
+  imports = [inputs.flatpaks.homeManagerModules.declarative-flatpak];
   services.flatpak = {
     remotes.flathub = "https://flathub.org/repo/flathub.flatpakrepo";
     packages = [
diff --git a/hosts/common/global/locale.nix b/hosts/common/global/locale.nix
index 624eaa7..c5f0f2d 100644
--- a/hosts/common/global/locale.nix
+++ b/hosts/common/global/locale.nix
@@ -16,5 +16,5 @@
     };
   };
   console.keyMap = "de";
-  services.xserver.layout = "de";
+  services.xserver.xkb.layout = "de";
 }
diff --git a/hosts/common/optional/desktop/gnome.nix b/hosts/common/optional/desktop/gnome.nix
index 8005cc6..6c06551 100644
--- a/hosts/common/optional/desktop/gnome.nix
+++ b/hosts/common/optional/desktop/gnome.nix
@@ -7,11 +7,11 @@
   imports = [./global.nix ./x11.nix ./wayland.nix];
 
   services = {
+    libinput.enable = true;
     xserver = {
       desktopManager.gnome = {
         enable = true;
       };
-      libinput.enable = true;
       modules = [pkgs.xf86_input_wacom];
       wacom.enable = true;
     };
diff --git a/hosts/common/optional/desktop/x11.nix b/hosts/common/optional/desktop/x11.nix
index 57c15e8..35b6fcd 100644
--- a/hosts/common/optional/desktop/x11.nix
+++ b/hosts/common/optional/desktop/x11.nix
@@ -5,11 +5,12 @@
   ...
 }: {
   services = {
+    libinput.enable = true; # Enable touchpad support
+    libinput.touchpad.naturalScrolling = true;
+
     # Enable the X11 windowing system.
     xserver = {
       enable = true;
-      # Enable touchpad support
-      libinput.enable = true;
       # Remove xterm terminal
       excludePackages = with pkgs; [xterm];
       modules = [pkgs.xf86_input_wacom];
diff --git a/hosts/common/optional/printing.nix b/hosts/common/optional/printing.nix
index b58fb83..78ce3f3 100644
--- a/hosts/common/optional/printing.nix
+++ b/hosts/common/optional/printing.nix
@@ -9,7 +9,8 @@
     printing.enable = true;
     avahi = {
       enable = true;
-      nssmdns = true;
+      nssmdns4 = true;
+      nssmdns6 = true;
       # for a WiFi printer
       openFirewall = true;
     };