diff --git a/thoom-emacs/.gitignore b/emacs/.gitignore
similarity index 100%
rename from thoom-emacs/.gitignore
rename to emacs/.gitignore
diff --git a/thoom-emacs/ThoomEmacs.org b/emacs/ThoomEmacs.org
similarity index 100%
rename from thoom-emacs/ThoomEmacs.org
rename to emacs/ThoomEmacs.org
diff --git a/thoom-emacs/backups/.gitkeep b/emacs/backups/.gitkeep
similarity index 100%
rename from thoom-emacs/backups/.gitkeep
rename to emacs/backups/.gitkeep
diff --git a/thoom-emacs/early-init.el b/emacs/early-init.el
similarity index 100%
rename from thoom-emacs/early-init.el
rename to emacs/early-init.el
diff --git a/thoom-emacs/init.el b/emacs/init.el
similarity index 100%
rename from thoom-emacs/init.el
rename to emacs/init.el
diff --git a/thoom-emacs/snippets/eshell-mode/for b/emacs/snippets/eshell-mode/for
similarity index 100%
rename from thoom-emacs/snippets/eshell-mode/for
rename to emacs/snippets/eshell-mode/for
diff --git a/thoom-emacs/snippets/org-mode/src b/emacs/snippets/org-mode/src
similarity index 100%
rename from thoom-emacs/snippets/org-mode/src
rename to emacs/snippets/org-mode/src
diff --git a/nix/modules/emacs.nix b/nix/modules/emacs.nix
index 4fbfdab..48d24c7 100644
--- a/nix/modules/emacs.nix
+++ b/nix/modules/emacs.nix
@@ -1,8 +1,6 @@
 { config, lib, pkgs, ... }:
 with config.lib.file;
-let dotdir = "${config.home.homeDirectory}/.dotfiles";
-    isOnMac = pkgs.stdenv.hostPlatform.isDarwin;
-    emacsWithPackages = (pkgs.emacsPackagesFor pkgs.emacs29).emacsWithPackages;
+let emacsWithPackages = (pkgs.emacsPackagesFor pkgs.emacs29).emacsWithPackages;
     aspell = (pkgs.aspellWithDicts (d: [d.en]));
 in
 {
@@ -15,12 +13,15 @@ in
       emacs-lsp-booster
       aspell
     ];
+    # Macs need coreutils for dired to work
     macPackages = basePackages ++ [ coreutils ];
   in
-    if isOnMac then macPackages else basePackages;
+    if pkgs.stdenv.hostPlatform.isDarwin
+    then macPackages else basePackages;
 
   xdg.configFile = {
-    "emacs".source = mkOutOfStoreSymlink "${dotdir}/thoom-emacs";
+    "emacs".source = mkOutOfStoreSymlink
+      "${config.home.homeDirectory}/.dotfiles/emacs";
   };
 
   # The aspell wrapper created by aspellWithDicts only wraps the