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 0734164..3eb30a2 100644
--- a/marty-latitude.nix
+++ b/marty-latitude.nix
@@ -15,44 +15,35 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    # users = {
-    #   marty = ./nixos/modules/home.nix;
-    # };
+    users = {
+      marty = import ./modules/home.nix;
+    };
   };
 
   # PREVIOUSLY HARDWARE-CONFIGURATION.NIX
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ahci"
-    "usb_storage"
-    "sd_mod"
-    "rtsx_pci_sdmmc"
-  ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/757b8bfc-0b5d-4ec1-9ab7-7876848ae411";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/867e1bdf-87c8-4f74-9a9e-c2d897644518";
+      fsType = "ext4";
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/C8A8-A568";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/D9F7-437B";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/8dff6670-2f63-44e3-a2e5-1966ebbd4fbf"; }
     ];
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/a1838708-fb00-4ecb-8010-432d06182591"; }
-  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -64,5 +55,4 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
 }
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