diff --git a/flake.nix b/flake.nix
index 5d4ff09..e06ab98 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,7 +25,7 @@
             ./marty-pc.nix
             ./configuration.nix
             ./user/marty.nix
-            home-manager.nixosModules.default
+            home-manager.nixosModules.home-manager
           ];
         };
         marty-server = nixpkgs.lib.nixosSystem {
@@ -34,7 +34,7 @@
             ./marty-server.nix
             ./configuration.nix
             ./user/marty.nix
-            home-manager.nixosModules.default
+            home-manager.nixosModules.home-manager
 
           ];
         };
@@ -44,7 +44,12 @@
             ./marty-latitude.nix
             ./configuration.nix
             ./user/marty.nix
-            home-manager.nixosModules.default
+            home-manager.nixosModules.home-manager
+            # {
+            #   home-manager.useGlobalPkgs = true;
+            #   home-manager.useUserPackages = true;
+            #   home-manager.users.marty = import ./config.nix/modules/home.nix
+            # }
 
           ];
         };
diff --git a/marty-latitude.nix b/marty-latitude.nix
index 77229f6..3eb30a2 100644
--- a/marty-latitude.nix
+++ b/marty-latitude.nix
@@ -15,9 +15,9 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    # users = {
-    #   marty = ./nixos/modules/home.nix;
-    # };
+    users = {
+      marty = import ./modules/home.nix;
+    };
   };
 
   # PREVIOUSLY HARDWARE-CONFIGURATION.NIX
diff --git a/marty-pc.nix b/marty-pc.nix
index c9e7bf8..f5bd0e0 100644
--- a/marty-pc.nix
+++ b/marty-pc.nix
@@ -22,9 +22,9 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    # users = {
-    #   marty = ./nixos/modules/home.nix;
-    # };
+    users = {
+      marty = import ./config.nix/modules/home.nix;
+    };
   };
 
   # PREVIOUSLY HARDWARE-CONFIGURATION.NIX
diff --git a/marty-server.nix b/marty-server.nix
index 02a2294..3732222 100644
--- a/marty-server.nix
+++ b/marty-server.nix
@@ -22,9 +22,9 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    # users = {
-    #   marty = ./nixos/modules/home.nix;
-    # };
+    users = {
+      marty = import ./config.nix/modules/home.nix;
+    };
   };
 
   # PREVIOUSLY HARDWARE-CONFIGURATION.NIX
diff --git a/modules/home.nix b/modules/home.nix
index be90d55..500efb6 100644
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -17,10 +17,12 @@
 
   # The home.packages option allows you to install Nix packages into your
   # environment.
-  home.packages = [
+  home.packages = with pkgs; [
     # # Adds the 'hello' command to your environment. It prints a friendly
     # # "Hello, world!" when run.
-    # pkgs.hello
+    hello
+    rbw
+    pinentry-curses
 
     # # It is sometimes useful to fine-tune packages, for example, by applying
     # # overrides. You can do that directly here, just don't forget the