diff --git a/ci-builds.nix b/ci-builds.nix
index 01f014da4..1f4f96765 100644
--- a/ci-builds.nix
+++ b/ci-builds.nix
@@ -24,12 +24,12 @@ with (import ./default.nix {}); [
   third_party.lisp # will build all third-party libraries
   third_party.nix
   tools.cheddar
-  tools.emacs
   web.blog
   web.cgit-taz
   web.tvl
 
   # tazjin's personal things
+  users.tazjin.emacs
   users.tazjin.nixos.camdenSystem
   users.tazjin.nixos.frogSystem
 ]
diff --git a/tools/emacs/.gitignore b/users/tazjin/emacs/.gitignore
similarity index 100%
rename from tools/emacs/.gitignore
rename to users/tazjin/emacs/.gitignore
diff --git a/tools/emacs/README.md b/users/tazjin/emacs/README.md
similarity index 100%
rename from tools/emacs/README.md
rename to users/tazjin/emacs/README.md
diff --git a/tools/emacs/config/bindings.el b/users/tazjin/emacs/config/bindings.el
similarity index 100%
rename from tools/emacs/config/bindings.el
rename to users/tazjin/emacs/config/bindings.el
diff --git a/tools/emacs/config/custom.el b/users/tazjin/emacs/config/custom.el
similarity index 100%
rename from tools/emacs/config/custom.el
rename to users/tazjin/emacs/config/custom.el
diff --git a/tools/emacs/config/desktop.el b/users/tazjin/emacs/config/desktop.el
similarity index 100%
rename from tools/emacs/config/desktop.el
rename to users/tazjin/emacs/config/desktop.el
diff --git a/tools/emacs/config/eshell-setup.el b/users/tazjin/emacs/config/eshell-setup.el
similarity index 100%
rename from tools/emacs/config/eshell-setup.el
rename to users/tazjin/emacs/config/eshell-setup.el
diff --git a/tools/emacs/config/functions.el b/users/tazjin/emacs/config/functions.el
similarity index 100%
rename from tools/emacs/config/functions.el
rename to users/tazjin/emacs/config/functions.el
diff --git a/tools/emacs/config/init.el b/users/tazjin/emacs/config/init.el
similarity index 100%
rename from tools/emacs/config/init.el
rename to users/tazjin/emacs/config/init.el
diff --git a/tools/emacs/config/look-and-feel.el b/users/tazjin/emacs/config/look-and-feel.el
similarity index 100%
rename from tools/emacs/config/look-and-feel.el
rename to users/tazjin/emacs/config/look-and-feel.el
diff --git a/tools/emacs/config/mail-setup.el b/users/tazjin/emacs/config/mail-setup.el
similarity index 100%
rename from tools/emacs/config/mail-setup.el
rename to users/tazjin/emacs/config/mail-setup.el
diff --git a/tools/emacs/config/modes.el b/users/tazjin/emacs/config/modes.el
similarity index 100%
rename from tools/emacs/config/modes.el
rename to users/tazjin/emacs/config/modes.el
diff --git a/tools/emacs/config/settings.el b/users/tazjin/emacs/config/settings.el
similarity index 100%
rename from tools/emacs/config/settings.el
rename to users/tazjin/emacs/config/settings.el
diff --git a/tools/emacs/default.nix b/users/tazjin/emacs/default.nix
similarity index 100%
rename from tools/emacs/default.nix
rename to users/tazjin/emacs/default.nix
diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix
index 7da724d9c..3b99f082f 100644
--- a/users/tazjin/nixos/frog/default.nix
+++ b/users/tazjin/nixos/frog/default.nix
@@ -9,7 +9,7 @@ config: let
 
   # add google-c-style here because other machines get it from, eh,
   # elsewhere.
-  frogEmacs = (depot.tools.emacs.overrideEmacs(epkgs: epkgs ++ [
+  frogEmacs = (depot.users.tazjin.emacs.overrideEmacs(epkgs: epkgs ++ [
     depot.third_party.emacsPackages.google-c-style
   ]));
 in depot.lib.fix(self: {