12 files changed, 8 insertions, 6 deletions
diff --git a/flake.nix b/flake.nix
index 0389bd86..f2038dad 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,18 +17,19 @@
   outputs = {
     self,
     nixpkgs,
+    home-manager,
     strip_js_comments,
     ...
-  } @ attrs: {
+  } @ inputs: {
     nixosConfigurations.Tiamat = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      specialArgs = attrs;
-      modules = [./hosts/Tiamat/configuration.nix];
+      specialArgs = inputs;
+      modules = [./hosts/desktop/configuration.nix];
     };
     nixosConfigurations.Apzu = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      specialArgs = attrs;
-      modules = [./hosts/Apzu/configuration.nix];
+      specialArgs = inputs;
+      modules = [./hosts/laptop/configuration.nix];
     };
   };
 }
diff --git a/home-manager/default.nix b/home-manager/default.nix
index ffec4ccc..54c29872 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -3,10 +3,11 @@
   config,
   pkgs,
   home-manager,
+  inputs,
   ...
 }: {
   imports = [
-    home-manager.nixosModules.home-manger
+    home-manager.nixosModules.home-manager
 
     ./alacritty
     ./cups
diff --git a/hosts/Apzu/configuration.nix b/hosts/desktop/configuration.nix
index 2a3812cf..2a3812cf 100644
--- a/hosts/Apzu/configuration.nix
+++ b/hosts/desktop/configuration.nix
diff --git a/hosts/Apzu/hardware/cpu.nix b/hosts/desktop/hardware/cpu.nix
index 6859f72a..6859f72a 100644
--- a/hosts/Apzu/hardware/cpu.nix
+++ b/hosts/desktop/hardware/cpu.nix
diff --git a/hosts/Apzu/hardware/default.nix b/hosts/desktop/hardware/default.nix
index bd7241b3..bd7241b3 100644
--- a/hosts/Apzu/hardware/default.nix
+++ b/hosts/desktop/hardware/default.nix
diff --git a/hosts/Apzu/hardware/gpu.nix b/hosts/desktop/hardware/gpu.nix
index 741e8882..741e8882 100644
--- a/hosts/Apzu/hardware/gpu.nix
+++ b/hosts/desktop/hardware/gpu.nix
diff --git a/hosts/Apzu/networking.nix b/hosts/desktop/networking.nix
index 17f7c356..17f7c356 100644
--- a/hosts/Apzu/networking.nix
+++ b/hosts/desktop/networking.nix
diff --git a/hosts/Tiamat/configuration.nix b/hosts/laptop/configuration.nix
index 8e78949b..8e78949b 100644
--- a/hosts/Tiamat/configuration.nix
+++ b/hosts/laptop/configuration.nix
diff --git a/hosts/Tiamat/hardware/cpu.nix b/hosts/laptop/hardware/cpu.nix
index 2d7232cd..2d7232cd 100644
--- a/hosts/Tiamat/hardware/cpu.nix
+++ b/hosts/laptop/hardware/cpu.nix
diff --git a/hosts/Tiamat/hardware/default.nix b/hosts/laptop/hardware/default.nix
index bd7241b3..bd7241b3 100644
--- a/hosts/Tiamat/hardware/default.nix
+++ b/hosts/laptop/hardware/default.nix
diff --git a/hosts/Tiamat/hardware/gpu.nix b/hosts/laptop/hardware/gpu.nix
index c3df51ae..c3df51ae 100644
--- a/hosts/Tiamat/hardware/gpu.nix
+++ b/hosts/laptop/hardware/gpu.nix
diff --git a/hosts/Tiamat/networking.nix b/hosts/laptop/networking.nix
index d50b3af1..d50b3af1 100644
--- a/hosts/Tiamat/networking.nix
+++ b/hosts/laptop/networking.nix