diff options
| -rw-r--r-- | init.el | 3 | ||||
| -rw-r--r-- | lisp/general.el | 24 |
2 files changed, 12 insertions, 15 deletions
@@ -40,9 +40,6 @@ (set-face-attribute 'region nil :background "#ffffcd") ;; (setq debug-on-error t) Uncomment if you would liek to debug errors! -(require 'evil) -(evil-mode 1) - (require 'general) (require 'cpp) (require 'text) diff --git a/lisp/general.el b/lisp/general.el index 68e3521..b532825 100644 --- a/lisp/general.el +++ b/lisp/general.el @@ -46,8 +46,9 @@ (setq initial-major-mode 'text-mode) ;; Better undo functionality -(require 'evil) -(setq evil-want-fine-undo t) +;; TODO: Evil mode is disabled for now +;; (require 'evil) +;; (setq evil-want-fine-undo t) ;; Projectile for project navigation (require 'projectile) @@ -66,19 +67,18 @@ ;; Tree (require 'neotree) -(require 'evil) (setq neo-smart-open t) (setq projectile-switch-project-action 'neotree-projectile-action) (setq neo-theme (if (display-graphic-p) 'icons 'arrow)) -(evil-define-key 'normal neotree-mode-map (kbd "TAB") 'neotree-enter) -(evil-define-key 'normal neotree-mode-map (kbd "SPC") 'neotree-quick-look) -(evil-define-key 'normal neotree-mode-map (kbd "q") 'neotree-hide) -(evil-define-key 'normal neotree-mode-map (kbd "RET") 'neotree-enter) -(evil-define-key 'normal neotree-mode-map (kbd "g") 'neotree-refresh) -(evil-define-key 'normal neotree-mode-map (kbd "n") 'neotree-next-line) -(evil-define-key 'normal neotree-mode-map (kbd "p") 'neotree-previous-line) -(evil-define-key 'normal neotree-mode-map (kbd "A") 'neotree-stretch-toggle) -(evil-define-key 'normal neotree-mode-map (kbd "H") 'neotree-hidden-file-toggle) +;; (evil-define-key 'normal neotree-mode-map (kbd "TAB") 'neotree-enter) +;; (evil-define-key 'normal neotree-mode-map (kbd "SPC") 'neotree-quick-look) +;; (evil-define-key 'normal neotree-mode-map (kbd "q") 'neotree-hide) +;; (evil-define-key 'normal neotree-mode-map (kbd "RET") 'neotree-enter) +;; (evil-define-key 'normal neotree-mode-map (kbd "g") 'neotree-refresh) +;; (evil-define-key 'normal neotree-mode-map (kbd "n") 'neotree-next-line) +;; (evil-define-key 'normal neotree-mode-map (kbd "p") 'neotree-previous-line) +;; (evil-define-key 'normal neotree-mode-map (kbd "A") 'neotree-stretch-toggle) +;; (evil-define-key 'normal neotree-mode-map (kbd "H") 'neotree-hidden-file-toggle) (defun my-neotree-mode-hook() "Set the colors of neotree to match my personal taste." |