Use forth-mode instead emacs forth support included with gforth

This commit is contained in:
Charlotte Van Petegem 2021-12-02 19:40:17 +01:00
parent 21b42dd609
commit 716e373467
No known key found for this signature in database
GPG key ID: 019E764B7184435A
3 changed files with 5 additions and 9 deletions

6
flake.lock generated
View file

@ -42,11 +42,11 @@
}, },
"emacs-overlay": { "emacs-overlay": {
"locked": { "locked": {
"lastModified": 1638410276, "lastModified": 1638438247,
"narHash": "sha256-t0CsOx6BbvPBtpYYHzEpIbmuwv56O6Asxo7rgrFp5pU=", "narHash": "sha256-unPY6/AfTZevP4Jdd+GnjmXQjGB/GT+mCKBsrl2gDLo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "360f62afb63ddeb8d8d43547266dfd7f2e2d54eb", "rev": "8c7c2f86ce9efef1e02a2710f9f803b029c57b73",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -19,9 +19,7 @@
package = pkgs.emacsPgtkGcc; package = pkgs.emacsPgtkGcc;
alwaysEnsure = true; alwaysEnsure = true;
# mu4e is included in the mu package and should be used from there # mu4e is included in the mu package and should be used from there
extraEmacsPackages = epkgs: extraEmacsPackages = epkgs: lib.optional config.chvp.graphical.mail.enable pkgs.mu;
(lib.optional config.chvp.graphical.mail.enable pkgs.mu) ++
(lib.optional config.chvp.development.enable pkgs.gforth);
}; };
}; };
}; };

View file

@ -42,9 +42,7 @@
) )
;; Forth syntax support ;; Forth syntax support
(use-package gforth (use-package forth-mode
;; Included in the gforth package, see emacs/default.nix
:ensure nil
:mode ("\\.fs\\'" . forth-mode) :mode ("\\.fs\\'" . forth-mode)
:mode ("\\.fb\\'" . forth-block-mode) :mode ("\\.fb\\'" . forth-block-mode)
) )