diff --git a/flake.nix b/flake.nix
index 671b182..6a2b0be 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,9 +69,10 @@
             };
         in
         {
-          photon = constructSystem {
-            hostname = "photon";
+          jeeves-jr = constructSystem {
+            hostname = "jeeves-jr";
             users = [
+              "richie"
               "alice"
               "dennis"
             ];
@@ -80,6 +81,16 @@
           palatine-hill = constructSystem {
             hostname = "palatine-hill";
             users = [
+              "richie"
+              "alice"
+              "dennis"
+            ];
+          };
+
+          photon = constructSystem {
+            hostname = "photon";
+            users = [
+              "richie"
               "alice"
               "dennis"
             ];
diff --git a/users/richie/default.nix b/users/richie/default.nix
new file mode 100644
index 0000000..aaac176
--- /dev/null
+++ b/users/richie/default.nix
@@ -0,0 +1,8 @@
+{ pkgs, lib, config, name, ... }:
+import ../default.nix {
+  inherit pkgs lib config name;
+  publicKeys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMtRuAqeERMet9sFh1NEkG+pHLq/JRAAGDtv29flXF59 Richie@tmmworkshop.com Desktop"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHJSlv8ujrMpr8qjpX2V+UBXSP5FGhM1l+/5aGnfb2MV Richie@tmmworkshop.com Laptop"
+  ];
+}
diff --git a/users/richie/home.nix b/users/richie/home.nix
new file mode 100644
index 0000000..51f0467
--- /dev/null
+++ b/users/richie/home.nix
@@ -0,0 +1,39 @@
+{ pkgs, ... }:
+
+{
+  home.username = "richie";
+  home.homeDirectory = "/home/richie";
+
+  home.packages = with pkgs; [
+    # Rust packages
+    topgrade
+    trunk
+    wasm-pack
+    cargo-watch
+    #pkgs.cargo-tarpaulin
+    cargo-generate
+    cargo-audit
+    cargo-update
+    diesel-cli
+    # gitoxide currently broke 09182023
+    gitoxide
+    tealdeer
+    helix
+
+    # nix specific packages
+    nil
+    nixfmt
+
+    # markdown
+    nodePackages.markdownlint-cli
+
+    # doom emacs dependencies
+    fd
+    ripgrep
+    clang
+  ];
+
+  programs.zsh.enable = true;
+
+  home.stateVersion = "23.11";
+}
diff --git a/users/richie/secrets.yaml b/users/richie/secrets.yaml
new file mode 100644
index 0000000..e69de29