Refactor

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
+      ];
     };
   };
 

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;
     };
   };
 

hosts/nixedo/configuration.nix

@@ -33,10 +33,7 @@
   services.logind.lidSwitchExternalPower = "ignore";
 
   boot.loader = {
-    efi = {
-      canTouchEfiVariables = true;
-    };
-
+    efi.canTouchEfiVariables = true;
     systemd-boot.enable = true;
   };
 

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;
     };
   };
 

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;
     };
   };