diff options
Diffstat (limited to '.config/emacs/init.el')
-rw-r--r-- | .config/emacs/init.el | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 402957a..2a7645f 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -1,6 +1,6 @@ ;; Preliminary settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(set-face-attribute 'default nil :height 75) +(set-face-attribute 'default nil :height 80) (setq notify-method 'notify-via-libnotify) (add-to-list 'load-path "~/.emacs.d/") (add-to-list 'load-path "~/.emacs.d/el-get/el-get") @@ -91,11 +91,12 @@ ;(load "mdmua") (load "emacsutils") +(set-default 'truncate-lines t) (tool-bar-mode -1) (ido-mode t) (show-paren-mode 1) -(setq org-hide-leading-stars t) (setq org-log-done 'time) +(setq gamegrid-user-score-file-directory "/var/games/emacs/") ;(xclip-mode 1) (load "whitespace") @@ -201,6 +202,8 @@ (add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode)) (add-to-list 'auto-mode-alist '("SRCBUILD" . sh-mode)) +(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode)) +(add-to-list 'auto-mode-alist '("\\.ronn\\'" . markdown-mode)) ;(require 'flymake) ;(add-hook 'php-mode-hook (lambda() (flymake-mode 1))) @@ -209,3 +212,29 @@ ;(setq tramp-debug-buffer t) ;(setq tramp-verbose 10) + +;; (add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e") +;; (require 'mu4e) +;; (require 'mu4e-speedbar) + +;; (setq +;; mu4e-maildir "~/Maildir" ;; top-level Maildir +;; mu4e-sent-folder "/.Sent" ;; folder for sent messages +;; mu4e-drafts-folder "/.Draft" ;; unfinished messages +;; mu4e-trash-folder "/.Trash" ;; trashed messages +;; mu4e-refile-folder "/archive") ;; saved messages +;; (setq mu4e-get-mail-command "offlineimap") +;; (setq mu4e-use-fancy-chars "t") +;; ;; enable inline images +;; (setq mu4e-view-show-images t) +;; ;; use imagemagick, if available +;; (when (fboundp 'imagemagick-register-types) +;; (imagemagick-register-types)) + + +(defun sm-try-smerge () + (save-excursion + (goto-char (point-min)) + (when (re-search-forward "^<<<<<<< " nil t) + (smerge-mode 1)))) +(add-hook 'find-file-hook 'sm-try-smerge t) |