diff --git a/pkgs/emacs/default.nix b/pkgs/emacs/default.nix
index d9da135..de72aa8 100644
--- a/pkgs/emacs/default.nix
+++ b/pkgs/emacs/default.nix
@@ -8,10 +8,10 @@ emacsWithPackages (
     with epkgs.melpaStablePackages; [ ]
   ) ++ (
     with epkgs.melpaPackages; [
+      # dirvish
       all-the-icons
       company
       dap-mode
-      # dirvish
       doom-modeline
       evil
       evil-collection
@@ -39,6 +39,7 @@ emacsWithPackages (
       purescript-mode
       rainbow-delimiters
       rainbow-identifiers
+      scad-mode
       sudo-utils
       treemacs
       treemacs-evil
diff --git a/users/ccr/default.nix b/users/ccr/default.nix
index 8998e19..ad23f44 100644
--- a/users/ccr/default.nix
+++ b/users/ccr/default.nix
@@ -26,6 +26,7 @@
       digikam
       rawtherapee
       freecad
+      openscad
       deploy-rs.deploy-rs
     ] ++
     (if !stdenv.hostPlatform.isAarch64 then [ wineWowPackages.full ] else [ ])
diff --git a/users/profiles/emacs/emacs.d/config/config-scad.el b/users/profiles/emacs/emacs.d/config/config-scad.el
new file mode 100644
index 0000000..709a125
--- /dev/null
+++ b/users/profiles/emacs/emacs.d/config/config-scad.el
@@ -0,0 +1,4 @@
+(use-package scad-mode
+  :mode "\\.scad\\'")
+
+(provide 'config-scad)
diff --git a/users/profiles/emacs/emacs.d/init.el b/users/profiles/emacs/emacs.d/init.el
index 290eef7..41119ea 100644
--- a/users/profiles/emacs/emacs.d/init.el
+++ b/users/profiles/emacs/emacs.d/init.el
@@ -26,5 +26,6 @@ Return nil if COMMAND is not found anywhere in `exec-path'."
 (require 'config-spelling)
 (require 'config-nix)
 (require 'config-purescript)
+(require 'config-scad)
 
 (server-start)