From e24b8cd1d1e4ceb7e4454a267985b639d5e7eb06 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 23 Apr 2020 17:44:12 -0400 Subject: [PATCH] Slim down from lang/data + Removes jsonnet, graphql, dhall & protobuf packages from the module. + Removes +data-vagrant-mode project minor mode (unused). I'm phasing out the lang/data module. Its original purpose was to be for data interchange formats, like JSON, but over time it became the dumping ground for languages with no clear defining feature. These packages are being removed first because their configs are non-existent or so trivial that it offers nothing a user couldn't set up themselves. graphql and jsonnet might get heir own modules (or jsonnet might be gated behind a flag in the :lang json module), but for now they gotta go. fixup! Remove jsonnet, graphql, dhall & protobuf modes from lang/data --- core/core-editor.el | 2 ++ modules/lang/data/config.el | 21 --------------------- modules/lang/data/packages.el | 6 ------ 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/core/core-editor.el b/core/core-editor.el index b08f53670..1702c4d8e 100644 --- a/core/core-editor.el +++ b/core/core-editor.el @@ -174,6 +174,8 @@ possible." (push '("/LICENSE\\'" . text-mode) auto-mode-alist) (push '("\\.log\\'" . text-mode) auto-mode-alist) +(push '("rc\\'" . conf-mode) auto-mode-alist) +(push '("\\.\\(?:hex\\|nes\\)\\'" . hexl-mode) auto-mode-alist) ;; diff --git a/modules/lang/data/config.el b/modules/lang/data/config.el index 19776b4e4..da0e72344 100644 --- a/modules/lang/data/config.el +++ b/modules/lang/data/config.el @@ -1,9 +1,5 @@ ;;; lang/data/config.el -*- lexical-binding: t; -*- -;; Built in plugins -(add-to-list 'auto-mode-alist '("/sxhkdrc\\'" . conf-mode)) -(add-to-list 'auto-mode-alist '("\\.\\(?:hex\\|nes\\)\\'" . hexl-mode)) - (use-package! nxml-mode :mode "\\.p\\(?:list\\|om\\)\\'" ; plist, pom :mode "\\.xs\\(?:d\\|lt\\)\\'" ; xslt, xsd @@ -16,9 +12,6 @@ (setq-hook! 'nxml-mode-hook tab-width nxml-child-indent)) -;; -;;; Third-party plugins - ;;;###package csv-mode (map! :after csv-mode :localleader @@ -29,17 +22,3 @@ "S" #'csv-sort-numeric-fields "k" #'csv-kill-fields "t" #'csv-transpose) - -(use-package! graphql-mode - :mode "\\.gql\\'" - :config (setq-hook! 'graphql-mode-hook tab-width graphql-indent-level)) - -(after! jsonnet-mode - (set-electric! 'jsonnet-mode :chars '(?\n ?: ?{ ?}))) - - -;; -;;; Frameworks - -(def-project-mode! +data-vagrant-mode - :files ("Vagrantfile")) diff --git a/modules/lang/data/packages.el b/modules/lang/data/packages.el index d98d089ad..72a9dae2d 100644 --- a/modules/lang/data/packages.el +++ b/modules/lang/data/packages.el @@ -1,10 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/data/packages.el -(package! graphql-mode :pin "7c37aee28b") -(package! jsonnet-mode :pin "d8b486c837") (package! csv-mode :pin "635337407c") -(package! dhall-mode :pin "ef4d33debe") -(package! protobuf-mode - :recipe (:host github :repo "emacsmirror/protobuf-mode" :files (:defaults "*")) - :pin "94b7bd7e8b")