From 716e3734673c8dfb04a71aaa7e72ee574e757502 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Thu, 2 Dec 2021 19:40:17 +0100
Subject: [PATCH] Use forth-mode instead emacs forth support included with
 gforth

---
 flake.lock                      | 6 +++---
 modules/base/emacs/default.nix  | 4 +---
 modules/development/default.nix | 4 +---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6abdf2ec..5f0ad5fe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -42,11 +42,11 @@
     },
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1638410276,
-        "narHash": "sha256-t0CsOx6BbvPBtpYYHzEpIbmuwv56O6Asxo7rgrFp5pU=",
+        "lastModified": 1638438247,
+        "narHash": "sha256-unPY6/AfTZevP4Jdd+GnjmXQjGB/GT+mCKBsrl2gDLo=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "360f62afb63ddeb8d8d43547266dfd7f2e2d54eb",
+        "rev": "8c7c2f86ce9efef1e02a2710f9f803b029c57b73",
         "type": "github"
       },
       "original": {
diff --git a/modules/base/emacs/default.nix b/modules/base/emacs/default.nix
index 862565d3..baf5a05b 100644
--- a/modules/base/emacs/default.nix
+++ b/modules/base/emacs/default.nix
@@ -19,9 +19,7 @@
         package = pkgs.emacsPgtkGcc;
         alwaysEnsure = true;
         # mu4e is included in the mu package and should be used from there
-        extraEmacsPackages = epkgs:
-          (lib.optional config.chvp.graphical.mail.enable pkgs.mu) ++
-          (lib.optional config.chvp.development.enable pkgs.gforth);
+        extraEmacsPackages = epkgs: lib.optional config.chvp.graphical.mail.enable pkgs.mu;
       };
     };
   };
diff --git a/modules/development/default.nix b/modules/development/default.nix
index 443c1828..992896a2 100644
--- a/modules/development/default.nix
+++ b/modules/development/default.nix
@@ -42,9 +42,7 @@
             )
 
           ;; Forth syntax support
-          (use-package gforth
-            ;; Included in the gforth package, see emacs/default.nix
-            :ensure nil
+          (use-package forth-mode
             :mode ("\\.fs\\'" . forth-mode)
             :mode ("\\.fb\\'" . forth-block-mode)
           )