diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 140a77d..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/flake.nix b/flake.nix
index faad74d..0bd6ce0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -120,7 +120,7 @@
     # natalie's desktop computer
     nixosConfigurations.nixos = mkSystem "nixos" {
       userSettings = users.nmarks;
-      configDir = ./hosts/desktop;
+      configDir = ./hosts/natalie/desktop;
       system = "x86_64-linux";
       extraModules = [
         nixos-cosmic.nixosModules.default
@@ -129,20 +129,20 @@
     # natalie's laptop
     darwinConfigurations."Natalies-MacBook-Air" = mkSystem "Natalies-MacBook-Air" {
       userSettings = users.nmarks;
-      configDir = ./hosts/laptop;
+      configDir = ./hosts/natalie/laptop;
       system = "aarch64-darwin";
     };
 
     # chloe's mac studio "sandwich"
     darwinConfigurations.sandwich = mkSystem "sandwich" {
       userSettings = users.paper_clover;
-      configDir = ./hosts/laptop;
+      configDir = ./hosts/chloe;
       system = "aarch64-darwin";
     };
     # chloe's macbook air "paperback"
     darwinConfigurations.paperback = mkSystem "paperback" {
       userSettings = users.paper_clover;
-      configDir = ./hosts/laptop;
+      configDir = ./hosts/chloe;
       system = "aarch64-darwin";
     };
   };
diff --git a/hosts/.DS_Store b/hosts/.DS_Store
deleted file mode 100644
index 35fbfdb..0000000
Binary files a/hosts/.DS_Store and /dev/null differ
diff --git a/hosts/laptop/.DS_Store b/hosts/laptop/.DS_Store
deleted file mode 100644
index 4be084e..0000000
Binary files a/hosts/laptop/.DS_Store and /dev/null differ
diff --git a/hosts/laptop/configuration.nix b/users/chloe/configuration.nix
similarity index 100%
rename from hosts/laptop/configuration.nix
rename to users/chloe/configuration.nix
diff --git a/hosts/laptop/home.nix b/users/chloe/home.nix
similarity index 100%
rename from hosts/laptop/home.nix
rename to users/chloe/home.nix
diff --git a/hosts/desktop/configuration.nix b/users/natalie/desktop/configuration.nix
similarity index 100%
rename from hosts/desktop/configuration.nix
rename to users/natalie/desktop/configuration.nix
diff --git a/hosts/desktop/hardware-configuration.nix b/users/natalie/desktop/hardware-configuration.nix
similarity index 100%
rename from hosts/desktop/hardware-configuration.nix
rename to users/natalie/desktop/hardware-configuration.nix
diff --git a/hosts/desktop/home.nix b/users/natalie/desktop/home.nix
similarity index 100%
rename from hosts/desktop/home.nix
rename to users/natalie/desktop/home.nix
diff --git a/users/natalie/laptop/configuration.nix b/users/natalie/laptop/configuration.nix
new file mode 100644
index 0000000..3208c09
--- /dev/null
+++ b/users/natalie/laptop/configuration.nix
@@ -0,0 +1,28 @@
+{
+  pkgs,
+  userSettings,
+  ...
+}: {
+  environment.systemPackages = with pkgs; [
+    neovim
+    pinentry_mac
+    signal-desktop-bin
+  ];
+
+  # Create /etc/zshrc that loads the nix-darwin environment.
+  programs = {
+    gnupg.agent.enable = true;
+    zsh.enable = true; # default shell on catalina
+  };
+
+  # When opening an interactive shell that isnt fish move into fish
+  programs.zsh = {
+    interactiveShellInit = ''
+      if [[ $(${pkgs.procps}/bin/ps -p $PPID -o comm) != "fish" && -z ''${ZSH_EXUCTION_STRING} ]]
+      then
+        [[ -o login ]] && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+      fi
+    '';
+  };
+}
diff --git a/users/natalie/laptop/home.nix b/users/natalie/laptop/home.nix
new file mode 100644
index 0000000..f95fe9e
--- /dev/null
+++ b/users/natalie/laptop/home.nix
@@ -0,0 +1,29 @@
+{
+  inputs,
+  config,
+  pkgs,
+  lib,
+  userSettings,
+  systemSettings,
+  ...
+}: {
+  imports = [
+    inputs.nixvim.homeManagerModules.nixvim
+    #set up nixvim
+    # ../../modules/nixvim
+  ];
+  programs = import ../../modules/shared/homeManagerPrograms.nix {inherit inputs config pkgs lib userSettings systemSettings;};
+
+  home = {
+    inherit (userSettings) username;
+    # homeDirectory = systemSettings.homeConfig;
+    # shell = pkgs.fish;
+    stateVersion = "23.05"; # Please read the comment before changing.
+
+    packages = pkgs.callPackage ../../modules/shared/packages.nix {inherit systemSettings;};
+
+    sessionPath = [
+      "$HOME/.emacs.d/bin"
+    ];
+  };
+}