From 9de1466713ffad8f75feff690cc5fe4eaecf1b74 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Fri, 8 Oct 2021 17:09:16 +0200
Subject: [PATCH] More emacs changes

---
 modules/base/emacs/base-init.el |  4 ++++
 modules/development/default.nix | 33 +++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/modules/base/emacs/base-init.el b/modules/base/emacs/base-init.el
index 581045cb..f0f8486b 100644
--- a/modules/base/emacs/base-init.el
+++ b/modules/base/emacs/base-init.el
@@ -211,6 +211,10 @@
   (run-at-time t 300 'prescient--save)
   )
 
+;; Rainbow delimiters
+(use-package rainbow-delimiters
+  :hook (prog-mode . rainbow-delimiters-mode))
+
 ;; List item selection interface
 (use-package selectrum
   :custom (selectrum-max-window-height 20 "Allow selector to be a bit higher")
diff --git a/modules/development/default.nix b/modules/development/default.nix
index 74c9a77f..061d6bfe 100644
--- a/modules/development/default.nix
+++ b/modules/development/default.nix
@@ -22,6 +22,14 @@
             :custom (editorconfig-get-properties-function 'editorconfig-get-properties)
             :config (editorconfig-mode 1)
             )
+
+          ;; R syntax support
+          (use-package ess
+            :init
+            (load "ess-autoloads")
+            :mode ("\\.r\\'" . ess-r-mode)
+            :mode ("\\.R\\'" . ess-r-mode)
+            )
           
           ;; Language server support
           (use-package lsp-mode
@@ -40,30 +48,21 @@
             :mode ("\\.md\\'" . markdown-mode)
             :mode ("\\.markdown\\'" . markdown-mode)
             )
-          
-          ;; YAML syntax support
-          (use-package yaml-mode
-            :mode "\\.yml\\'"
-            :mode "\\.yaml\\'"
-            )
 
           ;; Haskell language support
           (use-package haskell-mode
             :mode "\\.hs\\'"
             )
 
+          ;; Folding
+          (use-package origami
+            :hook (prog-mode . origami-mode)
+            )
+
           ;; Python syntax support
           (use-package python-mode
             :mode "\\.py\\'"
             )
-
-          ;; R syntax support
-          (use-package ess
-            :init
-            (load "ess-autoloads")
-            :mode ("\\.r\\'" . ess-r-mode)
-            :mode ("\\.R\\'" . ess-r-mode)
-            )
           
           ;; Ruby language support
           (use-package ruby-mode
@@ -94,6 +93,12 @@
             :mode "\\.html\\'"
             :mode "\\.html\\.erb\\'"
             )
+
+          ;; YAML syntax support
+          (use-package yaml-mode
+            :mode "\\.yml\\'"
+            :mode "\\.yaml\\'"
+            )
         ''
       ];
       development = {