From 45c21a5a83fa215e920f2db9b99160972aac88ce Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 16 May 2018 22:40:33 +0200
Subject: [PATCH] Move :feature services => :tools prodigy

---
 init.example.el                                      |  2 +-
 .../{feature/services => tools/prodigy}/autoload.el  |  8 ++++----
 .../{feature/services => tools/prodigy}/config.el    | 12 ++++--------
 .../{feature/services => tools/prodigy}/packages.el  |  2 +-
 4 files changed, 10 insertions(+), 14 deletions(-)
 rename modules/{feature/services => tools/prodigy}/autoload.el (86%)
 rename modules/{feature/services => tools/prodigy}/config.el (72%)
 rename modules/{feature/services => tools/prodigy}/packages.el (60%)

diff --git a/init.example.el b/init.example.el
index f57571a87..92a2163f1 100644
--- a/init.example.el
+++ b/init.example.el
@@ -9,7 +9,6 @@
        (lookup           ; helps you navigate your code and documentation
         +devdocs         ; ...on devdocs.io online
         +docsets)        ; ...or in Dash docsets locally
-       services          ; TODO managing external services & code builders
        snippets          ; my elves. They type so I don't have to
        spellcheck        ; tasing you for misspelling mispelling
        (syntax-checker   ; tasing you for every semicolon you forget
@@ -56,6 +55,7 @@
       ;magit             ;
        password-store    ; password manager for nerds
        pdf               ; pdf enhancements
+       prodigy           ; Managing external services
       ;rgb               ; creating color strings
        rotate-text       ; cycle region at point between text candidates
        term              ; terminals in Emacs
diff --git a/modules/feature/services/autoload.el b/modules/tools/prodigy/autoload.el
similarity index 86%
rename from modules/feature/services/autoload.el
rename to modules/tools/prodigy/autoload.el
index 23f357ab3..88781dd3d 100644
--- a/modules/feature/services/autoload.el
+++ b/modules/tools/prodigy/autoload.el
@@ -1,14 +1,14 @@
-;;; feature/services/autoload.el -*- lexical-binding: t; -*-
+;;; tools/prodigy/autoload.el -*- lexical-binding: t; -*-
 
 ;;;###autoload
-(defun +services/create ()
+(defun +prodigy/create ()
   "Interactively create a new prodigy service."
   (interactive)
   ;; TODO
   )
 
 ;;;###autoload
-(defun +services/prodigy-delete (arg)
+(defun +prodigy/delete (arg)
   "Delete service at point. Asks for confirmation."
   (interactive "P")
   (prodigy-with-refresh
@@ -24,7 +24,7 @@
               (message "Aborted")))))))
 
 ;;;###autoload
-(defun +services/cleanup ()
+(defun +prodigy/cleanup ()
   "Delete all services associated with projects that don't exist."
   (interactive)
   (cl-loop for service in prodigy-services
diff --git a/modules/feature/services/config.el b/modules/tools/prodigy/config.el
similarity index 72%
rename from modules/feature/services/config.el
rename to modules/tools/prodigy/config.el
index 8d8dcacfd..8763db6a3 100644
--- a/modules/feature/services/config.el
+++ b/modules/tools/prodigy/config.el
@@ -1,4 +1,4 @@
-;;; feature/services/config.el -*- lexical-binding: t; -*-
+;;; tools/prodigy/config.el -*- lexical-binding: t; -*-
 
 (def-setting! :service (&rest plist)
   "TODO"
@@ -19,7 +19,7 @@
   (doom-cache-persist
    :prodigy '(prodigy-services prodigy-tags prodigy-filters))
 
-  (defun +services*prodigy-services (orig-fn &rest args)
+  (defun +prodigy*services (orig-fn &rest args)
     "Adds a new :project property to prodigy services, which hides the service
 unless invoked from the relevant project."
     (let ((project-root (downcase (doom-project-root)))
@@ -31,12 +31,8 @@ unless invoked from the relevant project."
                               (or (not project)
                                   (file-in-directory-p project-root project))))
                           services))))
-  (advice-add #'prodigy-services :around #'+services*prodigy-services)
+  (advice-add #'prodigy-services :around #'+prodigy*services)
 
   ;; Keybindings
-  (map! :map prodigy-mode-map "d" #'+services/prodigy-delete)
-  (when (featurep! :feature evil)
-    (map! :map prodigy-mode-map
-          "j" #'prodigy-next
-          "k" #'prodigy-prev)))
+  (map! :map prodigy-mode-map "d" #'+prodigy/delete))
 
diff --git a/modules/feature/services/packages.el b/modules/tools/prodigy/packages.el
similarity index 60%
rename from modules/feature/services/packages.el
rename to modules/tools/prodigy/packages.el
index dcca97f5d..bf9396134 100644
--- a/modules/feature/services/packages.el
+++ b/modules/tools/prodigy/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
-;;; feature/services/packages.el
+;;; tools/prodigy/packages.el
 
 (package! prodigy)