Compare commits

...

5 Commits

4 changed files with 40 additions and 4 deletions

View File

@ -475,5 +475,9 @@ DEFS is a plist associating completion categories to commands."
:hook
(embark-collect-mode . consult-preview-at-point-mode))
(use-package consult-todo
;; TODO use consult-todo-project when it works
:bind ("C-c c t t" . consult-todo))
(provide 'init-minibuffer)
;;; init-minibuffer.el ends here

View File

@ -2,13 +2,14 @@
;;; Commentary:
;;; Code:
(defvar elpaca-installer-version 0.5)
;; Elpaca installer block
(defvar elpaca-installer-version 0.6)
(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
(defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git"
:ref nil
:files (:defaults (:exclude "extensions"))
:files (:defaults "elpaca-test.el" (:exclude "extensions"))
:build (:not elpaca--activate-package)))
(let* ((repo (expand-file-name "elpaca/" elpaca-repos-directory))
(build (expand-file-name "elpaca/" elpaca-builds-directory))
@ -38,6 +39,7 @@
(load "./elpaca-autoloads")))
(add-hook 'after-init-hook #'elpaca-process-queues)
(elpaca `(,@elpaca-order))
;; End of elpaca installer block
;; Install use-package support
(elpaca elpaca-use-package

View File

@ -95,7 +95,7 @@
;; Configure Orderless
(defun affe-orderless-regexp-compiler (input _type _ignorecase)
(setq input (orderless-pattern-compiler input))
(cons input (lambda (str) (orderless--highlight input str))))
(cons input (apply-partially #'orderless--highlight input t)))
(setq affe-regexp-compiler #'affe-orderless-regexp-compiler)
;; Manual preview key for `affe-grep'
(consult-customize affe-grep :preview-key (kbd "M-."))

View File

@ -20,6 +20,32 @@
(add-to-list 'custom-theme-load-path "~/.emacs.d/themes")
(load-theme 'non-modo t)))
;; http://yummymelon.com/devnull/enhancing-navigation-in-emacs-view-mode.html
(view-mode . (lambda ()
(cond ((derived-mode-p 'org-mode)
(define-key view-mode-map (kbd "p") 'org-previous-visible-heading)
(define-key view-mode-map (kbd "n") 'org-next-visible-heading))
((derived-mode-p 'markdown-mode)
(define-key view-mode-map (kbd "p") 'markdown-outline-previous)
(define-key view-mode-map (kbd "n") 'markdown-outline-next))
((derived-mode-p 'html-mode)
(define-key view-mode-map (kbd "p") 'sgml-skip-tag-backward)
(define-key view-mode-map (kbd "n") 'sgml-skip-tag-forward))
((derived-mode-p 'emacs-lisp-mode)
(define-key view-mode-map (kbd "p") 'backward-sexp)
(define-key view-mode-map (kbd "n") 'forward-sexp))
((derived-mode-p 'clojure-mode)
(define-key view-mode-map (kbd "p") 'backward-sexp)
(define-key view-mode-map (kbd "n") 'forward-sexp))
((derived-mode-p 'makefile-mode)
(define-key view-mode-map (kbd "p") 'makefile-previous-dependency)
(define-key view-mode-map (kbd "n") 'makefile-next-dependency))
((derived-mode-p 'c-mode)
(define-key view-mode-map (kbd "p") 'c-beginning-of-defun)
(define-key view-mode-map (kbd "n") 'c-end-of-defun))
(t
(define-key view-mode-map (kbd "p") 'scroll-down-command)
(define-key view-mode-map (kbd "n") 'scroll-up-command)))))
:config
;; https://github.com/rougier/elegant-emacs/blob/master/sanity.el
(setq inhibit-startup-screen t
@ -32,7 +58,11 @@
(setq show-trailing-whitespace t)
(setq-default indicate-empty-lines t)
(setq ring-bell-function 'ignore
;; http://whattheemacsd.com/appearance.el-02.html (if this gets to annoying, just set back to 'ignore)
(setq ring-bell-function (lambda ()
(invert-face 'mode-line)
(run-with-timer 0.05 nil 'invert-face 'mode-line))
visible-bell t)
;; TODO do we want these? (copied from prelude)