summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2017-06-09 22:09:45 +0200
committerAlan Pearce2017-06-09 22:09:45 +0200
commitaeeac53fe665030a84766755482137444abc231e (patch)
treedba1946d1e31402fc8edc48023a7c2fb7ab9649f
parent91316116c23af923dcdb828c03daad7eac3c8f9e (diff)
parent02a125e944e62ce9c4fe8a0b34e7d973a6ca46f9 (diff)
downloadnixfiles-aeeac53fe665030a84766755482137444abc231e.tar.lz
nixfiles-aeeac53fe665030a84766755482137444abc231e.tar.zst
nixfiles-aeeac53fe665030a84766755482137444abc231e.zip
Merge remote-tracking branch 'origin/master'
-rw-r--r--emacs/.emacs.d/init.org8
-rwxr-xr-xstow2
2 files changed, 5 insertions, 5 deletions
diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index ff3ca5e3..745bba8a 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -532,8 +532,7 @@ Step over Silver Search, here comes a new challenger.
 ** Projectile
 
 Projectile is awesome for working in projects, especially VCS-backed
-ones.  I added a couple of functions to allow me to open new projects
-based upon some folder conventions I use.
+ones.
 
 #+BEGIN_SRC emacs-lisp
 (use-package projectile
@@ -545,7 +544,7 @@ based upon some folder conventions I use.
   :demand t
   :diminish projectile-mode
   :config (progn
-            (projectile-mode 1)
+            (projectile-global-mode +1)
             (add-to-list 'projectile-globally-ignored-directories ".stversions")
 
             (defun yarn-install (&optional arg)
@@ -564,7 +563,8 @@ based upon some folder conventions I use.
                 (cmd-to-echo "yarn" (concat "add " package))))
 
             (defun yarn-run (cmd)
-              (interactive "scommand: ")
+              (interactive (list
+                            (projectile-completing-read "command: " (alist-get 'scripts (json-read-file (expand-file-name "package.json" (projectile-project-root)))))))
               (projectile-with-default-dir (projectile-project-root)
                 (cmd-to-echo "yarn" (concat "run " cmd))))
 
diff --git a/stow b/stow
index c708e49f..761a5b5d 100755
--- a/stow
+++ b/stow
@@ -1,2 +1,2 @@
 #!/bin/sh
-stow --target="$HOME" "$@"
\ No newline at end of file
+stow --target="$HOME" --no-folding "$@"