summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/general.el18
1 files changed, 12 insertions, 6 deletions
diff --git a/lisp/general.el b/lisp/general.el
index 1b4f220..76930d1 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -21,6 +21,13 @@
(tool-bar-mode -1)
(setq mac-shift-modifier 'meta)
+;; Reload user init file
+(defun reload-init-file ()
+ (interactive)
+ (load-file user-init-file))
+
+(global-set-key (kbd "C-c C-l") 'reload-init-file)
+
;; Tab mode
(global-tab-line-mode t)
@@ -92,10 +99,12 @@
(define-key projectile-mode-map [?\s-o] 'projectile-switch-project)
(define-key projectile-mode-map [?\s-p] 'projectile-find-file)
(add-to-list 'projectile-globally-ignored-directories "*node_modules")
+(setq projectile-indexing-method 'alien)
;; Ido mode text matching
(require 'ivy)
(ivy-mode 1)
+(setcdr (assoc 'counsel-M-x ivy-initial-inputs-alist) "") ;; Start the searc buffer empty
;; Don't ask to kill when we have an open line number
(setq-default confirm-kill-processes nil)
@@ -122,9 +131,6 @@
(add-hook 'neotree-mode-hook 'my-neotree-mode-hook)
(setq neo-window-width 36)
-;; Smooth scroll
-(setq scroll-margin 7)
-
;; Line highlighting
(global-hl-line-mode 1)
(set-face-background 'hl-line "unspecified")
@@ -155,9 +161,9 @@
;; Show flycheck always and after save
-(use-package flycheck :ensure t)
-(global-flycheck-mode)
-(add-hook 'after-init-hook #'global-flycheck-mode)
+;(use-package flycheck :ensure t)
+;(global-flycheck-mode)
+ ;(add-hook 'after-init-hook #'global-flycheck-mode)
;; Emojis
(use-package emojify