Avoid repeated keys

modules/system/auto-gc.nix

@@ -3,11 +3,13 @@
   options.myConfig.auto-gc.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.myConfig.auto-gc.enable {
-    programs.nh.enable = true;
-    programs.nh.clean = {
+    programs.nh = {
       enable = true;
-      dates = "daily";
-      extraArgs = "--keep 10 --keep-since 3d";
+      clean = {
+        enable = true;
+        dates = "daily";
+        extraArgs = "--keep 10 --keep-since 3d";
+      };
     };
   };
 }

modules/system/bluetooth.nix

@@ -3,11 +3,14 @@
   options.myConfig.bluetooth.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.myConfig.bluetooth.enable {
-    hardware.bluetooth = {
-      enable = true;
-      powerOnBoot = true;
+    hardware = {
+      bluetooth = {
+        enable = true;
+        powerOnBoot = true;
+      };
+      logitech.wireless.enable = true;
     };
+
     services.blueman.enable = true;
-    hardware.logitech.wireless.enable = true;
   };
 }

modules/system/boot/loader.nix

@@ -3,15 +3,17 @@
   options.myConfig.boot.loader.systemd-boot.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.myConfig.boot.loader.systemd-boot.enable {
-    boot.tmp.cleanOnBoot = true;
-    boot.loader = {
-      systemd-boot = {
-        enable = true;
-        editor = false;
-        configurationLimit = 20;
+    boot = {
+      tmp.cleanOnBoot = true;
+      loader = {
+        systemd-boot = {
+          enable = true;
+          editor = false;
+          configurationLimit = 20;
+        };
+        efi.canTouchEfiVariables = true;
+        timeout = 0;
       };
-      efi.canTouchEfiVariables = true;
-      timeout = 0;
     };
     systemd.watchdog.rebootTime = "10";
   };

modules/system/boot/silent.nix

@@ -10,9 +10,11 @@
         "rd.udev.log_level=3"
         "udev.log_priority=3"
       ];
+      initrd = {
+        verbose = false;
+        systemd.enable = true;
+      };
       consoleLogLevel = 3;
-      initrd.verbose = false;
-      initrd.systemd.enable = true;
       plymouth.enable = true;
     };
   };

modules/system/comma.nix

@@ -13,8 +13,10 @@ in
   options.myConfig.comma.enable = lib.mkEnableOption "";
 
   config = {
-    programs.command-not-found.enable = !cfg.enable;
-    programs.nix-index.enable = cfg.enable;
-    programs.nix-index-database.comma.enable = cfg.enable;
+    programs = {
+      command-not-found.enable = !cfg.enable;
+      nix-index.enable = cfg.enable;
+      nix-index-database.comma.enable = cfg.enable;
+    };
   };
 }

modules/system/printing.nix

@@ -3,11 +3,13 @@
   options.myConfig.printing.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.myConfig.printing.enable {
-    services.printing.enable = true;
-    services.avahi = {
-      enable = true;
-      nssmdns4 = true;
-      openFirewall = true;
+    services = {
+      printing.enable = true;
+      avahi = {
+        enable = true;
+        nssmdns4 = true;
+        openFirewall = true;
+      };
     };
   };
 }

modules/system/sound.nix

@@ -8,9 +8,11 @@
     services.pipewire = {
       enable = true;
       wireplumber.enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
       pulse.enable = true;
+      alsa = {
+        enable = true;
+        support32Bit = true;
+      };
     };
   };
 }