diff --git a/global.org b/global.org index 1791d79..6c38bbf 100644 --- a/global.org +++ b/global.org @@ -186,6 +186,7 @@ (setq indent-tabs-mode nil) #+END_SRC + ** Show matching parens Use mic-paren for paren-highlighting *** TODO find out if there are better options out there @@ -230,7 +231,17 @@ ;; (setq fcl-fringe-bitmap 'right-triangle) #+END_SRC -** Use ~helm~ +* Main packages +** Outshine + #+BEGIN_SRC emacs-lisp + (require 'outshine) + (add-hook 'outline-minor-mode-hook 'outshine-hook-function) + (setq outshine-use-speed-commands t) + (defvar outline-minor-mode-prefix "\M-#") + (eval-after-load 'outshine '(define-key outline-minor-mode-map (kbd "C-M-i") nil)) + ;; (add-hook 'sh-mode-hook 'outline-minor-mode) + #+END_SRC +** ~helm~ #+BEGIN_SRC emacs-lisp (require 'helm-config) (helm-mode 1) @@ -246,8 +257,6 @@ #+BEGIN_SRC emacs-lisp (setq search-whitespace-regexp "[ \t\r\n]+") - (defvar outline-minor-mode-prefix "\M-#") - ;; * include other files (load "init-latex.el") (load "init-org.el") @@ -299,7 +308,6 @@ ;; * magit - (global-set-key (kbd "C-x C-g") 'magit-status) ;;relates to C-x C-f and C-x C-s ;; * smart-tab-mode (require 'smart-tab) @@ -334,7 +342,7 @@ If the directory ~/.emacs.d exists, we make a filename in there, otherwise a file in the home directory." (let ((basename (concat "sessions/session." session-id)) - (emacs-dir user-emacs-directory)) + (emacs-dir user-emacs-directory)) (expand-file-name (if (file-directory-p emacs-dir) (concat emacs-dir basename) (concat "~/.emacs-" basename))))) @@ -451,13 +459,6 @@ - ;; * toorg - (require 'outshine) - (add-hook 'outline-minor-mode-hook 'outshine-hook-function) - (setq outshine-use-speed-commands t) - (eval-after-load 'outshine '(define-key outline-minor-mode-map (kbd "C-M-i") nil)) - ;; (add-hook 'sh-mode-hook 'outline-minor-mode) - (require 'package) (add-to-list 'package-archives '("melpa-stable" . "http://stable.melpa.org/packages/") t)