diff --git a/home-manager/opdavies/PW05CH3L.nix b/home-manager/opdavies/PW05CH3L.nix
index 13391dcd..dbeb7c4c 100644
--- a/home-manager/opdavies/PW05CH3L.nix
+++ b/home-manager/opdavies/PW05CH3L.nix
@@ -9,11 +9,8 @@
       direnv.enable = true;
       fzf.enable = true;
 
-      git = {
-        enable = true;
-
-        user.emailAddress = "oliver.davies@tfw.wales";
-      };
+      git.enable = true;
+      git.user.emailAddress = "oliver.davies@tfw.wales";
 
       node.enable = true;
       notes.enable = true;
@@ -21,14 +18,11 @@
       starship.enable = true;
       tmux.enable = true;
 
-      tmux-sessionizer = {
-        enable = true;
-
-        searchPaths = [
-          "${config.xdg.userDirs.extraConfig.XDG_REPOS_DIR}:2"
-          "${config.xdg.userDirs.documents}:1"
-        ];
-      };
+      tmux-sessionizer.enable = true;
+      tmux-sessionizer.searchPaths = [
+        "${config.xdg.userDirs.extraConfig.XDG_REPOS_DIR}:2"
+        "${config.xdg.userDirs.documents}:1"
+      ];
 
       todos.enable = true;
       zsh.enable = true;
diff --git a/home-manager/opdavies/t480.nix b/home-manager/opdavies/t480.nix
index 60e9a725..a6346854 100644
--- a/home-manager/opdavies/t480.nix
+++ b/home-manager/opdavies/t480.nix
@@ -13,41 +13,32 @@
       direnv.enable = true;
       fzf.enable = true;
 
-      git = {
-        enable = true;
-
-        user.emailAddress = "oliver@oliverdavies.uk";
-      };
+      git.enable = true;
+      git.user.emailAddress = "oliver@oliverdavies.uk";
 
       node.enable = true;
 
-      notes = {
-        enable = true;
-
-        directory = "${config.xdg.userDirs.documents}/wiki/notes";
-      };
+      notes.enable = true;
+      notes.directory = "${config.xdg.userDirs.documents}/wiki/notes";
 
       ranger.enable = true;
       sxhkd.enable = true;
       starship.enable = true;
       tmux.enable = true;
 
-      tmux-sessionizer = {
-        enable = true;
-        enableDmenuIntegration = true;
+      tmux-sessionizer.enable = true;
 
-        searchPaths =
-          let
-            inherit (config.xdg.userDirs) documents extraConfig;
+      tmux-sessionizer.searchPaths =
+        let
+          inherit (config.xdg.userDirs) documents extraConfig;
 
-            repos = extraConfig.XDG_REPOS_DIR;
-          in
-          [
-            repos
-            "${repos}/*"
-            documents
-          ];
-      };
+          repos = extraConfig.XDG_REPOS_DIR;
+        in
+        [
+          repos
+          "${repos}/*"
+          documents
+        ];
 
       todos.enable = true;
       zsh.enable = true;
@@ -62,11 +53,8 @@
       browsers = {
         chromium.enable = true;
 
-        firefox = {
-          enable = true;
-
-          homepageUrl = "https://nixedo.oliverdavies.uk";
-        };
+        firefox.enable = true;
+        firefox.homepageUrl = "https://nixedo.oliverdavies.uk";
 
         qutebrowser.enable = true;
       };
diff --git a/hosts/PW05CH3L/configuration.nix b/hosts/PW05CH3L/configuration.nix
index 7d0d8495..c72ecf97 100644
--- a/hosts/PW05CH3L/configuration.nix
+++ b/hosts/PW05CH3L/configuration.nix
@@ -15,13 +15,10 @@
     cli = {
       docker.enable = true;
 
-      password-store = {
-        enable = true;
-
-        extensions = with pkgs.passExtensions; [
-          pass-otp
-        ];
-      };
+      password-store.enable = true;
+      password-store.extensions = with pkgs.passExtensions; [
+        pass-otp
+      ];
     };
   };
 
diff --git a/hosts/lemp11/configuration.nix b/hosts/lemp11/configuration.nix
index 5c2d84b6..ef50aff1 100644
--- a/hosts/lemp11/configuration.nix
+++ b/hosts/lemp11/configuration.nix
@@ -32,15 +32,11 @@
   # Bootloader.
   boot = {
     loader = {
-      systemd-boot = {
-        enable = true;
-        configurationLimit = 25;
-      };
+      efi.canTouchEfiVariables = true;
+      efi.efiSysMountPoint = "/boot/efi";
 
-      efi = {
-        canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot/efi";
-      };
+      systemd-boot.enable = true;
+      systemd-boot.configurationLimit = 25;
     };
   };
 
diff --git a/hosts/nixedo/configuration.nix b/hosts/nixedo/configuration.nix
index b3bc1280..1eafd624 100644
--- a/hosts/nixedo/configuration.nix
+++ b/hosts/nixedo/configuration.nix
@@ -33,10 +33,7 @@
   services.logind.lidSwitchExternalPower = "ignore";
 
   boot.loader = {
-    efi = {
-      canTouchEfiVariables = true;
-    };
-
+    efi.canTouchEfiVariables = true;
     systemd-boot.enable = true;
   };
 
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index d8dedcd1..6abf2f5d 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -21,23 +21,17 @@
 
   features = {
     cli = {
-      kanata = {
-        enable = true;
+      kanata.enable = true;
+      kanata.devices = [
+        "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
+      ];
 
-        devices = [
-          "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
-        ];
-      };
-
-      password-store = {
-        enable = true;
-
-        extensions = with pkgs.passExtensions; [
-          pass-audit
-          pass-otp
-          pass-update
-        ];
-      };
+      password-store.enable = true;
+      password-store.extensions = with pkgs.passExtensions; [
+        pass-audit
+        pass-otp
+        pass-update
+      ];
     };
 
     core = {
@@ -73,14 +67,10 @@
 
   boot = {
     loader = {
-      systemd-boot = {
-        enable = true;
-        configurationLimit = 10;
-      };
+      systemd-boot.enable = true;
+      systemd-boot.configurationLimit = 10;
 
-      efi = {
-        canTouchEfiVariables = true;
-      };
+      efi.canTouchEfiVariables = true;
     };
   };
 
diff --git a/hosts/t490/configuration.nix b/hosts/t490/configuration.nix
index 873e0a07..92a9aee5 100644
--- a/hosts/t490/configuration.nix
+++ b/hosts/t490/configuration.nix
@@ -17,11 +17,8 @@
   ];
 
   features = {
-    core = {
-      bluetooth.enable = true;
-      zram.enable = true;
-    };
-
+    core.bluetooth.enable = true;
+    core.zram.enable = true;
     desktop.dconf.enable = true;
   };
 
@@ -29,14 +26,10 @@
 
   boot = {
     loader = {
-      systemd-boot = {
-        enable = true;
-        configurationLimit = 10;
-      };
+      efi.canTouchEfiVariables = true;
 
-      efi = {
-        canTouchEfiVariables = true;
-      };
+      systemd-boot.enable = true;
+      systemd-boot.configurationLimit = 10;
     };
   };