diff options
Diffstat (limited to '.emacs.d/init.el')
| -rw-r--r-- | .emacs.d/init.el | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 6af7c3e..b99ce68 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -42,6 +42,7 @@ (defalias 'yes-or-no-p 'y-or-n-p) (defalias 'list-buffers 'ibuffer) +(defalias 'dabbrev-expand 'hippie-expand) (defface git-commit-summary-face '((t (:inherit org-level-1))) @@ -97,13 +98,13 @@ 'flymake-allowed-file-name-masks ; flymaking 'easy'. '("\\.go$" flymake-simple-make-init)))) +(eval-after-load "hippie-exp" + '(oni:load-hippie-exp 'yasnippet)) + (eval-after-load "ido" '(setq ido-ignore-buffers `(,@ido-ignore-buffers "^\\*.*\\*$" "^irc\\." "^\\#"))) -(eval-after-load "info" - '(require 'info+)) - (eval-after-load "jabber" '(remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo)) @@ -118,6 +119,9 @@ (global-set-key (kbd "M-x") 'smex) (global-set-key (kbd "C-M-x") 'smex-major-mode-commands))) +(eval-after-load "yasnippet" + '(oni:load-hippie-exp 'hippie-exp)) + (put 'upcase-region 'disabled nil) (put 'downcase-region 'disabled nil) (put 'narrow-to-region 'disabled nil) @@ -252,6 +256,7 @@ (setq magit-repo-dirs '("~/var/src/")) (setq message-log-max 1000) (setq message-send-mail-function 'message-send-mail-with-sendmail) +(setq message-sendmail-extra-arguments '("-a" "ryuslash")) (setq mode-line-position nil) (setq package-archives '(("melpa" . "http://melpa.milkbox.net/packages/") @@ -264,9 +269,10 @@ (setq php-function-call-face 'font-lock-function-name-face) (setq php-mode-force-pear t) (setq pony-tpl-indent-moves t) +(setq pp^L-^L-string-function 'oni:pretty-control-l-function) +(setq pp^L-^L-string-pre nil) (setq rainbow-delimiters-max-face-count 12) (setq redisplay-dont-pause t) -(setq scroll-conservatively 101) (setq send-mail-function 'smtpmail-send-it) (setq sendmail-program "/usr/bin/msmtp") (setq smex-key-advice-ignore-menu-bar t) @@ -277,6 +283,7 @@ (setq uniquify-buffer-name-style 'post-forward) (setq use-dialog-box nil) (setq user-full-name "Tom Willemsen") +(setq user-mail-address "tom@ryuslash.org") (setq window-combination-resize t) (add-hook 'after-save-hook 'oni:after-save-func t) @@ -365,10 +372,6 @@ (add-to-list 'debug-ignored-errors "^Can't shift all lines enough") (add-to-list 'display-buffer-alist - '(".*" . ((bw-display-in-other-window . nil)))) -(add-to-list 'display-buffer-alist - '("^\\*.*\\*$" . ((bw-display-in-bottom-window . nil)))) -(add-to-list 'display-buffer-alist '("^\\*magit: .*\\*$" . ((display-buffer-same-window . nil)))) (add-to-list 'display-buffer-alist '("^\\*git-project-list\\*$" . ((git-project-show-window . nil)))) |