emacs/.emacs.d/init.org

@@ -1585,11 +1585,10 @@ Open files in Git forges (GitHub, GitLab, etc.):
 A utility from the author of Magit to run shell commands using the current Emacs instance as $EDITOR.
 
 #+BEGIN_SRC emacs-lisp
-  (with-eval-after-load 'with-editor
-    (shell-command-with-editor-mode)
-    (add-hook 'shell-mode-hook #'with-editor-export-editor)
-    (add-hook 'term-exec-hook #'with-editor-export-editor)
-    (add-hook 'eshell-mode-hook #'with-editor-export-editor))
+  (shell-command-with-editor-mode)
+  (add-hook 'shell-mode-hook #'with-editor-export-editor)
+  (add-hook 'term-exec-hook #'with-editor-export-editor)
+  (add-hook 'eshell-mode-hook #'with-editor-export-editor)
 #+END_SRC
 
 * Password Store
@@ -6511,7 +6510,7 @@ current buffer:
 #+begin_src emacs-lisp
   (use-package run-command
     :straight (run-command :host github :repo "bard/emacs-run-command"
-                           :fork (:host github :repo "jdormit/emacs-run-command" :branch "master"))
+                           :fork (:host github :repo "jdormit/emacs-run-command"))
     :config
     (defun run-command-recipe-terraform ()
       (when (directory-files default-directory
@@ -6520,8 +6519,6 @@ current buffer:
                                  ".tf"
                                  eol))
         (list
-         (list :command-name "init"
-               :command-line "terraform init")
          (list :command-name "plan"
                :command-line "terraform plan")
          (list :command-name "apply"
@@ -6649,19 +6646,11 @@ current buffer:
                :command-line "kustomize build --enable_alpha_plugins"
                :working-dir dir))))
 
-    (defun run-command-recipe-sops ()
-      (when (save-excursion
-              (goto-char (point-min))
-              (search-forward-regexp "sops:" nil t))
-        (list
-         (list :command-name "edit"
-               :command-line (format "sops %s" (buffer-file-name))))))
-
     :general
     (leader-map "\"" #'run-command)
     (run-command-term-minor-mode-map [remap recompile] #'run-command-term-recompile)
     :custom
-    (run-command-run-method 'async-shell)
+    (run-command-run-method 'term)
     (run-command-recipes '(run-command-recipe-terraform
                            run-command-recipe-local
                            run-command-recipe-package-json
@@ -6670,8 +6659,7 @@ current buffer:
                            run-command-recipe-project-local
                            run-command-recipe-executables
                            run-command-recipe-obelix
-                           run-command-recipe-kustomize
-                           run-command-recipe-sops)))
+                           run-command-recipe-kustomize)))
 #+end_src