diff --git a/home.nix b/home.nix
index e4a91fb..15be889 100644
--- a/home.nix
+++ b/home.nix
@@ -48,7 +48,7 @@
     };
 
   services.unclutter.enable = true;
-  services.gpg-agent.enable = true;
   services.blueman-applet.enable = true;
+
   services.udiskie.enable = true; # require "services.udisks2.enable = true" in system configuration
 }
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 3b166b6..2f6ae74 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -20,6 +20,7 @@
 
   boot.tmp.cleanOnBoot = true;
 
+  # Networking
   networking.hostName = "pierre"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
@@ -53,18 +54,20 @@
   # Configure keymap in X11
   services.xserver = {
     enable = true;
-    layout = "fr";
-    xkbVariant = "bepo";
-
-    displayManager = {
-      defaultSession = "none+i3";
+    xkb = {
+      layout = "fr";
+      variant = "bepo";
     };
+
     windowManager = {
       i3 = {
         enable = true;
       };
     };
   };
+  services.displayManager = {
+    defaultSession = "none+i3";
+  };
 
   # Configure console keymap
   console.keyMap = "fr";
@@ -116,6 +119,7 @@
   services.gnome.gnome-keyring.enable = true; # see https://nixos.wiki/wiki/Visual_Studio_Code#Error_after_Sign_On
   services.blueman.enable = true;
   services.udisks2.enable = true;
+  services.resolved.enable = true;
 
   # Enable the OpenSSH daemon.
   # services.openssh.enable = true;
diff --git a/nixos/framework.nix b/nixos/framework.nix
index 63023c6..a7ab88c 100644
--- a/nixos/framework.nix
+++ b/nixos/framework.nix
@@ -85,7 +85,7 @@
   };
 
   # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver.libinput.enable = true;
+  services.libinput.enable = true;
 
   # Backlight (see https://wiki.archlinux.org/title/Backlight#xbacklight_returns_:_No_outputs_have_backlight_property)
   hardware.acpilight.enable = true;
diff --git a/programs/zsh.nix b/programs/zsh.nix
index 1f6aeb6..b89b3b1 100644
--- a/programs/zsh.nix
+++ b/programs/zsh.nix
@@ -2,7 +2,9 @@
   # TODO replace with  Starship: https://starship.rs/fr-fr/installing/#declaration-utilisateur-unique-via-home-manager
   programs.zsh = {
     enable = true;
-    enableAutosuggestions = true;
+    autosuggestion = {
+      enable = true;
+    };
     enableCompletion = true;
     history = {
       ignoreDups = true;