diff options
Diffstat (limited to '.emacs.d/init.el')
| -rw-r--r-- | .emacs.d/init.el | 72 |
1 files changed, 41 insertions, 31 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index b99ce68..d6ba9ac 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -3,11 +3,6 @@ ;;; Commentary: ;; Does so much and changes so often -(require 'geiser-install) -(require 'iso-transl) -(require 'newcomment) -(require 'uniquify) -(require 'w3m-load) ;;; Code: @@ -18,8 +13,20 @@ (add-to-list 'load-path directory) (let ((default-directory directory)) (normal-top-level-add-subdirs-to-load-path))) - '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp"))) + '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp" + "/usr/local/emacs/share/emacs/site-lisp")) + (mapc #'(lambda (directory) + (add-to-list 'load-path directory) + (let ((loaddefs (concat directory "/loaddefs.el"))) + (when (file-exists-p loaddefs) + (load loaddefs)))) + '("~/var/src/emacs/dispass.el" "~/var/src/emacs/mode-icons"))) +(require 'geiser-install) +(require 'iso-transl) +(require 'newcomment) +(require 'uniquify) +(require 'w3m-load) (require 'ext) (require 'oni) @@ -59,27 +66,22 @@ "Face for the supposedly empty line in commit messages." :group 'local) -(eval-after-load "ebuff-menu" - '(define-key electric-buffer-menu-mode-map - (kbd "C-s") 'isearch-forward)) - (eval-after-load "em-term" - '(add-to-list 'eshell-visual-commands - "unison")) + '(add-to-list 'eshell-visual-commands "unison")) (eval-after-load "emms-source-file" - '(progn - (require 'emms-setup) + '(progn + (require 'emms-setup) + (require 'emms-player-mpd) - (emms-standard) - (require 'emms-player-mpd) + (emms-standard) - (setq emms-player-mpd-server-name "localhost") - (setq emms-player-mpd-server-port "6600") + (add-to-list 'emms-info-functions 'emms-info-mpd) + (add-to-list 'emms-player-list 'emms-player-mpd) - (add-to-list 'emms-info-functions 'emms-info-mpd) - (add-to-list 'emms-player-list 'emms-player-mpd) - (setq emms-player-mpd-music-directory "/mnt/music/mp3"))) + (setq emms-player-mpd-server-name "localhost") + (setq emms-player-mpd-server-port "6600") + (setq emms-player-mpd-music-directory "/mnt/music/mp3"))) (eval-after-load "flymake" '(progn @@ -108,8 +110,8 @@ (eval-after-load "jabber" '(remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo)) -(eval-after-load "mu4e" - '(require 'mu4e-init)) +(eval-after-load "newst-treeview" + '(require 'newsticker-init)) (eval-after-load "org" '(require 'org-init)) @@ -157,7 +159,8 @@ (arglist-close . 0) (inline-open . 0) (brace-list-open . +) - (topmost-intro-cont first c-lineup-topmost-intro-cont c-lineup-gnu-DEFUN-intro-cont))) + (topmost-intro-cont first c-lineup-topmost-intro-cont + c-lineup-gnu-DEFUN-intro-cont))) (setq comment-auto-fill-only-comments t) (setq custom-file "~/.emacs.d/custom.el") (setq custom-theme-directory "~/.emacs.d/themes") @@ -167,7 +170,7 @@ (vertical-scroll-bars . nil) (menu-bar-lines . nil) (tool-bar-lines . nil) - (font . "Monaco:pixelsize=16"))) + (font . "monaco-12"))) (setq emms-source-file-default-directory "/mnt/music/") (setq erc-autojoin-channels-alist '(("freenode.net" "#ninthfloor" "#emacs" "#dispass"))) @@ -209,6 +212,8 @@ "line too long" "at least two spaces before inline comment" "trailing whitespace" + "imported but unused" + "Unused import" "too many blank lines")))) (setq flymake-log-file-name (expand-file-name "~/.emacs.d/flymake.log")) (setq flymake-log-level 0) @@ -216,7 +221,6 @@ (eval-when-compile (regexp-opt '("warning" "Warning" - "imported but unused" "redefinition of unused" "Redefining built-in" "Redefining name" @@ -284,8 +288,10 @@ (setq use-dialog-box nil) (setq user-full-name "Tom Willemsen") (setq user-mail-address "tom@ryuslash.org") +(setq w3m-fill-column 72) (setq window-combination-resize t) +(add-hook 'after-change-major-mode-hook 'set-current-mode-icon) (add-hook 'after-save-hook 'oni:after-save-func t) (add-hook 'before-save-hook 'oni:before-save-func) (add-hook 'c-mode-hook 'oni:c-mode-func) @@ -316,6 +322,7 @@ (add-hook 'term-mode-hook 'oni:term-mode-func) (add-hook 'texinfo-mode-hook 'oni:texinfo-mode-func) (add-hook 'write-file-hooks 'oni:write-file-func) +(add-hook 'yas-minor-mode-hook 'oni:yas-minor-mode-func) (global-set-key (kbd "'") 'oni:self-insert-dwim) (global-set-key (kbd "<XF86AudioNext>") 'emms-next) @@ -359,7 +366,8 @@ (add-to-list 'auto-mode-alist '("\\.jl$" . sawfish-mode)) (add-to-list 'auto-mode-alist '("\\.js\\(on\\)?$" . js2-mode)) -(add-to-list 'auto-mode-alist '("\\.m\\(ark\\)?d\\(?:o?wn\\)?$" . markdown-mode)) +(add-to-list 'auto-mode-alist + '("\\.m\\(ark\\)?d\\(?:o?wn\\)?$" . markdown-mode)) (add-to-list 'auto-mode-alist '("\\.php[345]?$" . php-mode)) (add-to-list 'auto-mode-alist '("\\.po\\'\\|\\.po\\." . po-mode)) (add-to-list 'auto-mode-alist '("\\.tpl$" . html-mode)) @@ -371,10 +379,12 @@ (add-to-list 'debug-ignored-errors "^Can't shift all lines enough") -(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)))) +(add-to-list + 'display-buffer-alist + '(".*" . ((display-buffer-same-window . nil)))) +(add-to-list + 'display-buffer-alist + '("^\\*git-project-list\\*$" . ((git-project-show-window . nil)))) (delete " " mode-line-format) |