3 files changed, 46 insertions, 47 deletions
diff --git a/modules/hosts/adam/flake-parts.nix b/modules/hosts/adam/flake-parts.nix
index 9f23227..b191c59 100644
--- a/modules/hosts/adam/flake-parts.nix
+++ b/modules/hosts/adam/flake-parts.nix
@@ -2,13 +2,14 @@
 {
   flake.nixosConfigurations."adam" = inputs.nixpkgs.lib.nixosSystem {
     specialArgs = { inherit inputs; };
-    modules = [
-      inputs.self.modules.nixos.adam
-      inputs.self.modules.nixos.home-manager
-      inputs.self.modules.nixos.plymouth
-      inputs.self.modules.nixos.kde
-      inputs.self.modules.nixos.dns
-      inputs.self.modules.nixos.bluetooth
+    modules = with inputs.self.modules.nixos; [
+      adam
+      home-manager
+      plymouth
+      kde
+      dns
+      bluetooth
+      mullvad-vpn
     ];
   };
 }
diff --git a/modules/hosts/lilith/flake-parts.nix b/modules/hosts/lilith/flake-parts.nix
index 51aa5e3..a70c471 100644
--- a/modules/hosts/lilith/flake-parts.nix
+++ b/modules/hosts/lilith/flake-parts.nix
@@ -7,10 +7,10 @@
   flake.darwinConfigurations.lilith = inputs.nix-darwin.lib.darwinSystem {
     specialArgs = { inherit inputs; };
     system = "aarch64-darwin";
-    modules = [
-      inputs.self.modules.darwin.lilith
-      inputs.self.modules.darwin.dns
-      inputs.self.modules.darwin.home-manager
+    modules = with inputs.self.modules.darwin; [
+      lilith
+      dns
+      home-manager
     ];
   };
 }
diff --git a/modules/hosts/sachiel/hardware-configuration.nix b/modules/hosts/sachiel/hardware-configuration.nix
index e188fae..4768a03 100644
--- a/modules/hosts/sachiel/hardware-configuration.nix
+++ b/modules/hosts/sachiel/hardware-configuration.nix
@@ -1,39 +1,37 @@
 {
-  flake.modules.nixos.sachiel =
-    { ... }:
-    {
-      boot.loader.grub = {
-        efiSupport = true;
-        efiInstallAsRemovable = true;
-        device = "nodev";
-      };
-      fileSystems."/boot" = {
-        device = "/dev/disk/by-uuid/4E07-7ABB";
-        fsType = "vfat";
-      };
-      boot.initrd.availableKernelModules = [
-        "ata_piix"
-        "uhci_hcd"
-        "xen_blkfront"
-        "vmw_pvscsi"
-        "virtio_net"
-        "virtio_pci"
-        "virtio_mmio"
-        "virtio_blk"
-        "virtio_scsi"
-        "9p"
-        "9pnet_virtio"
-      ];
-      boot.initrd.kernelModules = [
-        "nvme"
-        "virtio_balloon"
-        "virtio_console"
-        "virtio_rng"
-        "virtio_gpu"
-      ];
-      fileSystems."/" = {
-        device = "/dev/vda1";
-        fsType = "ext4";
-      };
+  flake.modules.nixos.sachiel = {
+    boot.loader.grub = {
+      efiSupport = true;
+      efiInstallAsRemovable = true;
+      device = "nodev";
     };
+    fileSystems."/boot" = {
+      device = "/dev/disk/by-uuid/4E07-7ABB";
+      fsType = "vfat";
+    };
+    boot.initrd.availableKernelModules = [
+      "ata_piix"
+      "uhci_hcd"
+      "xen_blkfront"
+      "vmw_pvscsi"
+      "virtio_net"
+      "virtio_pci"
+      "virtio_mmio"
+      "virtio_blk"
+      "virtio_scsi"
+      "9p"
+      "9pnet_virtio"
+    ];
+    boot.initrd.kernelModules = [
+      "nvme"
+      "virtio_balloon"
+      "virtio_console"
+      "virtio_rng"
+      "virtio_gpu"
+    ];
+    fileSystems."/" = {
+      device = "/dev/vda1";
+      fsType = "ext4";
+    };
+  };
 }