diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/general.el | 42 | ||||
| -rw-r--r-- | lisp/org-custom.el | 6 |
2 files changed, 19 insertions, 29 deletions
diff --git a/lisp/general.el b/lisp/general.el index 3a16614..67a4020 100644 --- a/lisp/general.el +++ b/lisp/general.el @@ -61,18 +61,6 @@ (setq isearch-lazy-highlight t) (setq isearch-lazy-count t) -;; Minimap -(defun my-minimap() - "Turn on the minimap." - (require 'minimap) - (minimap-mode 1) - (setq-default minimap-window-location "right") - (setq-default minimap-highlight-line 1) - (setq-default minimap-update-delay 0.5) - (setq-default minimap-hide-fringes 1) - (setq-default minimap-width-fraction 0.05) - ) - ;; Fringe (setq-default left-fringe-width 20) (setq-default right-fringe-width 20) @@ -82,34 +70,34 @@ (setq initial-scratch-message "* Scratch") (setq initial-major-mode 'org-mode) -;; Better undo functionality -;; TODO: Evil mode is disabled for now -;; (require 'evil) -;; (setq evil-want-fine-undo t) - ;; Highlight todos -(require 'hl-todo) -(global-hl-todo-mode 1) +(use-package hl-todo + :config + (global-hl-todo-mode 1) + ) ;; Delete highlighted selection (delete-selection-mode 1) +;; I am using the helm package, of course +(use-package helm) + ;; Projectile for project navigation +(use-package projectile) (require 'projectile) (projectile-mode +1) -(define-key projectile-mode-map (kbd "s-F") 'projectile-grep) -(define-key projectile-mode-map [?\s-o] 'projectile-switch-project) -(define-key projectile-mode-map [?\s-p] 'projectile-find-file) +(use-package helm-projectile + :config + (helm-projectile-on) + ) +(define-key projectile-mode-map (kbd "s-F") 'helm-projectile-grep) +(define-key projectile-mode-map [?\s-o] 'helm-projectile-switch-project) +(define-key projectile-mode-map [?\s-p] 'helm-projectile-find-file) ;(setq projectile-indexing-method 'alien) (setq projectile-indexing-method 'native) (setq projectile-enable-caching t) (add-to-list 'projectile-globally-ignored-directories "node_modules") -;; Ido mode text matching -(require 'ivy) -(ivy-mode 1) -(setq ivy-initial-inputs-alist nil) - ;; Don't ask to kill when we have an open line number (setq-default confirm-kill-processes nil) diff --git a/lisp/org-custom.el b/lisp/org-custom.el index 9841bd6..da23201 100644 --- a/lisp/org-custom.el +++ b/lisp/org-custom.el @@ -47,8 +47,10 @@ (variable-pitch-mode 1) - (require 'org-bullets) - (org-bullets-mode 1) + (use-package org-bullets + :config + (org-bullets-mode 1) + ) (org-indent-mode 1) (visual-line-mode 1) |