diff --git a/home-manager/chat.nix b/home-manager/chat.nix
index 25fcf22..0b9cd4a 100644
--- a/home-manager/chat.nix
+++ b/home-manager/chat.nix
@@ -1,5 +1,14 @@
-{ config, pkgs, ... }:
 {
+  self,
+  config,
+  pkgs,
+  ...
+}:
+{
+  imports = [
+    self.homeManagerModules.dotfiles
+  ];
+
   home.packages = with pkgs; [ senpai ];
 
   xdg.configFile."senpai".source = "${config.dotfiles.path}/.config/senpai";
diff --git a/home-manager/cli.nix b/home-manager/cli.nix
index 4c69be3..a6501be 100644
--- a/home-manager/cli.nix
+++ b/home-manager/cli.nix
@@ -1,5 +1,14 @@
-{ config, pkgs, ... }:
 {
+  self,
+  config,
+  pkgs,
+  ...
+}:
+{
+  imports = [
+    self.homeManagerModules.dotfiles
+  ];
+
   home.packages = with pkgs; [
     bottom
     btop
diff --git a/home-manager/desktop/ignis.nix b/home-manager/desktop/ignis.nix
index bd5bbd6..f81ebb6 100644
--- a/home-manager/desktop/ignis.nix
+++ b/home-manager/desktop/ignis.nix
@@ -1,6 +1,12 @@
-{ config, inputs, ... }:
+{
+  self,
+  config,
+  inputs,
+  ...
+}:
 {
   imports = [
+    self.homeManagerModules.dotfiles
     inputs.ignis.homeManagerModules.default
   ];
 
diff --git a/home-manager/desktop/niri.nix b/home-manager/desktop/niri.nix
index f841b0d..5f0001d 100644
--- a/home-manager/desktop/niri.nix
+++ b/home-manager/desktop/niri.nix
@@ -1,6 +1,7 @@
-{ config, ... }:
+{ self, config, ... }:
 {
   imports = [
+    self.homeManagerModules.dotfiles
     ./ignis.nix
   ];
 
diff --git a/home-manager/desktop/sway.nix b/home-manager/desktop/sway.nix
index 7fb12ef..36ba075 100644
--- a/home-manager/desktop/sway.nix
+++ b/home-manager/desktop/sway.nix
@@ -1,5 +1,14 @@
-{ config, pkgs, ... }:
 {
+  self,
+  config,
+  pkgs,
+  ...
+}:
+{
+  imports = [
+    self.homeManagerModules.dotfiles
+  ];
+
   home.packages = with pkgs; [
     alacritty
     ghostty
diff --git a/home-manager/dev.nix b/home-manager/dev.nix
index 79c3eba..3822de1 100644
--- a/home-manager/dev.nix
+++ b/home-manager/dev.nix
@@ -1,5 +1,16 @@
-{ config, pkgs, ... }:
 {
+  self,
+  config,
+  pkgs,
+  ...
+}:
+{
+  imports = [
+    ./cli.nix
+    ./helix.nix
+    self.homeManagerModules.dotfiles
+  ];
+
   home.packages = with pkgs; [
     direnv
     hut
diff --git a/home-manager/flake-module.nix b/home-manager/flake-module.nix
new file mode 100644
index 0000000..4909227
--- /dev/null
+++ b/home-manager/flake-module.nix
@@ -0,0 +1,5 @@
+{
+  flake.homeManagerModules = {
+    dotfiles.imports = [ ./dotfiles.nix ];
+  };
+}
diff --git a/home-manager/helix.nix b/home-manager/helix.nix
index af7f411..03241f1 100644
--- a/home-manager/helix.nix
+++ b/home-manager/helix.nix
@@ -1,6 +1,14 @@
-{ config, pkgs, ... }:
-
 {
+  self,
+  config,
+  pkgs,
+  ...
+}:
+{
+  imports = [
+    self.homeManagerModules.dotfiles
+  ];
+
   home.packages = [ pkgs.helix ];
 
   programs.helix = {
diff --git a/machines/haze/configuration.nix b/machines/haze/configuration.nix
index f722e53..f68a00b 100644
--- a/machines/haze/configuration.nix
+++ b/machines/haze/configuration.nix
@@ -17,13 +17,17 @@
     ../../system
 
     self.nixosModules.desktop
+    self.nixosModules.nix-defaults
 
     self.inputs.home-manager.nixosModules.home-manager
     {
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
       home-manager.users.rpqt = ./home.nix;
-      home-manager.extraSpecialArgs = { inherit (self) inputs; };
+      home-manager.extraSpecialArgs = {
+        inherit (self) inputs;
+        inherit self;
+      };
     }
   ];
 
diff --git a/machines/haze/home.nix b/machines/haze/home.nix
index ac870ad..ebd05fb 100644
--- a/machines/haze/home.nix
+++ b/machines/haze/home.nix
@@ -1,11 +1,9 @@
 {
   imports = [
     ../../home-manager/chat.nix
-    ../../home-manager/cli.nix
     ../../home-manager/common.nix
     ../../home-manager/desktop
     ../../home-manager/dev.nix
-    ../../home-manager/dotfiles.nix
     ../../home-manager/helix.nix
     ../../home-manager/mail
     ../../home-manager/minecraft.nix