diff --git a/hosts/pulsebert/default.nix b/hosts/pulsebert/default.nix
index 4a2ae502..c824008f 100644
--- a/hosts/pulsebert/default.nix
+++ b/hosts/pulsebert/default.nix
@@ -11,17 +11,21 @@ in {
     ./hardware-configuration.nix
   ];
 
-  boot.loader.grub.enable = false;
-  boot.loader.generic-extlinux-compatible.enable = false;
-  boot.loader.raspberryPi = {
-    enable = true;
-    version = 4;
-    uboot.enable = false;
-  };
-  #boot.kernelPackages = pkgs.linuxPackages_rpi4;
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot = {
+    loader = {
+      grub.enable = false;
+      generic-extlinux-compatible.enable = false;
+      raspberryPi = {
+        enable = true;
+        version = 4;
+        uboot.enable = false;
+      };
+    };
+    #kernelPackages = pkgs.linuxPackages_rpi4;
+    kernelPackages = pkgs.linuxPackages_latest;
 
-  boot.tmpOnTmpfs = true;
+    tmpOnTmpfs = true;
+  };
 
   c3d2 = {
     isInHq = true;
@@ -29,17 +33,22 @@ in {
     hq.interface = "eth0";
   };
 
-  nix.buildCores = 4;
-  nix.maxJobs = 4;
+  nix = {
+    buildCores = 4;
+    maxJobs = 4;
+  };
 
-  networking.hostName = "pulsebert"; # Define your hostname.
+  networking = {
+    hostName = "pulsebert"; # Define your hostname.
 
   # The global useDHCP flag is deprecated, therefore explicitly set to false here.
   # Per-interface useDHCP will be mandatory in the future, so this generated config
   # replicates the default behaviour.
-  networking.useDHCP = false;
-  networking.interfaces.eth0.useDHCP = true;
-  networking.interfaces.wlan0.useDHCP = true;
+    useDHCP = false;
+    interfaces.eth0.useDHCP = true;
+    interfaces.wlan0.useDHCP = true;
+    firewall.enable = false;
+  };
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
@@ -61,8 +70,10 @@ in {
   '';
 
   # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-  services.openssh.permitRootLogin = "yes";
+  services.openssh = {
+    enable = true;
+    permitRootLogin = "yes";
+  };
   security.sudo = {
     enable = true;
     wheelNeedsPassword = false;
@@ -73,8 +84,6 @@ in {
     extraGroups = [ "wheel" "audio" ];
   };
 
-  networking.firewall.enable = false;
-
   # Enable sound.
   sound.enable = true;
   hardware.bluetooth = {
@@ -108,9 +117,11 @@ in {
   # tell Avahi to publish CUPS and PulseAudio
   services.avahi = {
     enable = true;
-    publish.enable = true;
-    publish.addresses = true;
-    publish.userServices = true;
+    publish = {
+      enable = true;
+      addresses = true;
+      userServices = true;
+    };
   };
 
   security.acme = {
@@ -183,8 +194,7 @@ in {
   };
 
   # Allow access to printer serial port and GPIO
-  users.users.${config.services.octoprint.user}.extraGroups =
-    [ "dialout" "gpio" ];
+  users.users.${config.services.octoprint.user}.extraGroups = [ "dialout" "gpio" ];
 
   services.mjpg-streamer = {
     enable = true;
@@ -205,5 +215,4 @@ in {
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "20.09"; # Did you read the comment?
-
 }