summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/general.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/general.el b/lisp/general.el
index 87a381b..8c93df7 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -47,6 +47,7 @@
(require 'projectile)
(projectile-mode +1)
(define-key projectile-mode-map (kbd "s-q") 'projectile-command-map)
+(define-key projectile-mode-map (kbd "s-f") 'projectile-grep)
(define-key projectile-mode-map [?\s-t] 'projectile-switch-project)
(define-key projectile-mode-map [?\s-p] 'projectile-find-file)
@@ -54,10 +55,6 @@
(require 'ivy)
(ivy-mode 1)
(global-set-key (kbd "C-x C-f") 'counsel-find-file)
-;(ido-mode t)
-;(setq ido-enable-flex-matching t)
-;(require 'ido-vertical-mode)
-;(ido-vertical-mode)
;; Tree
(require 'neotree)
@@ -76,7 +73,11 @@
(evil-define-key 'normal neotree-mode-map (kbd "H") 'neotree-hidden-file-toggle)
;; Smooth scroll
-(good-scroll-mode 1)
+(setq redisplay-dont-pause t
+ scroll-margin 7
+ scroll-step 3
+ scroll-conservatively 10000
+ scroll-preserve-screen-position 1)
;; Line highlighting
(global-hl-line-mode 1)