diff --git a/config.org b/config.org
index 8fc5078..3ea0b9d 100644
--- a/config.org
+++ b/config.org
@@ -1146,6 +1146,12 @@ Setup formatting
 (after! lsp-haskell
   (setq lsp-haskell-formatting-provider "brittany"))
 #+end_src
+** CNC/3d Printing
+*** G-Code
+#+begin_src emacs-lisp
+(use-package! gcode-mode
+  :hook (gcode-mode . eldoc-mode))
+#+end_src
 * Composition
 Modes for handling plain text and prose
 ** Markdown
diff --git a/packages.el b/packages.el
index c39216a..5ee5217 100644
--- a/packages.el
+++ b/packages.el
@@ -67,10 +67,6 @@
 (package! websocket)
 (package! org-roam-ui)
 (package! edit-server)
-(package! idris2-mode :recipe
-  (:host github
-   :repo "idris-community/idris2-mode"
-   :branch "main"))
 (package! per-buffer-theme)
 (package! org-chef)
 (package! keychain-environment)
@@ -78,6 +74,15 @@
 (package! alert)
 (package! uuidgen)
 
+;;; Languages
+;; Idris2
+(package! idris2-mode :recipe
+  (:host github
+   :repo "idris-community/idris2-mode"
+   :branch "main"))
+;; G-Code
+(package! gcode-mode)
+
 ;; Unpin evil collection and use the latest
 ;;
 ;; This is to fix issues with mu4e 1.10, see