From 27255d891ec4bf874d75248a698828b471338074 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 6 Feb 2018 00:35:37 -0500 Subject: [PATCH 1/6] feature/popup: fix 'unsupported map' error when disabling +popup-mode --- modules/feature/popup/autoload.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/feature/popup/autoload.el b/modules/feature/popup/autoload.el index e186c2be5..e2d999a44 100644 --- a/modules/feature/popup/autoload.el +++ b/modules/feature/popup/autoload.el @@ -194,7 +194,7 @@ Uses `shrink-window-if-larger-than-buffer'." window--sides-inhibit-check nil) (+popup|cleanup-rules) (dolist (prop +popup-window-parameters) - (map-delete prop window-persistent-parameters))))) + (map-delete window-persistent-parameters prop))))) ;;;###autoload (define-minor-mode +popup-buffer-mode From 0780c16f92ec15e0a8c602734aa00d239c2319fc Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 6 Feb 2018 02:00:31 -0500 Subject: [PATCH 2/6] lang/org: tie babel plugins to their respective lang modules --- modules/lang/org/packages.el | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el index 3bbc89053..b7ac6d24b 100644 --- a/modules/lang/org/packages.el +++ b/modules/lang/org/packages.el @@ -11,13 +11,19 @@ (package! org-download)) (when (featurep! +babel) - (package! ob-go) (package! ob-mongo) (package! ob-redis) - (package! ob-restclient) - (package! ob-rust) (package! ob-sql-mode) - (package! ob-translate)) + (package! ob-translate) + + (when (featurep! :lang go) + (package! ob-go)) + (when (featurep! :lang rust) + (package! ob-rust)) + (when (featurep! :lang restclient) + (package! ob-restclient)) + (when (featurep! :lang crystal) + (package! ob-crystal))) (when (featurep! +export) (package! ox-pandoc) From a2feac51b2ea62e11cb82c6da1a80a00bc2f5263 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 6 Feb 2018 02:04:58 -0500 Subject: [PATCH 3/6] lang/crystal: add inf-crystal --- modules/lang/crystal/config.el | 4 ++++ modules/lang/crystal/packages.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/lang/crystal/config.el b/modules/lang/crystal/config.el index 61618d2bf..6148d0685 100644 --- a/modules/lang/crystal/config.el +++ b/modules/lang/crystal/config.el @@ -13,3 +13,7 @@ (def-package! flycheck-crystal :after crystal-mode :config (add-hook 'crystal-mode-hook #'flycheck-mode)) + + +(def-package! inf-crystal + :commands (inf-crystal crystal-switch-to-inf)) diff --git a/modules/lang/crystal/packages.el b/modules/lang/crystal/packages.el index d0fd6e985..e9fd0086b 100644 --- a/modules/lang/crystal/packages.el +++ b/modules/lang/crystal/packages.el @@ -3,4 +3,4 @@ (package! crystal-mode) (package! flycheck-crystal) - +(package! inf-crystal) From 1db29a951ea7421c01e12cc3a60f067f1359f6e4 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 6 Feb 2018 13:50:26 -0500 Subject: [PATCH 4/6] feature/workspaces: fix counsel-projectile-switch-project actions --- .../feature/workspaces/autoload/workspaces.el | 22 +++++++++---------- modules/feature/workspaces/config.el | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/feature/workspaces/autoload/workspaces.el b/modules/feature/workspaces/autoload/workspaces.el index f2a814dc3..1b6ee329a 100644 --- a/modules/feature/workspaces/autoload/workspaces.el +++ b/modules/feature/workspaces/autoload/workspaces.el @@ -488,16 +488,7 @@ created." (setq +workspaces--project-dir default-directory)) ;;;###autoload -(defun +workspaces|switch-counsel-project-action (project) - "A `counsel-projectile-switch-project-action' that creates a dedicated -workspace for a new project, before prompting to open a file." - (when persp-mode - (let ((+workspaces--project-dir project) - (inhibit-message t)) - (+workspaces|switch-to-project)))) - -;;;###autoload -(defun +workspaces|switch-to-project () +(defun +workspaces|switch-to-project (&optional inhibit-prompt) "Creates a workspace dedicated to a new project. If one already exists, switch to it. Should be hooked to `projectile-after-switch-project-hook'." (when (and persp-mode +workspaces--project-dir) @@ -516,7 +507,8 @@ to it. Should be hooked to `projectile-after-switch-project-hook'." (+workspace-switch new-name) (unless persp-p (switch-to-buffer (doom-fallback-buffer))) - (doom-project-find-file +workspaces--project-dir) + (unless inhibit-prompt + (doom-project-find-file +workspaces--project-dir)) (+workspace-message (format "Switched to '%s' in new workspace" new-name) 'success))) @@ -527,6 +519,14 @@ to it. Should be hooked to `projectile-after-switch-project-hook'." ;; Advice ;; +;;;###autoload +(defun +workspaces*switch-counsel-project-action (project) + "A `counsel-projectile-switch-project-action' that creates a dedicated +workspace for a new project, before prompting to open a file." + (let ((+workspaces--project-dir project) + (inhibit-message t)) + (+workspaces|switch-to-project 'inhibit-prompt))) + ;;;###autoload (defun +workspaces*autosave-real-buffers (orig-fn &rest args) "Don't autosave if no real buffers are open." diff --git a/modules/feature/workspaces/config.el b/modules/feature/workspaces/config.el index a52246a13..330b9b2d6 100644 --- a/modules/feature/workspaces/config.el +++ b/modules/feature/workspaces/config.el @@ -98,8 +98,8 @@ Uses `+workspaces-main' to determine the name of the main workspace." (add-hook 'delete-frame-functions #'+workspaces|delete-associated-workspace) ;; per-project workspaces - (setq projectile-switch-project-action #'+workspaces|set-project-action - counsel-projectile-switch-project-action #'+workspaces|switch-counsel-project-action) + (setq projectile-switch-project-action #'+workspaces|set-project-action) + (advice-add #'counsel-projectile-switch-project-by-name :before #'+workspaces*switch-counsel-project-action) (add-hook 'projectile-after-switch-project-hook #'+workspaces|switch-to-project) ;; From be56af82bfb4df191c48dc33e2a9cbd4ea7ff196 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 6 Feb 2018 14:04:29 -0500 Subject: [PATCH 5/6] private/default: SPC X = org-capture (prompts for template) #407 --- modules/private/default/+bindings.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/private/default/+bindings.el b/modules/private/default/+bindings.el index 5dea47f79..cf4fd153c 100644 --- a/modules/private/default/+bindings.el +++ b/modules/private/default/+bindings.el @@ -76,7 +76,7 @@ :desc "Ex command" :nv ";" #'evil-ex :desc "M-x" :nv ":" #'execute-extended-command :desc "Pop up scratch buffer" :nv "x" #'doom/open-scratch-buffer - :desc "Org Capture" :nv "X" #'+org-capture/open + :desc "Org Capture" :nv "X" #'org-capture ;; Most commonly used :desc "Find file in project" :n "SPC" #'projectile-find-file From 4658d22bf79975eadaf17bcd48939502b4ee612a Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 6 Feb 2018 14:05:06 -0500 Subject: [PATCH 6/6] completion/ivy: remap org-capture to counsel-org-capture #407 --- modules/completion/ivy/config.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index 218ab0d7e..e592cb37a 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -93,7 +93,8 @@ immediately runs it on the current candidate (ending the ivy session)." [remap yank-pop] #'counsel-yank-pop [remap info-lookup-symbol] #'counsel-info-lookup-symbol [remap imenu] #'counsel-imenu - [remap recentf-open-files] #'counsel-recentf) + [remap recentf-open-files] #'counsel-recentf + [remap org-capture] #'counsel-org-capture) :config (set! :popup "^\\*ivy-occur" '((size . 0.35)) '((transient . 0) (quit)))