diff --git a/hmModules/vanilla-emacs/default.nix b/hmModules/vanilla-emacs/default.nix
new file mode 100644
index 0000000..e50e778
--- /dev/null
+++ b/hmModules/vanilla-emacs/default.nix
@@ -0,0 +1,61 @@
+{
+  config,
+  pkgs,
+  ...
+}: let
+  # use same version as Doom Emacs
+  vanillaEmacs = (pkgs.emacsPackagesFor config.programs.doom-emacs.emacsPackage).emacsWithPackages (epkgs:
+    with epkgs; [
+      meow
+      ef-themes
+      vertico
+      marginalia
+      consult
+      orderless
+      embark
+      embark-consult
+      fira-code-mode
+      vterm
+      setup
+      magit
+      magit-delta
+      # git-gutter
+      # git-gutter-fringe
+      corfu
+      corfu-terminal
+      cape
+      which-key
+      nix-mode
+      envrc
+      flycheck
+      flycheck-posframe
+      flycheck-inline
+      consult-flycheck
+      popper
+      # choose one
+      lispy
+      paredit
+      tree-sitter
+      tree-sitter-langs
+      yaml-mode
+      hl-todo
+    ]);
+  vanillaEmacsBin = pkgs.writeScriptBin "vanillaEmacs" ''
+    ${vanillaEmacs}/bin/emacs --init-directory ~/.vanilla-emacs.d $@
+  '';
+in {
+  home.packages = [
+    vanillaEmacsBin
+
+    (
+      pkgs.makeDesktopItem {
+        name = "vanilla-emacs";
+        exec = "vanillaEmacs %u";
+        comment = "Vanilla Emacs";
+        desktopName = "vanilla-emacs";
+        type = "Application";
+        mimeTypes = [];
+      }
+    )
+  ];
+}
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index e514132..4c2fca7 100644
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -35,12 +35,12 @@
     enable = true;
     autologin = true;
     modules = [
-      "chrome"
       "cura"
       "digikam"
       "discord"
       "element"
       "emacs"
+      "vanilla-emacs"
       "email"
       "firefox"
       "git"
@@ -48,6 +48,7 @@
       "helix"
       "mopidy"
       "mpv"
+      "openscad"
       "password-store"
       "qutebrowser"
       "shell"
@@ -57,6 +58,7 @@
       "vscode"
       "xdg"
       "zathura"
+      "chrome"
     ];
     packages = with pkgs; [
       comma