feat(nixos): add machine module with virtualisation and usb options

nix/manifest.nix

@@ -2,8 +2,15 @@ let
   testCfg =
     { hostName, ... }:
     {
-      boot.loader.systemd-boot.enable = true;
       networking = { inherit hostName; };
+      machine = {
+        bluetooth.enable = true;
+        usb.automount = true;
+        virtualisation.podman = {
+          enable = true;
+          distrobox.enable = true;
+        };
+      };
     };
 in
 {

nix/modules/options/bluetooth.nix

@@ -1,16 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib.options) mkEnableOption;
-in
-{
-  flake.modules.nixos.default = {
-    options.bluetooth.enable = mkEnableOption "";
-    config = {
-      persistDirs = [ "/var/lib/bluetooth" ];
-      hardware.bluetooth = {
-        enable = true;
-        settings.General.Experimental = true;
-      };
-    };
-  };
-}

nix/modules/options/machine/default.nix

@@ -0,0 +1,37 @@
+{ lib, ... }:
+let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.modules) mkIf mkMerge;
+in
+{
+  flake.modules.nixos.default =
+    { config, ... }:
+    let
+      cfg = config.machine;
+    in
+    {
+      options.machine.bluetooth.enable = mkEnableOption "";
+      options.machine.usb.automount = mkEnableOption "";
+      config = mkMerge [
+        (mkIf cfg.usb.automount {
+          services.udisks2.enable = true;
+          home-manager.sharedModules = [
+            {
+              services.udiskie = {
+                enable = true;
+                automount = true;
+                notify = true;
+              };
+            }
+          ];
+        })
+        (mkIf cfg.bluetooth.enable {
+          persistDirs = [ "/var/lib/bluetooth" ];
+          hardware.bluetooth = {
+            enable = true;
+            settings.General.Experimental = true;
+          };
+        })
+      ];
+    };
+}

nix/modules/options/machine/virtualisation.nix

@@ -0,0 +1,36 @@
+{ lib, config, ... }:
+let
+  inherit (lib.modules) mkIf;
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.lists) optional;
+  inherit (config.flake.lib.modules) forAllUsers;
+in
+{
+  flake.modules.nixos.default =
+    { pkgs, config, ... }:
+    let
+      cfg = config.machine.virtualisation;
+    in
+    {
+      options.machine.virtualisation = {
+        podman.enable = mkEnableOption "";
+        podman.distrobox.enable = mkEnableOption "";
+      };
+      config = mkIf cfg.podman.enable {
+        virtualisation.containers.enable = true;
+        virtualisation.podman = {
+          enable = true;
+          dockerCompat = true;
+          defaultNetwork.settings.dns_enabled = true;
+        };
+        users.users = forAllUsers {
+          extraGroups = [ "podman" ];
+          autoSubUidGidRange = cfg.podman.distrobox.enable;
+        };
+        home-manager.sharedModules = optional cfg.podman.distrobox.enable {
+          home.packages = [ pkgs.distrobox ];
+          persistDirs = [ ".local/share/containers" ];
+        };
+      };
+    };
+}

nix/modules/options/virtualisation.nix

@@ -1,37 +0,0 @@
-{ lib, config, ... }:
-let
-  inherit (lib.modules) mkIf;
-  inherit (lib.options) mkEnableOption;
-  inherit (cfg.lib.modules) forAllUsers;
-  cfg = config.flake;
-in
-{
-  flake.modules.nixos.default =
-    { pkgs, config, ... }:
-    {
-      options = {
-        podman.enable = mkEnableOption "";
-        podman.distrobox.enable = mkEnableOption "";
-      };
-      config = mkIf config.podman.enable {
-        virtualisation = {
-          containers.enable = true;
-          podman = {
-            enable = true;
-            dockerCompat = true;
-            defaultNetwork.settings.dns_enabled = true;
-          };
-        };
-        users.users = forAllUsers {
-          extraGroups = [ "podman" ];
-          autoSubUidGidRange = true;
-        };
-        home-manager.sharedModules = [
-          {
-            home.packages = [ pkgs.distrobox ];
-            persistDirs = [ ".local/share/containers" ];
-          }
-        ];
-      };
-    };
-}