diff --git a/hosts/glotzbert/default.nix b/hosts/glotzbert/default.nix
index 43262239..8d47e117 100644
--- a/hosts/glotzbert/default.nix
+++ b/hosts/glotzbert/default.nix
@@ -15,7 +15,6 @@
   nixpkgs.config.allowUnfree = true;
 
   nix = {
-    useSandbox = true;
     buildCores = 4;
     maxJobs = 4;
   };
@@ -30,17 +29,16 @@
     kernelPackages = pkgs.linuxPackages_latest;
   };
 
-  networking.hostName = "glotzbert"; # Define your hostname.
-  networking.interfaces.eno1.useDHCP = true;
+  networking = {
+    hostName = "glotzbert";
+    interfaces.eno1.useDHCP = true;
+  };
 
-  # Select internationalisation properties.
   console = {
     font = "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
     keyMap = "de";
   };
 
-  i18n.defaultLocale = "en_US.UTF-8";
-
   environment.systemPackages = with pkgs; [
     screen
     chromium
@@ -62,14 +60,11 @@
     };
   };
 
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-
-  # Or disable the firewall altogether.
+  # TODO: enable
   networking.firewall.enable = false;
 
-  # Enable sound.
   sound.enable = true;
+
   hardware.pulseaudio = {
     enable = true;
     # Users must be in "audio" group
@@ -91,25 +86,24 @@
     '';
   };
 
-  # Enable the X11 windowing system.
-  services.xserver = {
-    enable = true;
-    layout = "de";
-    xkbOptions = "eurosign:e";
-  };
+  services = {
+    xserver = {
+      enable = true;
+      layout = "de";
+      xkbOptions = "eurosign:e";
 
-  services.xserver = {
-    displayManager = {
-      lightdm = { enable = true; };
-      autoLogin = {
-        enable = true;
-        user = "k-ot";
+      displayManager = {
+        lightdm = { enable = true; };
+        autoLogin = {
+          enable = true;
+          user = "k-ot";
+        };
+        defaultSession = "gnome-xorg";
+      };
+      desktopManager = {
+        gnome.enable = true;
+        kodi.enable = true;
       };
-      defaultSession = "gnome-xorg";
-    };
-    desktopManager = {
-      gnome.enable = true;
-      kodi.enable = true;
     };
   };