diff --git a/hosts/gwiad/configuration.nix b/hosts/gwiad/configuration.nix
index 02e00dd..8a02f1a 100644
--- a/hosts/gwiad/configuration.nix
+++ b/hosts/gwiad/configuration.nix
@@ -72,12 +72,12 @@
   services.xserver = {
     enable = true;
     xkb.layout = "fr";
-    displayManager.gdm.enable = true;
-    desktopManager.gnome.enable = true;
     excludePackages = with pkgs; [
       xterm
     ];
   };
+  services.displayManager.gdm.enable = true;
+  services.desktopManager.gnome.enable = true;
   environment.gnome.excludePackages = with pkgs; [
     epiphany
     geary
@@ -88,15 +88,19 @@
   environment.variables.EDITOR = "vim";
 
   # Nix configuration
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  nix.gc = {
-    automatic = true;
-    dates = "weekly";
-    options = "--delete-older-than 7d";
+  nix = {
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 7d";
+    };
+    settings = {
+      experimental-features = [ "nix-command" "flakes" ];
+      auto-optimise-store = true;
+      trusted-users = [ "jhemono" ];
+    };
+    channel.enable = false;
   };
-  nix.settings.auto-optimise-store = true;
-  nix.settings.trusted-users = [ "jhemono" ];
-  nix.channel.enable = false;
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.