fix: refactor - make it beautiful!

modules/hardware/bluetooth.nix

@@ -1,6 +1,8 @@
 {
-  hardware.bluetooth.enable = true; # enables support for Bluetooth
-  hardware.bluetooth.powerOnBoot = false; # powers up the default Bluetooth controller on boot
+  hardware = {
+    bluetooth.enable = true; # enables support for Bluetooth
+    bluetooth.powerOnBoot = false; # powers up the default Bluetooth controller on boot
+  };
 
   services.blueman.enable = true; # provides blueman-applet and blueman-manager
 }

modules/hardware/default.nix

@@ -2,8 +2,9 @@
   imports = [
     ./bluetooth.nix
     ./fwupd.nix
-    ./scan_and_print.nix
-    #./trackpoint.nix
     ./gpu.nix
+    ./print.nix
+    ./scan.nix
+    #./trackpoint.nix
   ];
 }

modules/hardware/gpu.nix

@@ -1,6 +1,8 @@
 {pkgs, ...}: {
-  hardware.graphics.enable = true;
-  hardware.graphics.extraPackages = with pkgs; [
-    libvdpau-va-gl
-  ];
+  hardware.graphics = {
+    enable = true;
+    extraPackages = with pkgs; [
+      libvdpau-va-gl
+    ];
+  };
 }

modules/hardware/print.nix

@@ -0,0 +1,4 @@
+{
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+}

modules/hardware/scan.nix

@@ -0,0 +1,27 @@
+{pkgs, ...}: {
+  services.ipp-usb.enable = true; # enable usb support
+
+  hardware.sane = {
+    enable = true; # enables support for SANE scanners
+
+    backends-package = pkgs.sane-backends.overrideAttrs (old: {
+      configureFlags =
+        (old.configureFlags or [])
+        ++ [
+          # "--localstatedir=/var" # `sane-backends` puts e.g. lock files in here, must not be in /nix/store
+          # "--with-lockdir=/var/lock/sane" # `sane-backends` puts e.g. lock files in here, must not be in /nix/store
+
+          # Ugly workaround for https://github.com/NixOS/nixpkgs/issues/273280#issuecomment-1848873028
+          # Really we should make `sane-backends` be able to provide a real lock dir (e.g. `/var/lock/sane`).
+          "--disable-locking"
+        ];
+    });
+  };
+
+  users.users.ranomier.extraGroups = ["scanner" "lp"];
+
+  # only for the scan and maybe print clients
+  environment.systemPackages = with pkgs; [
+    simple-scan
+  ];
+}

modules/hardware/scan_and_print.nix

@@ -1,27 +0,0 @@
-{pkgs, ...}: {
-  hardware.sane.enable = true; # enables support for SANE scanners
-  services.ipp-usb.enable = true; # enable usb support
-
-  hardware.sane.backends-package = pkgs.sane-backends.overrideAttrs (old: {
-    configureFlags =
-      (old.configureFlags or [])
-      ++ [
-        # "--localstatedir=/var" # `sane-backends` puts e.g. lock files in here, must not be in /nix/store
-        # "--with-lockdir=/var/lock/sane" # `sane-backends` puts e.g. lock files in here, must not be in /nix/store
-
-        # Ugly workaround for https://github.com/NixOS/nixpkgs/issues/273280#issuecomment-1848873028
-        # Really we should make `sane-backends` be able to provide a real lock dir (e.g. `/var/lock/sane`).
-        "--disable-locking"
-      ];
-  });
-
-  users.users.ranomier.extraGroups = ["scanner" "lp"];
-
-  # only for the scan and maybe print clients
-  environment.systemPackages = with pkgs; [
-    simple-scan
-  ];
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-}