restructure home-manager modules

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;
+      };
     }
   ];
 

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