From 0b74600f84c457329e9bbf69d0ac533093659422 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Fri, 24 Sep 2021 13:26:43 +0200
Subject: [PATCH] Fix R mode not being enabled

---
 modules/development/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/development/default.nix b/modules/development/default.nix
index bf2231a3..74c9a77f 100644
--- a/modules/development/default.nix
+++ b/modules/development/default.nix
@@ -47,12 +47,6 @@
             :mode "\\.yaml\\'"
             )
 
-          ;; R language support
-          (use-package ess
-            :mode "\\.r\\'"
-            :mode "\\.R\\'"
-            )
-
           ;; Haskell language support
           (use-package haskell-mode
             :mode "\\.hs\\'"
@@ -62,6 +56,14 @@
           (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