diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index f6efb0ef..1cff57a0 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -31,6 +31,12 @@ in
   networking.networkmanager.enable = true;
   networking.firewall.enable = false;
 
+  # Audio
+  sound.enable = true;
+  hardware.pulseaudio.enable = true;
+
+  hardware.opengl.driSupport32Bit = true;
+
   i18n = {
     consoleKeyMap = "us";
     defaultLocale = "en_US.UTF-8";
@@ -221,9 +227,9 @@ in
       source /etc/profile
     '';
 
-
   programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
   programs.adb.enable = true;
+
   services.openssh.enable = true;
   services.avahi = {
     enable = true;
@@ -236,9 +242,6 @@ in
   };
   services.gnome3.at-spi2-core.enable = true;
   services.kbfs.enable = true;
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-
   services.xserver = {
     exportConfiguration = true;
     enable = true;
@@ -275,8 +278,6 @@ in
 
   };
 
-  hardware.opengl.driSupport32Bit = true;
-
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.extraUsers = let
     extraGroups = [