diff options
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/guix-command.el | 26 | ||||
| -rw-r--r-- | emacs/guix-devel.el | 136 | ||||
| -rw-r--r-- | emacs/guix-guile.el | 35 | ||||
| -rw-r--r-- | emacs/guix-init.el | 2 |
4 files changed, 197 insertions, 2 deletions
diff --git a/emacs/guix-command.el b/emacs/guix-command.el index 504d5f7ca0..b679ad9b1e 100644 --- a/emacs/guix-command.el +++ b/emacs/guix-command.el @@ -503,7 +503,10 @@ to be modified." :name "log" :char ?l :doc "View build log")) (("graph") ,(guix-command-make-argument - :name "view" :char ?v :doc "View graph"))) + :name "view" :char ?v :doc "View graph")) + (("size") + ,(guix-command-make-argument + :name "view" :char ?v :doc "View map"))) "Alist of guix commands and additional 'execute' action arguments.") (defun guix-command-execute-arguments (commands) @@ -525,7 +528,9 @@ to be modified." (("build") ("log" . guix-run-view-build-log)) (("graph") - ("view" . guix-run-view-graph))) + ("view" . guix-run-view-graph)) + (("size") + ("view" . guix-run-view-size-map))) "Alist of guix commands and alists of special executers for them. See also `guix-command-default-executors'.") @@ -583,6 +588,23 @@ open the log file(s)." (guix-find-file graph-file) (error "Couldn't create a graph")))) +(defun guix-run-view-size-map (args) + "Run 'guix ARGS ...' size command, and open the map file." + (let* ((wished-map-file + (cl-some (lambda (arg) + (and (string-match "--map-file=\\(.+\\)" arg) + (match-string 1 arg))) + args)) + (map-file (or wished-map-file (guix-png-file-name))) + (args (if wished-map-file + args + (apply #'list + (car args) + (concat "--map-file=" map-file) + (cdr args))))) + (guix-command-output args) + (guix-find-file map-file))) + ;;; Generating popups, actions, etc. diff --git a/emacs/guix-devel.el b/emacs/guix-devel.el new file mode 100644 index 0000000000..6de49be3e6 --- /dev/null +++ b/emacs/guix-devel.el @@ -0,0 +1,136 @@ +;;; guix-devel.el --- Development tools -*- lexical-binding: t -*- + +;; Copyright © 2015 Alex Kost <alezost@gmail.com> + +;; This file is part of GNU Guix. + +;; GNU Guix 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. + +;; GNU Guix 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 file provides commands useful for developing Guix (or even +;; arbitrary Guile code) with Geiser. + +;;; Code: + +(require 'guix-guile) +(require 'guix-geiser) +(require 'guix-utils) +(require 'guix-base) + +(defgroup guix-devel nil + "Settings for Guix development utils." + :group 'guix) + +(defcustom guix-devel-activate-mode t + "If non-nil, then `guix-devel-mode' is automatically activated +in Scheme buffers." + :type 'boolean + :group 'guix-devel) + +(defun guix-devel-use-modules (&rest modules) + "Use guile MODULES." + (apply #'guix-geiser-call "use-modules" modules)) + +(defun guix-devel-use-module (&optional module) + "Use guile MODULE in the current Geiser REPL. +MODULE is a string with the module name - e.g., \"(ice-9 match)\". +Interactively, use the module defined by the current scheme file." + (interactive (list (guix-guile-current-module))) + (guix-devel-use-modules module) + (message "Using %s module." module)) + +(defun guix-devel-copy-module-as-kill () + "Put the name of the current guile module into `kill-ring'." + (interactive) + (guix-copy-as-kill (guix-guile-current-module))) + +(defun guix-devel-setup-repl (&optional repl) + "Setup REPL for using `guix-devel-...' commands." + (guix-devel-use-modules "(guix monad-repl)" + "(guix scripts)" + "(guix store)") + ;; Without this workaround, the build output disappears. See + ;; <https://github.com/jaor/geiser/issues/83> for details. + (guix-geiser-eval-in-repl + "(current-build-output-port (current-error-port))" + repl 'no-history 'no-display)) + +(defvar guix-devel-repl-processes nil + "List of REPL processes configured by `guix-devel-setup-repl'.") + +(defun guix-devel-setup-repl-maybe (&optional repl) + "Setup (if needed) REPL for using `guix-devel-...' commands." + (let ((process (get-buffer-process (or repl (guix-geiser-repl))))) + (when (and process + (not (memq process guix-devel-repl-processes))) + (guix-devel-setup-repl repl) + (push process guix-devel-repl-processes)))) + +(defun guix-devel-build-package-definition () + "Build a package defined by the current top-level variable definition." + (interactive) + (let ((def (guix-guile-current-definition))) + (guix-devel-setup-repl-maybe) + (guix-devel-use-modules (guix-guile-current-module)) + (when (or (not guix-operation-confirm) + (guix-operation-prompt (format "Build '%s'?" def))) + (guix-geiser-eval-in-repl + (concat ",run-in-store " + (guix-guile-make-call-expression + "build-package" def + "#:use-substitutes?" (guix-guile-boolean + guix-use-substitutes) + "#:dry-run?" (guix-guile-boolean guix-dry-run))))))) + +(defvar guix-devel-keys-map + (let ((map (make-sparse-keymap))) + (define-key map (kbd "b") 'guix-devel-build-package-definition) + (define-key map (kbd "k") 'guix-devel-copy-module-as-kill) + (define-key map (kbd "u") 'guix-devel-use-module) + map) + "Keymap with subkeys for `guix-devel-mode-map'.") + +(defvar guix-devel-mode-map + (let ((map (make-sparse-keymap))) + (define-key map (kbd "C-c .") guix-devel-keys-map) + map) + "Keymap for `guix-devel-mode'.") + +;;;###autoload +(define-minor-mode guix-devel-mode + "Minor mode for `scheme-mode' buffers. + +With a prefix argument ARG, enable the mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable the mode +if ARG is omitted or nil. + +When Guix Devel mode is enabled, it provides the following key +bindings: + +\\{guix-devel-mode-map}" + :init-value nil + :lighter " Guix" + :keymap guix-devel-mode-map) + +;;;###autoload +(defun guix-devel-activate-mode-maybe () + "Activate `guix-devel-mode' depending on +`guix-devel-activate-mode' variable." + (when guix-devel-activate-mode + (guix-devel-mode))) + +(provide 'guix-devel) + +;;; guix-devel.el ends here diff --git a/emacs/guix-guile.el b/emacs/guix-guile.el index cff9bd4e9b..35a97d77a3 100644 --- a/emacs/guix-guile.el +++ b/emacs/guix-guile.el @@ -24,6 +24,41 @@ ;;; Code: +(require 'geiser-guile) + +(defvar guix-guile-definition-regexp + (rx bol "(define" + (zero-or-one "*") + (zero-or-one "-public") + (one-or-more space) + (zero-or-one "(") + (group (one-or-more (or word (syntax symbol))))) + "Regexp used to find the guile definition.") + +(defun guix-guile-current-definition () + "Return string with name of the current top-level guile definition." + (save-excursion + (beginning-of-defun) + (if (looking-at guix-guile-definition-regexp) + (match-string-no-properties 1) + (error "Couldn't find the current definition")))) + +(defun guix-guile-current-module () + "Return a string with the current guile module. +Return nil, if current buffer does not define a module." + ;; Modified version of `geiser-guile--get-module'. + (save-excursion + (geiser-syntax--pop-to-top) + (when (or (re-search-backward geiser-guile--module-re nil t) + (looking-at geiser-guile--library-re) + (re-search-forward geiser-guile--module-re nil t)) + (match-string-no-properties 1)))) + +(defun guix-guile-boolean (arg) + "Return a string with guile boolean value. +Transform elisp ARG (nil or non-nil) to the guile boolean (#f or #t)." + (concat "#" (prin1-to-string (if arg 't 'f)))) + (defun guix-guile-make-call-expression (proc &rest args) "Return \"(PROC ARGS ...)\" string. PROC and ARGS should be strings." diff --git a/emacs/guix-init.el b/emacs/guix-init.el index 3a727c7eb6..96aa0c2ffc 100644 --- a/emacs/guix-init.el +++ b/emacs/guix-init.el @@ -12,4 +12,6 @@ avoid loading autoloads of Emacs packages installed in (require 'guix-emacs) (guix-emacs-load-autoloads 'all)) +(add-hook 'scheme-mode-hook 'guix-devel-activate-mode-maybe) + (provide 'guix-init) |