diff --git a/nix/systems/desktop.nix b/nix/systems/desktop.nix
index 39fa9d5..404611d 100644
--- a/nix/systems/desktop.nix
+++ b/nix/systems/desktop.nix
@@ -1,17 +1,19 @@
 { config, pkgs, ... }: {
 
   # x11
-  services.xserver.enable = true;
   services.xserver = {
+    enable     = true;
     layout     = "us";
     xkbVariant = "";
   };
 
   # xdg portals
-  xdg.portal.enable       = true;
-  xdg.portal.extraPortals = with pkgs; [
-    xdg-desktop-portal-wlr
-  ];
+  xdg.portal {
+    enable       = true;
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-wlr
+    ];
+  };
 
   # gnome
   services.xserver.displayManager.gdm.enable   = true;
diff --git a/nix/systems/hardware.nix b/nix/systems/hardware.nix
index a756065..64c483d 100644
--- a/nix/systems/hardware.nix
+++ b/nix/systems/hardware.nix
@@ -1,15 +1,15 @@
 { config, lib, pkgs, ... }: {
 
   # hardware
-  hardware.opengl.enable = true;
+  hardware.opengl.enable                 = true;
   hardware.enableRedistributableFirmware = true;
 
   # hardware logitech
-  hardware.logitech.wireless.enable = true;
+  hardware.logitech.wireless.enable          = true;
   hardware.logitech.wireless.enableGraphical = true;
 
   # enable bluetooth
-  hardware.bluetooth.enable = true;
+  hardware.bluetooth.enable      = true;
   hardware.bluetooth.powerOnBoot = true;
 
   # power management
diff --git a/nix/systems/networking.nix b/nix/systems/networking.nix
index 93870c2..321a058 100644
--- a/nix/systems/networking.nix
+++ b/nix/systems/networking.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }: {
 
   # networking
+  networking.firewall.enable       = false;
   networking.networkmanager.enable = true;
-  networking.firewall.enable = false;
 
 }
diff --git a/nix/systems/nix.nix b/nix/systems/nix.nix
index 95dd81a..a503d4a 100644
--- a/nix/systems/nix.nix
+++ b/nix/systems/nix.nix
@@ -4,11 +4,9 @@
   nix = {
 
     # garbage collection
-    gc = { 
-      automatic = true;
-      dates     = "weekly";
-      options   = "--delete-older-than 7d";
-    };
+    gc.automatic = true;
+    gc.dates     = "weekly";
+    gc.options   = "--delete-older-than 7d";
 
     # nix package with flakes
     package = pkgs.nixFlakes;
diff --git a/nix/systems/simon.nix b/nix/systems/simon.nix
index b76a20e..f66df14 100644
--- a/nix/systems/simon.nix
+++ b/nix/systems/simon.nix
@@ -7,8 +7,12 @@
   users.users.simon = {
     isNormalUser    = true;
     description     = "Simon Cornet";
-    extraGroups     = [ "libvirtd" "networkmanager" "wheel" ];
     initialPassword = "changeme";
     shell           = pkgs.zsh;
+    extraGroups     = [ 
+      "libvirtd"
+      "networkmanager"
+      "wheel"
+    ];
   };
 }
diff --git a/nix/systems/sound.nix b/nix/systems/sound.nix
index 97f35ae..1badf4d 100644
--- a/nix/systems/sound.nix
+++ b/nix/systems/sound.nix
@@ -1,24 +1,15 @@
 { config, pkgs, ... }: {
 
   # enable sound
-  sound = {
-    enable = true;
-  };
+  sound.enable = true;
 
   # disable pulseaudio
-  hardware = {
-    pulseaudio = {
-      enable = false;
-    };
-  };
+  hardware.pulseaudio.enable = false;
 
   # enable pipewire
-  services.pipewire = {
-    enable       = true;
-    pulse.enable = true;
-    alsa = {
-      enable       = true;
-      support32Bit = true;
-    };
-  };
+  services.pipewire.enable            = true;
+  services.pipewire.pulse.enable      = true;
+  services.pipewire.alsa.enable       = true;
+  services.pipewire.alsa.support32Bit = true;
+
 }
diff --git a/nix/systems/steam.nix b/nix/systems/steam.nix
index 9cff6ab..c98d096 100644
--- a/nix/systems/steam.nix
+++ b/nix/systems/steam.nix
@@ -1,7 +1,6 @@
 { config, pkgs, ... }: {
 
   # steam
-  programs.steam = {
-    enable = true;
-  };
+  programs.steam.enable = true;
+
 }
diff --git a/nix/systems/virtualisation.nix b/nix/systems/virtualisation.nix
index 20cc2c6..4b0d42c 100644
--- a/nix/systems/virtualisation.nix
+++ b/nix/systems/virtualisation.nix
@@ -13,8 +13,8 @@
 
     # podman
     podman = {
-      enable       = true;
-      dockerCompat = true;
+      enable                              = true;
+      dockerCompat                        = true;
       defaultNetwork.settings.dns_enabled = true;
     };
   };