summaryrefslogtreecommitdiff
path: root/lisp/general.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/general.el')
-rw-r--r--lisp/general.el17
1 files changed, 11 insertions, 6 deletions
diff --git a/lisp/general.el b/lisp/general.el
index dc3af36..0b0d7ca 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -43,7 +43,7 @@
(setq initial-major-mode 'text-mode)
;(desktop-save-mode 1)
-;; Projectile for projects
+;; Projectile for project navigation
(require 'projectile)
(projectile-mode +1)
(define-key projectile-mode-map (kbd "s-q") 'projectile-command-map)
@@ -56,6 +56,15 @@
(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)
;; Smooth scroll
(setq redisplay-dont-pause t
@@ -84,7 +93,7 @@
(setq emojify-emoji-styles '(unicode))
(bind-key* (kbd "C-c e") #'emojify-insert-emoji)) ; override binding in any mode
-;; Company mode
+;; Company mode for code completion
(use-package company
:ensure t
:defer t
@@ -99,11 +108,7 @@
company-backends '((company-irony company-gtags))
company-vscode-light-icons-margin 1
)
- :bind ("C-;" . company-complete-common)
)
-;; Flycheck
-(eval-after-load 'flycheck '(add-hook 'flycheck-mode-hook #'flycheck-irony-setup))
-
(provide 'general)
;;; general.el ends here