diff options
| author |  Tom Willemse | 2019-02-28 22:06:21 -0800 |
|---|---|---|
| committer | Tom Willemse | 2019-02-28 22:06:21 -0800 |
| commit | 93815291dd1a117a8dbec9ec4a827a886c1cc27c (patch) | |
| tree | 0262767238ba3715b101f7224586afe753f60b29 /emacs | |
| parent | c46ae7fd4f04a098bac824fbda149e93daa27c6d (diff) | |
| download | new-dotfiles-93815291dd1a117a8dbec9ec4a827a886c1cc27c.tar.gz new-dotfiles-93815291dd1a117a8dbec9ec4a827a886c1cc27c.zip | |
Move Ivy configuration to emacs-config
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/.emacs.d/init.el | 6 | ||||
| -rwxr-xr-x | emacs/.emacs.d/os-lisp/oni-windows-nt.el | 15 |
2 files changed, 0 insertions, 21 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 0b3d908..95a7469 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -45,8 +45,6 @@ (require 'destroy-trailing-whitespace) (require 'diminish) -(require 'ivy) -(require 'ivy-hydra) ;;;; Settings @@ -106,10 +104,6 @@ (defalias 'yes-or-no-p 'y-or-n-p) -(diminish 'ivy-mode) - -(ivy-mode) - (setq user-full-name "Tom Willemse" user-mail-address "tom@ryuslash.org") diff --git a/emacs/.emacs.d/os-lisp/oni-windows-nt.el b/emacs/.emacs.d/os-lisp/oni-windows-nt.el index b0ed004..463f0b4 100755 --- a/emacs/.emacs.d/os-lisp/oni-windows-nt.el +++ b/emacs/.emacs.d/os-lisp/oni-windows-nt.el @@ -29,7 +29,6 @@ (package-initialize) (require 'find-dired) - (require 'ivy) (require 'grep) (require 'magit) (require 'alert) @@ -37,17 +36,6 @@ (require 'projectile) (require 'sort)) -(defun oni-windows-nt--disable-ivy (orig-fun &rest args) - "Disable ivy while running ORIG-FUN with ARGS." - (let ((ivy-enabled ivy-mode)) - (unwind-protect - (progn - (when ivy-enabled - (ivy-mode -1)) - (apply orig-fun args)) - (when ivy-enabled - (ivy-mode 1))))) - (add-to-list 'load-path (locate-user-emacs-file "vendor/p4-vc")) (add-to-list 'exec-path "c:/Program Files/Git/bin") (add-to-list 'exec-path "C:/Program Files/Git/usr/bin") @@ -75,9 +63,6 @@ (setq alert-toaster-command "U:/projects/toaster/toast/bin/Release/toast.exe") (setq alert-toaster-default-icon "c:/Users/WillemsenT/Emacs-25.1-2/share/emacs/25.1/etc/images/icons/hicolor/48x48/apps/emacs.png")) -(with-eval-after-load 'grep - (add-function :around (symbol-function 'grep-read-files) #'oni-windows-nt--disable-ivy)) - (with-eval-after-load 'magit (setq magit-git-executable "c:/msys64/usr/bin/git.exe")) |