diff --git a/Cask b/Cask index 7e6bfea39..c7400ddc5 100644 --- a/Cask +++ b/Cask @@ -108,7 +108,7 @@ (depends-on "projectile") (depends-on "helm-describe-modes" :git "https://github.com/emacs-helm/helm-describe-modes") -;; Quickrun -- core/core-quickrun.el +;; Code evaluation/REPLs -- core/core-eval.el (depends-on "quickrun") (depends-on "repl-toggle") diff --git a/core/core-eval.el b/core/core-eval.el index 0249f1f15..25023a2cc 100644 --- a/core/core-eval.el +++ b/core/core-eval.el @@ -19,6 +19,7 @@ :init (setq rtog/mode-repl-alist '()) + (defvar narf--repl-buffer nil) (defvar repl-p nil) (make-variable-buffer-local 'repl-p) diff --git a/core/core-helm.el b/core/core-helm.el index 2bd723c32..4d7338683 100644 --- a/core/core-helm.el +++ b/core/core-helm.el @@ -1,31 +1,7 @@ ;;; core-helm.el -(use-package projectile - :config - (setq projectile-require-project-root nil - projectile-enable-caching t - projectile-cache-file (concat narf-temp-dir "/projectile.cache") - projectile-known-projects-file (concat narf-temp-dir "/projectile.projects") - projectile-indexing-method 'alien - projectile-project-root-files narf-project-root-files - projectile-file-exists-remote-cache-expire nil) - - (push "ido.last" projectile-globally-ignored-files) - (push "assets" projectile-globally-ignored-directories) - (push ".cask" projectile-globally-ignored-directories) - (push ".export" projectile-globally-ignored-directories) - (push ".attach" projectile-globally-ignored-directories) - (push '("scss" "css") projectile-other-file-alist) - (push '("css" "scss") projectile-other-file-alist) - - (projectile-global-mode +1) - - (use-package helm-projectile - :commands (helm-projectile-find-file - helm-projectile-find-dir))) - (use-package helm - :defer 2 + :commands (helm helm-other-buffer helm-mode) :init (defvar helm-global-prompt ":: ") (setq-default @@ -48,8 +24,7 @@ ;; Don't override evil-ex's completion helm-mode-handle-completion-in-region nil - helm-candidate-number-limit 40 - helm-bookmark-show-location t) + helm-candidate-number-limit 40) :config (map! (:map (helm-map helm-generic-files-map helm-find-files-map helm-swoop-map helm-projectile-find-file-map) @@ -106,12 +81,21 @@ (require 'helm-mode) (helm-mode 1)) +(use-package helm-bookmark + :commands (helm-bookmarks helm-filtered-bookmarks) + :config (setq-default helm-bookmark-show-location t)) + +(use-package helm-projectile + :commands (helm-projectile-find-other-file + helm-projectile-find-file + helm-projectile-find-dir)) + (use-package helm-files :commands (helm-browse-project helm-find helm-find-files helm-for-files helm-multi-files helm-recentf) :config - (map! (:map helm-find-files-map - "C-w" 'helm-find-files-up-one-level - "TAB" 'helm-execute-persistent-action)) + (map! :map helm-find-files-map + "C-w" 'helm-find-files-up-one-level + "TAB" 'helm-execute-persistent-action) (mapc (lambda (r) (add-to-list 'helm-boring-file-regexp-list r)) (list "\\.projects$" "\\.DS_Store$" "\\.cask"))) @@ -146,6 +130,7 @@ helm-swoop-pre-input-function (lambda () ""))) (use-package helm-describe-modes :defer t) +(use-package helm-ring :commands helm-show-kill-ring) (use-package helm-semantic :commands helm-semantic-or-imenu) (use-package helm-elisp :commands helm-apropos) (use-package helm-command :commands helm-M-x) diff --git a/core/core-popup.el b/core/core-popup.el index 1f76b6ce2..2d64c8dd8 100644 --- a/core/core-popup.el +++ b/core/core-popup.el @@ -47,7 +47,7 @@ ("^\\*.+-Profiler-Report .+\\*$" :regexp t :align below :size 0.3) ("*Backtrace*" :align below :size 0.25 :noselect t) ("*scratch*" :align below :size 0.3 :select t) - ("*Help*" :align below :size 25 :select t) + ("*Help*" :align below :size 21 :select t) ("*Messages*" :align below :size 20 :select t) ("*Completions*" :align below :size 20 :noselect t) (debugger-mode :align below :size 0.25 :noselect t) diff --git a/core/core-project.el b/core/core-project.el index d86859c59..781441e70 100644 --- a/core/core-project.el +++ b/core/core-project.el @@ -138,5 +138,25 @@ ;; A custom and simple theme for neotree (advice-add 'neo-buffer--insert-fold-symbol :override 'narf*neo-buffer-fold-symbol)) +(use-package projectile + :config + (setq projectile-require-project-root nil + projectile-enable-caching t + projectile-cache-file (concat narf-temp-dir "/projectile.cache") + projectile-known-projects-file (concat narf-temp-dir "/projectile.projects") + projectile-indexing-method 'alien + projectile-project-root-files narf-project-root-files + projectile-file-exists-remote-cache-expire nil) + + (push "ido.last" projectile-globally-ignored-files) + (push "assets" projectile-globally-ignored-directories) + (push ".cask" projectile-globally-ignored-directories) + (push ".export" projectile-globally-ignored-directories) + (push ".attach" projectile-globally-ignored-directories) + (push '("scss" "css") projectile-other-file-alist) + (push '("css" "scss") projectile-other-file-alist) + + (projectile-global-mode +1)) + (provide 'core-project) ;;; core-project.el ends here diff --git a/core/defuns/defuns-helm.el b/core/defuns/defuns-helm.el index 84d3f5cfe..7a010977f 100644 --- a/core/defuns/defuns-helm.el +++ b/core/defuns/defuns-helm.el @@ -18,6 +18,11 @@ ;; regexp. ;;;###autoload (autoload 'narf:helm-ag-search "defuns-helm" nil t) (evil-define-operator narf:helm-ag-search (beg end search regex-p &optional dir) + "Preform an helm-ag search with SEARCH. If SEARCH is nil and in visual mode, use the +selection, otherwise activate live ag searching in helm. + +If REGEX-P is non-nil, SEARCH will be treated as a regular expression. +DIR specifies the default-directory from which ag is run." :type inclusive :repeat nil (interactive "") diff --git a/core/defuns/defuns-repl.el b/core/defuns/defuns-repl.el index c9212385b..554968bfd 100644 --- a/core/defuns/defuns-repl.el +++ b/core/defuns/defuns-repl.el @@ -1,6 +1,5 @@ ;;; defuns-repl.el -(defvar narf--repl-buffer nil) ;;;###autoload (autoload 'narf:repl "defuns-repl" nil t) (evil-define-command narf:repl (&optional bang) :repeat nil diff --git a/init.el b/init.el index 6179babef..bb650f5eb 100644 --- a/init.el +++ b/init.el @@ -95,7 +95,7 @@ module-tmux ; closing the rift between GUI & terminal module-demo ; allow me to demonstrate... module-ansible ; - ;;module-write ; for write papers and fiction in Emacs + ;;module-write ; for writing papers and fiction in Emacs ;; Key bindings & ex commands my-bindings diff --git a/modules/module-ruby.el b/modules/module-ruby.el index 00fc662cf..67bd75771 100644 --- a/modules/module-ruby.el +++ b/modules/module-ruby.el @@ -24,7 +24,7 @@ (define-key ruby-mode-map [?\n] nil) (use-package ruby-refactor - :init (add-hook! ruby-mode 'emr-initialize) + :init (add-hook 'ruby-mode-hook 'emr-initialize) :config (require 'emr) (mapc (lambda (x)