ryuslash/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move Ivy configuration to emacs-config

Browse source
This commit is contained in:
Tom Willemse 2019-02-28 22:06:21 -08:00
parent c46ae7fd4f
commit 93815291dd
2 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
emacs/.emacs.d/init.el
View file

@ -45,8 +45,6 @@
(require 'destroy-trailing-whitespace) (require 'destroy-trailing-whitespace)
(require 'diminish) (require 'diminish)
(require 'ivy)
(require 'ivy-hydra)
;;;; Settings ;;;; Settings
@ -106,10 +104,6 @@
(defalias 'yes-or-no-p 'y-or-n-p) (defalias 'yes-or-no-p 'y-or-n-p)
(diminish 'ivy-mode)
(ivy-mode)
(setq user-full-name "Tom Willemse" (setq user-full-name "Tom Willemse"
user-mail-address "tom@ryuslash.org") user-mail-address "tom@ryuslash.org")

15
emacs/.emacs.d/os-lisp/oni-windows-nt.el
View file

@ -29,7 +29,6 @@
(package-initialize) (package-initialize)
(require 'find-dired) (require 'find-dired)
(require 'ivy)
(require 'grep) (require 'grep)
(require 'magit) (require 'magit)
(require 'alert) (require 'alert)
@ -37,17 +36,6 @@
(require 'projectile) (require 'projectile)
(require 'sort)) (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 '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/bin")
(add-to-list 'exec-path "C:/Program Files/Git/usr/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-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")) (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 (with-eval-after-load 'magit
(setq magit-git-executable "c:/msys64/usr/bin/git.exe")) (setq magit-git-executable "c:/msys64/usr/bin/git.exe"))