refactor: move all built-in packages configs to me-builtin

abougouffa · Jul 12, 2023 · f3aeaa2 · f3aeaa2
1 parent 59d8b1f
commit f3aeaa2
Show file tree

Hide file tree

Showing 18 changed files with 766 additions and 769 deletions.
diff --git a/core/me-builtin.el b/core/me-builtin.el
diff --git a/core/me-defaults.el b/core/me-defaults.el
@@ -63,11 +63,6 @@
  newsticker-cache-filename (concat minemacs-local-dir "newsticker/cache.el")
  newsticker-dir (+directory-ensure minemacs-local-dir "newsticker/data/")
  nsm-settings-file (concat minemacs-local-dir "nsm-settings.el")
- org-clock-persist-file (concat minemacs-cache-dir "org/clock-persist.el")
- org-id-locations-file (concat minemacs-cache-dir "org/id-locations.el")
- org-persist-directory (+directory-ensure minemacs-cache-dir "org/persist/")
- org-preview-latex-image-directory (+directory-ensure minemacs-cache-dir "org/preview/latex-image/")
- org-publish-timestamp-directory (+directory-ensure minemacs-cache-dir "org/publish/timestamps/")
  project-list-file (concat minemacs-local-dir "project-list.el")
  quickurl-url-file (concat minemacs-local-dir "quickurl-url.el")
  rcirc-log-directory (+directory-ensure minemacs-local-dir "rcirc/log/")
@@ -82,9 +77,6 @@
  shared-game-score-directory (+directory-ensure minemacs-local-dir "shared-game-score/")
  srecode-map-save-file (concat minemacs-local-dir "srecode-map.el")
  timeclock-file (concat minemacs-local-dir "timeclock")
- tramp-auto-save-directory (concat minemacs-local-dir "tramp/auto-save/")
- tramp-backup-directory-alist backup-directory-alist
- tramp-persistency-file-name (concat minemacs-local-dir "tramp/persistency.el")
  type-break-file-name (concat minemacs-local-dir "type-break.el")
  url-cache-directory (+directory-ensure minemacs-cache-dir "url/")
  url-configuration-directory (+directory-ensure minemacs-local-dir "url/")

diff --git a/modules/me-biblio.el b/modules/me-biblio.el
@@ -8,32 +8,6 @@
 
 ;;; Code:
 
-(use-package oc
-  :straight (:type built-in)
-  :after org
-  :demand t
-  :custom
-  (org-cite-export-processors '((latex biblatex) (t csl)))
-  (org-support-shift-select t)
-  :config
-  (+map-local! :keymaps 'org-mode-map
-    "C" #'org-cite-insert))
-
-(use-package oc-csl
-  :straight (:type built-in)
-  :after oc
-  :demand t)
-
-(use-package oc-natbib
-  :straight (:type built-in)
-  :after oc
-  :demand t)
-
-(use-package oc-biblatex
-  :straight (:type built-in)
-  :after oc
-  :demand t)
-
 (use-package zotxt
   :straight t
   :preface

diff --git a/modules/me-checkers.el b/modules/me-checkers.el
@@ -8,86 +8,6 @@
 
 ;;; Code:
 
-(use-package flymake
-  :straight (:type built-in)
-  :init
-  (+map! "tf" #'flymake-mode)
-  :custom
-  (flymake-fringe-indicator-position 'right-fringe)
-  (flymake-error-bitmap '(+flymake-bitmap-left-arrow-hi-res compilation-error))
-  (flymake-warning-bitmap '(+flymake-bitmap-left-arrow-hi-res compilation-warning))
-  (flymake-note-bitmap '(+flymake-bitmap-left-arrow-hi-res compilation-info))
-  :config
-  (+map-local! :keymaps 'flymake-mode-map
-    "f"  '(nil :wk "flymake")
-    "ff" #'+flymake-main/body
-    "fn" #'flymake-goto-next-error
-    "fN" #'flymake-goto-prev-error
-    "fs" #'flymake-start
-    "fb" #'flymake-show-buffer-diagnostics
-    "fp" #'flymake-show-project-diagnostics)
-
-  ;; Use the session's load-path with flymake
-  (setq elisp-flymake-byte-compile-load-path
-        (append elisp-flymake-byte-compile-load-path load-path))
-
-  ;; Larger right frings
-  (set-fringe-style '(8 . 13))
-
-  ;; Better fringe bitmaps
-  (define-fringe-bitmap '+flymake-bitmap-arrow
-    [#b11111000
-     #b01111100
-     #b00111110
-     #b00011111
-     #b00111110
-     #b01111100
-     #b11111000])
-  (define-fringe-bitmap '+flymake-bitmap-arrow-hi-res
-    [#b01111000000
-     #b00111100000
-     #b00011110000
-     #b00001111000
-     #b00000111100
-     #b00000011110
-     #b00000011110
-     #b00000111100
-     #b00001111000
-     #b00011110000
-     #b00111100000
-     #b01111000000]
-    nil 13)
-  (define-fringe-bitmap '+flymake-bitmap-left-arrow-hi-res
-    [#b00000011110
-     #b00000111100
-     #b00001111000
-     #b00011110000
-     #b00111100000
-     #b01111000000
-     #b01111000000
-     #b00111100000
-     #b00011110000
-     #b00001111000
-     #b00000111100
-     #b00000011110]
-    nil 13)
-
-  (defhydra +flymake-main (:color red :hint nil :foreign-keys warn)
-    "
-[Flymake]                                              [_q_] quit
-  ├──────────────────────────────────────────────────────────────────────╮
-  │  [_B_] Buffer diagnostics  [_P_] Project diagnostics  [_L_] Log buffer     │
-  │  [_n_] Next error          [_N_] Prev error           [_S_] Start          │
-  ╰──────────────────────────────────────────────────────────────────────╯
-"
-    ("B" flymake-show-buffer-diagnostics)
-    ("P" flymake-show-project-diagnostics)
-    ("L" flymake-switch-to-log-buffer)
-    ("n" flymake-goto-next-error)
-    ("N" flymake-goto-prev-error)
-    ("S" flymake-start)
-    ("q" nil :color blue)))
-
 (use-package flymake-easy
   :straight t
   :autoload flymake-easy-load)

diff --git a/modules/me-data.el b/modules/me-data.el
@@ -76,11 +76,6 @@
     "L" #'graphviz-turn-off-live-preview)
   (+eglot-register 'graphviz-dot-mode '("dot-language-server" "--stdio")))
 
-(use-package nxml-mode
-  :straight (:type built-in)
-  :config
-  (+eglot-register '(nxml-mode xml-mode) "lemminx"))
-
 (use-package plantuml-mode
   :straight t
   :mode "\\.plantuml\\'"

diff --git a/modules/me-debug.el b/modules/me-debug.el
@@ -8,39 +8,6 @@
 
 ;;; Code:
 
-(use-package gdb-mi
-  :straight (:type built-in)
-  :custom
-  (gdb-show-main t) ; display source file containing main routine at startup
-  (gdb-many-windows t) ; start in gdb-many-windows mode
-  (gdb-debug-log-max 1024) ; default 128
-  (gdb-restore-window-configuration-after-quit t)
-  (gdb-thread-buffer-verbose-names nil)
-  (gdb-window-configuration-directory (+directory-ensure minemacs-local-dir "gdb/"))
-  (gdb-max-source-window-count 1) ; IDEA: maybe increase it!
-  (gdb-display-io-nopopup nil) ; IDEA: maybe change it!
-  :config
-  ;; Add an overlay for the current line (mimics dap-mode)
-  (defvar +gud-overlay
-    (let* ((overlay (make-overlay (point-min) (point-min))))
-      (overlay-put overlay 'face 'highlight)
-      overlay)
-    "Overlay variable for GUD highlighting.")
-
-  (advice-add
-   'gud-display-line :after
-   (defun +gud--display-overlay-a (true-file _line)
-     (let* ((overlay +gud-overlay)
-            (buffer (gud-find-file true-file)))
-       (with-current-buffer buffer
-         (move-overlay overlay (line-beginning-position) (line-end-position) (current-buffer))))))
-
-  (add-hook
-   'kill-buffer-hook
-   (defun +gud--delete-overlay-h ()
-     (when (derived-mode-p 'gud-mode)
-       (delete-overlay +gud-overlay)))))
-
 (use-package realgud
   :straight t
   :init

diff --git a/modules/me-docs.el b/modules/me-docs.el
@@ -8,12 +8,6 @@
 
 ;;; Code:
 
-(use-package doc-view
-  :straight (:type built-in)
-  :custom
-  (doc-view-continuous t)
-  (doc-view-mupdf-use-svg (+emacs-features-p 'rsvg)))
-
 (use-package pdf-tools
   :straight t
   :mode ("\\.pdf\\'" . pdf-view-mode)

diff --git a/modules/me-embedded.el b/modules/me-embedded.el
@@ -26,18 +26,6 @@
 (use-package bitbake-modes
   :straight (:host bitbucket :repo "olanilsson/bitbake-modes"))
 
-(use-package vhdl-mode
-  :straight (:type built-in)
-  :config
-  ;; Setup vhdl_ls from rust_hdl (AUR: rust_hdl-git)
-  (+eglot-register 'vhdl-mode "vhdl_ls"))
-
-(use-package verilog-mode
-  :straight (:type built-in)
-  :config
-  ;; Setup Verilog/SystemVerilog LSP servers
-  (+eglot-register 'verilog-mode "svls" "verible-verilog-ls" "svlangserver"))
-
 (use-package mips-mode
   :straight t
   :mode "\\.mips\\'")

diff --git a/modules/me-latex.el b/modules/me-latex.el
@@ -85,50 +85,6 @@
     ;; Add LatexMk as a TeX target.
     (auctex-latexmk-setup)))
 
-(use-package bibtex
-  :straight (:type built-in)
-  :hook (bibtex-mode . display-line-numbers-mode)
-  :custom
-  (bibtex-dialect 'biblatex)
-  (bibtex-align-at-equal-sign t)
-  (bibtex-text-indentation 20)
-  :config
-  (+map-local! :keymaps 'bibtex-mode-map
-    "l" #'bibtex-fill-entry
-    "r" #'bibtex-reformat))
-
-;; Inspired by Doom Emacs
-(use-package reftex
-  :straight (:type built-in)
-  :hook (LaTeX-mode . turn-on-reftex)
-  :hook (reftex-toc-mode . reftex-toc-rescan)
-  :custom
-  ;; Get RefTeX working with BibLaTeX. See: tex.stackexchange.com/a/31992/43165
-  (reftex-cite-format
-   '((?a . "\\autocite[]{%l}")
-     (?b . "\\blockcquote[]{%l}{}")
-     (?c . "\\cite[]{%l}")
-     (?f . "\\footcite[]{%l}")
-     (?n . "\\nocite{%l}")
-     (?p . "\\parencite[]{%l}")
-     (?s . "\\smartcite[]{%l}")
-     (?t . "\\textcite[]{%l}"))
-   ;; This is needed when `reftex-cite-format' is set. See:
-   ;; superuser.com/a/1386206
-   (LaTeX-reftex-cite-format-auto-activate nil)
-   (reftex-plug-into-AUCTeX t)
-   (reftex-toc-split-windows-fraction 0.3))
-  :config
-  (+map-local! :keymaps 'reftex-mode-map
-    ";" 'reftex-toc)
-  (+nvmap! :keymaps 'reftex-toc-mode-map
-    "j"   #'next-line
-    "k"   #'previous-line
-    "q"   #'kill-buffer-and-window
-    "ESC" #'kill-buffer-and-window)
-  (with-eval-after-load 'evil
-    (add-hook 'reftex-mode-hook #'evil-normalize-keymaps)))
-
 (use-package me-latex-fonts
   :after latex
   :demand t)

diff --git a/modules/me-lisp.el b/modules/me-lisp.el
@@ -115,11 +115,6 @@
 (use-package racket-mode
   :straight t)
 
-(use-package scheme
-  :straight (:type built-in)
-  :custom
-  (scheme-program-name "guile"))
-
 (use-package geiser
   :straight t
   :custom
@@ -167,51 +162,6 @@
   (+map-local! :keymaps '(sly-mode-map sly-editing-mode-map sly-mrepl-mode-map)
     "m" '(macrostep-expand :wk "Expand macro")))
 
-;; Emacs Lisp
-(use-package elisp-mode
-  :straight (:type built-in)
-  :hook (emacs-lisp-mode . (lambda () (setq-local tab-width 8))) ;; to view built-in packages correctly
-  :after minemacs-loaded ; prevent elisp-mode from being loaded too early
-  :init
-  (+map-local! :keymaps '(emacs-lisp-mode-map lisp-interaction-mode-map ielm-map lisp-mode-map racket-mode-map scheme-mode-map)
-    "p" #'check-parens)
-  :config
-  (+map-local! :keymaps '(emacs-lisp-mode-map lisp-interaction-mode-map)
-    "d"   '(nil :wk "edebug")
-    "df"  'edebug-defun
-    "dF"  'edebug-all-forms
-    "dd"  'edebug-all-defs
-    "dr"  'edebug-remove-instrumentation
-    "do"  'edebug-on-entry
-    "dO"  'edebug-cancel-on-entry
-    "db"  '(nil :wk "breakpoints")
-    "dbb" 'edebug-set-breakpoint
-    "dbr" 'edebug-unset-breakpoint
-    "dbn" 'edebug-next-breakpoint
-    "e"   '(nil :wk "eval")
-    "eb"  'eval-buffer
-    "ed"  'eval-defun
-    "ee"  'eval-last-sexp
-    "er"  'eval-region
-    "eR"  'elisp-eval-region-or-buffer
-    "el"  'load-library
-    "g"   '(nil :wk "goto/find")
-    "gf"  'find-function-at-point
-    "gR"  'find-function
-    "gv"  'find-variable-at-point
-    "gV"  'find-variable
-    "gL"  'find-library
-    "c"   '(nil :wk "compile")
-    "cc"  #'elisp-byte-compile-buffer
-    "cf"  #'elisp-byte-compile-file
-    "cn"  #'emacs-lisp-native-compile-and-load
-    "cb"  #'emacs-lisp-byte-compile-and-load)
-  (+map-local! :keymaps '(edebug-mode-map)
-    "e"   '(nil :wk "eval")
-    "ee"  'edebug-eval-last-sexp
-    "eE"  'edebug-eval-expression
-    "et"  'edebug-eval-top-level-form))
-
 (use-package me-elisp-extras
   :after elisp-mode minemacs-loaded
   :demand t
@@ -252,7 +202,18 @@
   :custom
   (eros-eval-result-prefix "⟹ ")
   :config
-  (eros-mode 1))
+  (eros-mode 1)
+
+  ;; Add an Elisp-like evaluation for Octave
+  (with-eval-after-load 'octave
+    (defun +eros-octave-eval-last-sexp ()
+      "Wrapper for `+octave-eval-last-sexp' that overlays results."
+      (interactive)
+      (eros--eval-overlay (+octave-eval-last-sexp) (point)))
+
+    (+map-local! :keymaps 'octave-mode-map
+      "e"  '(nil :wk "eval")
+      "ee" #'+eros-octave-eval-last-sexp)))
 
 
 (provide 'me-lisp)

diff --git a/modules/me-math.el b/modules/me-math.el
@@ -79,35 +79,6 @@
 (use-package poly-R
   :straight t)
 
-(use-package octave
-  :straight (:type built-in)
-  :mode ("\\.m\\'" . octave-mode)
-  :config
-  (defun +octave-eval-last-sexp ()
-    "Evaluate Octave sexp before point and print value into current buffer."
-    (interactive)
-    (inferior-octave t)
-    (let ((print-escape-newlines nil)
-          (opoint (point)))
-      (prin1
-       (save-excursion
-         (forward-sexp -1)
-         (inferior-octave-send-list-and-digest
-          (list (concat (buffer-substring-no-properties (point) opoint) "\n")))
-         (mapconcat 'identity inferior-octave-output-list "\n")))))
-
-  (with-eval-after-load 'eros
-    (defun +eros-octave-eval-last-sexp ()
-      "Wrapper for `+octave-eval-last-sexp' that overlays results."
-      (interactive)
-      (eros--eval-overlay
-       (+octave-eval-last-sexp)
-       (point)))
-
-    (+map-local! :keymaps 'octave-mode-map
-      "e"  '(nil :wk "eval")
-      "ee" #'+eros-octave-eval-last-sexp)))
-
 
 (provide 'me-math)