diff --git a/README.org b/README.org
index 37fe3af..d6f1c40 100644
--- a/README.org
+++ b/README.org
@@ -611,18 +611,19 @@ raspberry = nixpkgs.lib.nixosSystem {
     <<module-x11>>
     <<module-flakes>>
     <<module-cachix>>
-    inputs.home-manager.nixosModules.home-manager {
-      home-manager.useGlobalPkgs = true;
-      home-manager.useUserPackages = true;
-      home-manager.users.chris = {
-        imports = [
-          <<module-git>>
-          <<module-gpg>>
-          <<module-vim>>
-          <<module-gtk>>
-        ];
-      };
-    }
+    <<module-home-manager>>
+    # inputs.home-manager.nixosModules.home-manager {
+    #   home-manager.useGlobalPkgs = true;
+    #   home-manager.useUserPackages = true;
+    #   home-manager.users.chris = {
+    #     imports = [
+    #       <<module-git>>
+    #       <<module-gpg>>
+    #       <<module-vim>>
+    #       <<module-gtk>>
+    #     ];
+    #   };
+    # }
   ];
 };
 #+END_SRC
diff --git a/flake.nix b/flake.nix
index b0d5233..e770112 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,9 +82,22 @@
                 ./modules/gpg.nix
                 ./modules/vim.nix
                 ./modules/gtk.nix
+                ./modules/emacs.nix
               ];
             };
           }
+          # inputs.home-manager.nixosModules.home-manager {
+          #   home-manager.useGlobalPkgs = true;
+          #   home-manager.useUserPackages = true;
+          #   home-manager.users.chris = {
+          #     imports = [
+          #       ./modules/git.nix
+          #       ./modules/gpg.nix
+          #       ./modules/vim.nix
+          #       ./modules/gtk.nix
+          #     ];
+          #   };
+          # }
         ];
       };
       homecloud = nixpkgs.lib.nixosSystem {