diff --git a/.emacs.d/init.el b/.emacs.d/init.el index e2d6da8..b8963b2 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -91,6 +91,9 @@ (eval-after-load "info" '(require 'info+)) +(eval-after-load "jabber" + '(remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo)) + (eval-after-load "org" '(progn (require 'appt) @@ -214,7 +217,7 @@ (setq jabber-history-dir "~/.emacs.d/jabber") (setq jabber-roster-show-bindings nil) (setq jit-lock-defer-time 0.2) -(setq mail-header-separator "") +(setq magit-repo-dirs '("~/var/src/")) (setq message-log-max 1000) (setq message-send-mail-function 'message-send-mail-with-sendmail) (setq mode-line-position nil) @@ -345,6 +348,7 @@ (add-hook 'go-mode-hook 'oni:go-mode-func) (add-hook 'gtags-mode-hook 'oni:gtags-mode-func) (add-hook 'html-mode-hook 'oni:html-mode-func) +(add-hook 'jabber-alert-message-hooks 'oni:jabber-alert-message-func) (add-hook 'jabber-chat-mode-hook 'oni:jabber-chat-mode-func) (add-hook 'jabber-roster-mode-hook 'oni:jabber-roster-mode-func) (add-hook 'java-mode-hook 'oni:java-mode-func) @@ -372,6 +376,7 @@ (global-set-key (kbd "") 'oni:raise-scratch) (global-set-key (kbd "") 'oni:view-mail) (global-set-key (kbd "") 'oni:start-emms) +(global-set-key (kbd "") 'git-project-show-files) (global-set-key (kbd "") 'ext:reload-buffer) (global-set-key (kbd "") 'jabber-switch-to-roster-buffer) (global-set-key (kbd "") 'magit-status) @@ -422,6 +427,8 @@ '("^\\*.*\\*$" . ((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)))) (delete " " mode-line-format)