branch: externals/dtache
commit 2958d21869cba71874a6aa2423b71bb9f89f77de
Author: Niklas Eklund <niklas.ekl...@posteo.net>
Commit: Niklas Eklund <niklas.ekl...@posteo.net>
Remove marginalia from dtache
This patch removes the marginalia extension and updates the
README. With the new annotation function this extension is not needed
anymore.
---
README.org | 12 ------
guix.scm | 3 +-
marginalia-dtache.el | 104 ---------------------------------------------------
3 files changed, 1 insertion(+), 118 deletions(-)
diff --git a/README.org b/README.org
index 03bfe4a87a..25c7f0773b 100644
--- a/README.org
+++ b/README.org
@@ -122,18 +122,6 @@ Add [[https://github.com/oantolin/embark/][embark]]
actions to =dtache-open-sess
:after (dtache embark))
#+end_src
-** Marginalia
-
- Add [[https://github.com/minad/marginalia/][marginalia]] annotations to
enrich =dtache-open-session=.
-
-#+begin_src elisp
- (use-package marginalia-dtache
- :after (dtache marginalia)
- :config
- ;; Register marginalia annotator
- (add-to-list 'marginalia-annotator-registry '(dtache
marginalia-dtache-annotate builtin none)))
-#+end_src
-
* Tips & Tricks
** Automatic status labeling
diff --git a/guix.scm b/guix.scm
index d37d25601b..3f65f203ca 100644
--- a/guix.scm
+++ b/guix.scm
@@ -36,8 +36,7 @@
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(propagated-inputs
- `(("emacs-embark" ,emacs-embark)
- ("emacs-marginalia" ,emacs-marginalia)))
+ `(("emacs-embark" ,emacs-embark)))
(native-inputs
`(("emacs-ert-runner" ,emacs-ert-runner)))
(inputs `(("dtach" ,dtach)))
diff --git a/marginalia-dtache.el b/marginalia-dtache.el
deleted file mode 100644
index e1c82f8a4d..0000000000
--- a/marginalia-dtache.el
+++ /dev/null
@@ -1,104 +0,0 @@
-;;; marginalia-dtache.el --- Dtache Marginalia integration -*-
lexical-binding: t -*-
-
-;; Copyright (C) 2020-2021 Niklas Eklund
-
-;; Author: Niklas Eklund <niklas.ekl...@posteo.net>
-;; URL: https://www.gitlab.com/niklaseklund/dtache.git
-;; Version: 0.1
-;; Package-Requires: ((emacs "27.1"))
-;; Keywords: convenience processes
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This package provides annotated `dtache' sessions through
-;; `marginalia' which enhances the `dtache-open-session'.
-
-;;; Code:
-
-;;;; Requirements
-
-(require 'dtache)
-(require 'marginalia)
-
-;;;; Variables
-
-(defvar marginalia-dtache-metadata-length 30)
-(defvar marginalia-dtache-duration-length 10)
-(defvar marginalia-dtache-working-dir-length 50)
-(defvar marginalia-dtache-size-length 8)
-(defvar marginalia-dtache-date-length 12)
-(defvar marginalia-dtache-host-length 10)
-
-;;;; Faces
-
-(defgroup marginalia-dtache-faces nil
- "Faces used by `marginalia-mode'."
- :group 'marginalia
- :group 'faces)
-
-(defface marginalia-dtache-metadata
- '((t :inherit marginalia-char))
- "Face used to highlight git information in `marginalia-mode'.")
-
-(defface marginalia-dtache-error
- '((t :inherit error))
- "Face used to highlight error in `marginalia-mode'.")
-
-(defface marginalia-dtache-active
- '((t :inherit marginalia-file-owner))
- "Face used to highlight active in `marginalia-mode'.")
-
-(defface marginalia-dtache-duration
- '((t :inherit marginalia-date))
- "Face used to highlight duration in `marginalia-mode'.")
-
-(defface marginalia-dtache-size
- '((t :inherit marginalia-size))
- "Face used to highlight size in `marginalia-mode'.")
-
-(defface marginalia-dtache-creation
- '((t :inherit marginalia-date))
- "Face used to highlight date in `marginalia-mode'.")
-
-(defface marginalia-dtache-working-dir
- '((t :inherit marginalia-symbol))
- "Face used to highlight working directory in `marginalia-mode'.")
-
-(defface marginalia-dtache-host
- '((t :inherit marginalia-function))
- "Face used to highlight host in `marginalia-mode'.")
-
-;;;; Functions
-
-(defun marginalia-dtache-annotate (candidate)
- "Annotate dtache CANDIDATE."
- (let* ((session
- (get-text-property 0 'dtache--data candidate)))
- (marginalia--fields
- ((dtache--active-str session) :width 3 :face 'marginalia-dtache-active)
- ((dtache--status-str session) :width 3 :face 'marginalia-dtache-error)
- ((dtache--session-host session) :truncate marginalia-dtache-host-length
:face 'marginalia-dtache-host)
- ((dtache--working-dir-str session) :truncate
marginalia-dtache-working-dir-length :face 'marginalia-dtache-working-dir)
- ((dtache--metadata-str session) :truncate
marginalia-dtache-metadata-length :face 'marginalia-dtache-metadata)
- ((dtache--duration-str session) :truncate
marginalia-dtache-duration-length :face 'marginalia-dtache-duration)
- ((dtache--size-str session) :truncate marginalia-dtache-size-length :face
'marginalia-dtache-size)
- ((dtache--creation-str session) :truncate marginalia-dtache-date-length
:face 'marginalia-dtache-creation))))
-
-(provide 'marginalia-dtache)
-
-;;; marginalia-dtache.el ends here
