6 files changed, 72 insertions, 5 deletions
diff --git a/machines/betsy/configuration.nix b/machines/betsy/default.nix
index cebf038..244db6a 100644
--- a/machines/betsy/configuration.nix
+++ b/machines/betsy/default.nix
@@ -8,6 +8,17 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+
+      ../../modules/nixos/bluetooth.nix
+      ../../modules/nixos/nix-common.nix
+      ../../modules/nixos/environment.nix
+      ../../modules/nixos/tailscale.nix
+      ../../modules/nixos/system-packages.nix
+      ../../modules/nixos/services.nix
+
+      ../../modules/users/defin.nix
+      ../../modules/users/root.nix
+      ../../modules/users/jerry.nix
     ];
   boot = {
     loader = {
diff --git a/machines/bosco/configuration.nix b/machines/bosco/default.nix
index df03703..25221b1 100644
--- a/machines/bosco/configuration.nix
+++ b/machines/bosco/default.nix
@@ -8,6 +8,14 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+
+      ../../modules/nixos/nix-common.nix
+      ../../modules/nixos/environment.nix
+      ../../modules/nixos/tailscale.nix
+      ../../modules/nixos/cgit.nix
+      ../../modules/nixos/system-packages.nix
+      ../../modules/users/defin.nix
+      ../../modules/users/root.nix
     ];
 
   # Use the GRUB 2 boot loader.
diff --git a/machines/doretta/configuration.nix b/machines/doretta/default.nix
index 9640d7f..2b79a99 100644
--- a/machines/doretta/configuration.nix
+++ b/machines/doretta/default.nix
@@ -8,6 +8,15 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+
+      ../../modules/nixos/nix-common.nix
+      ../../modules/nixos/environment.nix
+      ../../modules/nixos/tailscale.nix
+      ../../modules/nixos/system-packages.nix
+
+      ../../modules/users/defin.nix
+      ../../modules/users/git.nix
+      ../../modules/users/root.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
diff --git a/machines/khad/configuration.nix b/machines/khad/default.nix
index 2aa7d51..f41eab8 100644
--- a/machines/khad/configuration.nix
+++ b/machines/khad/default.nix
@@ -5,10 +5,25 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+  imports = [ 
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+
+    ../../modules/users/defin.nix
+    ../../modules/users/root.nix
+
+    ../../modules/nixos/hyprland.nix
+
+    ../../modules/nixos/bluetooth.nix
+    ../../modules/nixos/environment.nix
+    ../../modules/nixos/kde-connect.nix
+    ../../modules/nixos/nix-common.nix
+    ../../modules/nixos/services.nix
+    ../../modules/nixos/tailscale.nix
+    ../../modules/nixos/steam.nix
+    # ../../modules/nixos/sway.nix
+    ../../modules/nixos/system-packages.nix
+  ];
 
   # Use the systemd-boot EFI boot loader.
   boot = {
diff --git a/machines/picast/configuration.nix b/machines/picast/default.nix
index 354d95b..e99a15b 100644
--- a/machines/picast/configuration.nix
+++ b/machines/picast/default.nix
@@ -8,6 +8,14 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+
+      ../../modules/nixos/nix-common.nix
+      ../../modules/nixos/environment.nix
+      ../../modules/nixos/tailscale.nix
+      ../../modules/nixos/cgit.nix
+      ../../modules/nixos/system-packages.nix
+      ../../modules/users/defin.nix
+      ../../modules/users/root.nix
     ];
 
   # Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
diff --git a/machines/zenbook/configuration.nix b/machines/zenbook/default.nix
index a6d389f..c2077e2 100644
--- a/machines/zenbook/configuration.nix
+++ b/machines/zenbook/default.nix
@@ -7,6 +7,22 @@
 {
   imports = [
     ./hardware-configuration.nix
+
+    ../../modules/users/defin.nix
+    ../../modules/users/root.nix
+
+    ../../modules/nixos/hyprland.nix
+
+    ../../modules/nixos/asus-numpad-touchpad.nix
+    ../../modules/nixos/bluetooth.nix
+    ../../modules/nixos/environment.nix
+    ../../modules/nixos/kde-connect.nix
+    ../../modules/nixos/nix-common.nix
+    ../../modules/nixos/services.nix
+    ../../modules/nixos/tailscale.nix
+    ../../modules/nixos/steam.nix
+    # ../..modules/nixos/sway.nix
+    ../../modules/nixos/system-packages.nix
   ];
 
   # Use the systemd-boot EFI boot loader.
@@ -27,7 +43,7 @@
 
   nixpkgs = {
     # texlive.combined.scheme-medium;
-    system = "x84_64-linux";
+    # system = "x84_64-linux";
     config.allowUnfree = true;
   };