diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index fde7e4c..cb1420a 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -1241,6 +1241,33 @@ Computing Environment".
      (add-hook 'html-mode-hook 'electric-pair-local-mode)
    #+END_SRC
 
+** CMake mode
+   :PROPERTIES:
+   :header-args: :tangle "init/oni-cmake-init.el"
+   :END:
+
+  #+BEGIN_SRC emacs-lisp :tangle yes
+    (with-eval-after-load 'cmake-mode (load "oni-cmake-init"))
+  #+END_SRC
+
+   Turn on extra font locking for function arguments etc.
+
+   #+BEGIN_SRC emacs-lisp
+     (add-hook 'cmake-mode-hook 'cmake-font-lock-activate)
+   #+END_SRC
+
+   Enable company mode for completions.
+
+   #+BEGIN_SRC emacs-lisp
+     (add-hook 'cmake-mode-hook 'company-mode)
+   #+END_SRC
+
+   Enable electric pairing.
+
+   #+BEGIN_SRC emacs-lisp
+     (add-hook 'cmake-mode-hook 'electric-pair-local-mode)
+   #+END_SRC
+
 * Applications
 
   - [[file:init/dired-init.org][Dired]] :: The Emacs file manager. Very powerful, and I don't use it