diff options
Diffstat (limited to 'emacs/init.el')
| -rw-r--r-- | emacs/init.el | 536 |
1 files changed, 285 insertions, 251 deletions
diff --git a/emacs/init.el b/emacs/init.el index 9198675..3db05da 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -1,35 +1,28 @@ -;;; Turn the menu, scroll-bar and tool-bar off quickly, so they don't -;;; jump around as much. -(menu-bar-mode -1) +(menu-bar-mode -1) (scroll-bar-mode -1) -(tool-bar-mode -1) - -(defmacro eval-after-init (&rest body) - "Defer execution of BODY until after Emacs init. - -Some functionality is dependent on code loaded by package.el. -Instead of requiring package.el to load very early on, have some -functionality deferred to a point after Emacs has initialized and -package.el is loaded anyway." - `(add-hook 'emacs-startup-hook #'(lambda () ,@body))) - -;;; Add some project directories and my site-lisp directory to the -;;; load path to make it easy to (auto)load them. +(tool-bar-mode -1) + (mapc #'(lambda (dir) (add-to-list 'load-path dir) (let ((loaddefs (concat dir "/loaddefs.el"))) (when (file-exists-p loaddefs) (load loaddefs)))) - '("~/projects/emacs/mode-icons" "~/.emacs.d/site-lisp" - "~/projects/emacs/pony-mode/src" "~/projects/emacs/php-mode")) - -;;; I have never, yet, accidentally said `y' or `n' when asked. + '("~/.emacs.d/site-lisp" "~/projects/emacs/pony-mode/src" + "~/projects/emacs/php-mode" "~/.emacs.d/vendor-lisp/org/lisp" + "~/.emacs.d/vendor-lisp/org/contrib/lisp")) + +(require 'ext) +(require 'oni) + +(setq custom-theme-directory "~/.emacs.d/themes") +(oni:eval-after-init (load-theme 'yoshi t)) + (defalias 'yes-or-no-p 'y-or-n-p) -;;; These are much more feature-rich. (defalias 'list-buffers 'ibuffer) + (defalias 'dabbrev-expand 'hippie-expand) - + (defun ext:comp-finish-function (buf str) "Close the compilation buffer quickly if everything went OK." (if (string-match "exited abnormally" str) @@ -37,30 +30,76 @@ package.el is loaded anyway." (message "compilation errors, press C-x ` to visit") ;; no errors, make the compilation window go away in 0.5 seconds (when (member (buffer-name) '("*Compilation*" "*compilation*")) - (run-at-time 0.5 nil 'delete-windows-on buf) + (delete-windows-on buf) (message "No compilation errors!")))) (add-to-list 'compilation-finish-functions 'ext:comp-finish-function) -;;; I close the compilation window if there are no errors. Seeing it -;;; scroll past lets me see if there were any warnings I might want to -;;; look at. (setq compilation-scroll-output t) - -;;; Enable the excellent `paredit-mode' for any lisp-like languages. -(add-hook 'clojure-mode-hook 'paredit-mode) + +(add-hook 'prog-mode-hook 'auto-fill-mode) +(add-hook 'text-mode-hook 'auto-fill-mode) + +(add-hook 'emacs-lisp-mode-hook 'eldoc-mode) +(add-hook 'ielm-mode-hook 'eldoc-mode) + +(add-hook 'html-mode-hook 'fci-mode) +(add-hook 'prog-mode-hook 'fci-mode) + +(add-hook 'css-mode-hook 'flycheck-mode) +(add-hook 'emacs-lisp-mode-hook 'flycheck-mode) +(add-hook 'go-mode-hook 'flycheck-mode) +(add-hook 'html-mode-hook 'flycheck-mode) +(add-hook 'js2-mode-hook 'flycheck-mode) +(add-hook 'lua-mode-hook 'flycheck-mode) +(add-hook 'php-mode-hook 'flycheck-mode) +(add-hook 'python-mode-hook 'flycheck-mode) +(add-hook 'rst-mode-hook 'flycheck-mode) +(add-hook 'ruby-mode-hook 'flycheck-mode) +(add-hook 'rust-mode-hook 'flycheck-mode) +(add-hook 'sh-mode-hook 'flycheck-mode) + +(add-hook 'text-mode-hook 'flyspell-mode) + +(add-hook 'clojure-mode-hook 'paredit-mode) (add-hook 'emacs-lisp-mode-hook 'paredit-mode) -(add-hook 'lisp-mode-hook 'paredit-mode) -(add-hook 'sawfish-mode-hook 'paredit-mode) -(add-hook 'scheme-mode-hook 'paredit-mode) - -;;; Remove the pylint and pyflakes checkers from the flycheck -;;; configuration so the flake8 checker remains. +(add-hook 'lisp-mode-hook 'paredit-mode) +(add-hook 'sawfish-mode-hook 'paredit-mode) +(add-hook 'scheme-mode-hook 'paredit-mode) +(add-hook 'ielm-mode-hook 'paredit-mode) + +(add-hook 'prog-mode-hook 'rainbow-delimiters-mode) + +(add-hook 'css-mode-hook 'rainbow-mode) + +(add-hook 'js2-mode-hook 'slime-js-minor-mode) + +(add-hook 'html-mode-hook 'smartparens-mode) +(add-hook 'python-mode-hook 'smartparens-mode) + +(add-hook 'jabber-chat-mode-hook 'visual-line-mode) +(add-hook 'erc-mode-hook 'visual-line-mode) + +(add-hook 'markdown-mode-hook 'whitespace-mode) +(add-hook 'python-mode-hook 'whitespace-mode) + +(add-hook 'html-mode-hook 'yas-minor-mode) +(add-hook 'org-mode-hook 'yas-minor-mode) +(add-hook 'prog-mode-hook 'yas-minor-mode) + +(defun oni:turn-on-tagedit-mode () + (require 'tagedit) + (tagedit-mode) + (tagedit-add-paredit-like-keybindings) + (tagedit-add-experimental-features)) + +(add-hook 'html-mode-hook 'oni:turn-on-tagedit-mode) + (eval-after-load "flycheck" '(progn (mapc (lambda (c) (delq c flycheck-checkers)) '(python-pylint python-pyflakes)))) - + (defun oni:pretty-control-l-function (win) "Just make a string of either `fci-rule-column' or `fill-column' length -1. Use the `-' character. WIN is ignored." @@ -68,61 +107,47 @@ package.el is loaded anyway." (make-string (1- (if (boundp 'fci-rule-column) fci-rule-column fill-column)) ?-)) -;;; Use `oni:pretty-control-l-function' to create a nice horizontal -;;; line. -(setq pp^L-^L-string-function 'oni:pretty-control-l-function) +(setq pp^L-^L-string-function 'oni:pretty-control-l-function + pp^L-^L-string-pre nil) -;;; Don't put anything before the pp^L string. -(setq pp^L-^L-string-pre nil) - -;;; Enable pp^L at startup and again for each frame created. (add-hook 'emacs-startup-hook 'pretty-control-l-mode) (add-hook 'after-make-frame-functions '(lambda (arg) (pretty-control-l-mode))) - + (setq erc-autojoin-channels-alist - '(("freenode.net" "#ninthfloor" "#emacs"))) + '(("freenode.net" "#ninthfloor" "#emacs" "#dispass"))) + (setq erc-hide-list '("PART")) -(setq erc-insert-timestamp-function 'erc-insert-timestamp-left) -(setq erc-timestamp-format "[%H:%M] ") -(setq erc-timestamp-only-if-changed-flag nil) + +(setq erc-insert-timestamp-function 'erc-insert-timestamp-left + erc-timestamp-format "[%H:%M] " + erc-timestamp-only-if-changed-flag nil) + (setq erc-nick "ryuslash") -(defun oni:erc-mode-func () - "Function for `erc-mode-hook'." - (erc-fill-mode -1) - (visual-line-mode) - (setq truncate-lines nil)) +(defun oni:turn-off-erc-fill-mode () (erc-fill-mode -1)) +(add-hook 'erc-mode-hook 'oni:turn-off-erc-fill-mode) -(add-hook 'erc-mode-hook 'oni:erc-mode-func) - -;;; Since unison requires unbuffered input it should not show up in -;;; eshell, but a real term shell. (eval-after-load "em-term" '(add-to-list 'eshell-visual-commands "unison")) -;;; To be able to highlight the eshell prompt just as I want it with -;;; regular text properties the standard highlighting should be turned -;;; off, otherwise it always overwrites whatever text properties it -;;; finds. (setq eshell-highlight-prompt nil) (defun oni:eshell-prompt-function () "Show a pretty shell prompt." (let ((status (if (zerop eshell-last-command-status) ?+ ?-)) - (hostname (shell-command-to-string "hostname")) + (hostname (oni:hostname)) (dir (abbreviate-file-name (eshell/pwd))) (branch (shell-command-to-string - "git branch --contains HEAD 2>/dev/null | sed -e '/^[^*]/d'")) - (userstatus (if (zerop (user-uid)) ?# ?$))) + "git branch --contains HEAD 2>/dev/null | sed -e '/^[^*]/d'"))) (concat (propertize (char-to-string status) 'face `(:foreground ,(if (= status ?+) "green" "red"))) " " - (propertize (substring hostname 0 -1) 'face 'mode-line-buffer-id) + (propertize hostname 'face 'mode-line-buffer-id) " " (propertize (oni:shorten-dir dir) 'face 'font-lock-string-face) " " @@ -131,19 +156,10 @@ package.el is loaded anyway." ;; Cut off "* " and "\n" (substring branch 2 -1) 'face 'font-lock-function-name-face)) - " \n" - (propertize (char-to-string userstatus) - 'face `(:foreground "blue")) - "> "))) + " \n> "))) (setq eshell-prompt-function 'oni:eshell-prompt-function - eshell-prompt-regexp "^[#$]> ") - -(defun oni:eshell-mode-func () - "Function for `eshell-mode-hook'." - (setq truncate-lines nil)) - -(add-hook 'eshell-mode-hook 'oni:eshell-mode-func) + eshell-prompt-regexp "^> ") (defun oni:raise-eshell () "Start or switch back to `eshell'. @@ -151,52 +167,44 @@ Also change directories to current working directory." (interactive) (let ((dir (file-name-directory (or (buffer-file-name) "~/"))) - (hasfile (not (eq (buffer-file-name) nil)))) + (hasfile (not (eq (buffer-file-name) nil))) + (started (and (boundp 'eshell-buffer-name) eshell-buffer-name + (buffer-live-p (get-buffer eshell-buffer-name))))) (eshell) - (if (and hasfile (eq eshell-process-list nil)) - (progn - (eshell/cd dir) - (eshell-reset))))) + (when (and hasfile (eq eshell-process-list nil)) + (eshell/cd dir) + (when started + (eshell-reset))))) (global-set-key (kbd "<f8>") 'oni:raise-eshell) - -;;; Since I don't ever get any mail from people that use right-to-left -;;; text, and even if I did I wouldn't be able to read it, I don't -;;; need bidirectional text support. You shouldn't actually disable it -;;; (if that's even still possible) since, supposedly, it is an -;;; integral part of the display engine now, but telling it to always -;;; use left-to-right should keep it from slowing your emacs down. + +(add-hook 'eshell-mode-hook 'buffer-disable-undo) + (setq-default bidi-paragraph-direction 'left-to-right) - -;;; Enable the following commands because they're useful sometimes and -;;; I'm not an Emacs beginner anymore, they don't confuse me. -(put 'upcase-region 'disabled nil) -(put 'downcase-region 'disabled nil) + +(put 'downcase-region 'disabled nil) +(put 'narrow-to-page 'disabled nil) (put 'narrow-to-region 'disabled nil) -(put 'scroll-left 'disabled nil) - -(defun oni:jabber-init () - "Initialization function for jabber." - (remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo)) +(put 'scroll-left 'disabled nil) +(put 'upcase-region 'disabled nil) -(eval-after-load "jabber" '(oni:jabber-init)) +(eval-after-load "jabber" + '(remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo)) (autoload 'jabber-message-libnotify "jabber-libnotify") -(autoload 'jabber-muc-libnotify "jabber-libnotify") +(autoload 'jabber-muc-libnotify "jabber-libnotify") (add-hook 'jabber-alert-message-hooks 'jabber-message-libnotify) -(add-hook 'jabber-alert-muc-hooks 'jabber-muc-libnotify) +(add-hook 'jabber-alert-muc-hooks 'jabber-muc-libnotify) -(setq jabber-history-enabled t - jabber-history-muc-enabled t) +(setq jabber-history-enabled t + jabber-history-muc-enabled t + jabber-use-global-history nil + jabber-history-dir "~/.emacs.d/jabber-hist") -(setq jabber-use-global-history nil - jabber-history-dir "~/.emacs.d/jabber-hist") - -(setq jabber-account-list '(("ryuslash@jabber.org") - ("tom@ryuslash.org/drd" +(setq jabber-account-list `((,(concat "tom@ryuslash.org/" (oni:hostname)) (:connection-type . ssl)))) - + (defun oni:ido-init () "Initialization functionn for ido." (setq ido-ignore-buffers @@ -213,7 +221,7 @@ Also change directories to current working directory." (eval-after-load "ido" '(oni:ido-init)) -(setq ido-auto-merge-delay-time 1000000) +(setq ido-auto-merge-work-directories-length -1) (setq ido-default-buffer-method 'selected-window) @@ -223,166 +231,183 @@ Also change directories to current working directory." (ido-mode) -(setq ido-ubiquitous-command-exceptions - '(org-refile org-capture-refile)) +(setq ido-ubiquitous-command-exceptions '(org-refile org-capture-refile)) (add-hook 'emacs-startup-hook 'ido-ubiquitous-mode) (global-set-key (kbd "M-n") 'idomenu) - + (setq minibuffer-eldef-shorten-default t) (minibuffer-electric-default-mode) - + (setq mode-line-default-help-echo "") - + (eval-after-load "jedi" '(setcar jedi:server-command "python2")) (add-hook 'python-mode-hook 'jedi:setup) (setq jedi:tooltip-method nil) - -(defface git-commit-summary-face - '((t (:inherit org-level-1))) - "Face for the git title line." - :group 'local) - -(defface git-commit-overlong-summary-face - '((t (:background "#873732"))) - "Face for commit titles that are too long." - :group 'local) - -(defface git-commit-nonempty-second-line-face - '((t (:inherit git-commit-overlong-summary-face))) - "Face for the supposedly empty line in commit messages." - :group 'local) (eval-after-load "org" '(require 'org-init)) -(defun indent-defun () - "Indent the current defun." - (interactive) - (save-excursion - (mark-defun) - (indent-region (region-beginning) (region-end)))) - -(global-set-key (kbd "C-M-z") 'indent-defun) +(global-set-key (kbd "C-M-z") 'ext:indent-defun) (defadvice term-handle-exit (after oni:kill-buffer-after-exit activate) "Kill the term buffer if the process finished." - (let ((msg (ad-get-arg 1))) - (when (string-equal msg "finished\n") - (kill-buffer (current-buffer))))) - -(defun oni:change-prev-case (num dir) - (let ((regfunc (if (eq dir 'up) 'upcase-region 'downcase-region)) - (wordfunc (if (eq dir 'up) 'upcase-word 'downcase-word))) - (if (> num 1) - (funcall regfunc (point) (- (point) num)) - (funcall wordfunc -1)))) - -(defun oni:upcase-prev (num) - (interactive "p") - (oni:change-prev-case num 'up)) - -(defun oni:downcase-prev (num) - (interactive "p") - (oni:change-prev-case num 'down)) + (kill-buffer (current-buffer))) (global-set-key (kbd "C-c u") 'oni:upcase-prev) (global-set-key (kbd "C-c d") 'oni:downcase-prev) -(defun oni:vala-mode-func () - "Function for `vala-mode-hook'." - (setq indent-tabs-mode nil)) - (add-hook 'vala-mode-hook 'oni:vala-mode-func) -(eval-after-load "rainbow-mode" '(oni:rainbow-mode-init)) -(eval-after-load "smex" '(oni:smex-init)) -(eval-after-load "yasnippet" '(oni:yasnippet-init)) +(global-set-key (kbd "M-x") 'smex) +(global-set-key (kbd "C-M-x") 'smex-major-mode-commands) (autoload 'define-slime-contrib "slime") -(autoload 'gtags-mode "gtags" nil t) -(autoload 'jabber-connect "jabber" nil t) -(autoload 'php-mode "php-mode" nil t) -(autoload 'po-mode "po-mode" nil t) -(autoload 'pony-mode "pony-mode" nil t) -(autoload 'sawfish-mode "sawfish" nil t) -(autoload 'server-running-p "server") -(autoload 'slime-js-minor-mode "slime-js" nil t) -(autoload 'xmodmap-mode "xmodmap-mode" nil t) -(autoload 'w3m-bookmark-view "w3m" nil t) -(autoload 'w3m-goto-url "w3m" nil t) + +(autoload 'gtags-mode "gtags" nil t) +(autoload 'jabber-connect "jabber" nil t) +(autoload 'php-mode "php-mode" nil t) +(autoload 'po-mode "po-mode" nil t) +(autoload 'pony-mode "pony-mode" nil t) +(autoload 'sawfish-mode "sawfish" nil t) +(autoload 'server-running-p "server") +(autoload 'slime-js-minor-mode "slime-js" nil t) +(autoload 'w3m-bookmark-view "w3m" nil t) +(autoload 'w3m-goto-url "w3m" nil t) +(autoload 'xmodmap-mode "xmodmap-mode" nil t) (require 'uniquify) -(require 'ext) -(require 'oni) -(setq-default c-basic-offset 4) +(setq-default c-basic-offset 4 + tab-width 4) + (setq-default fci-rule-column 73) + (setq-default indent-tabs-mode nil) + (setq-default php-mode-warn-if-mumamo-off nil) + (setq-default require-final-newline t) -(setq-default tab-width 4) + (setq-default truncate-lines t) (setq appt-disp-window-function #'oni:appt-display-window-and-jabber) + (setq appt-display-diary nil) + (setq auto-mode-case-fold nil) -(setq auto-save-file-name-transforms oni:auto-save-name-transforms) -(setq avandu-article-render-function #'avandu-view-w3m) -(setq backup-directory-alist oni:backup-directory-alist) -(setq browse-url-browser-function 'browse-url-generic) -(setq browse-url-generic-program (getenv "BROWSER")) -(setq c-offsets-alist '((statement-block-intro . +) - (knr-argdecl-intro . 5) - (substatement-open . +) - (substatement-label . 0) - (label . 0) - (statement-case-open . +) - (statement-cont . +) - (arglist-intro . +) - (arglist-close . 0) - (inline-open . 0) - (brace-list-open . +) - (topmost-intro-cont first c-lineup-topmost-intro-cont - c-lineup-gnu-DEFUN-intro-cont))) -(setq comment-auto-fill-only-comments t) + +(setq auto-save-file-name-transforms + `((".*" "~/.local/share/emacs/autosave/" t))) + +(setq backup-directory-alist `((".*" . "~/.local/share/emacs/backup/"))) + +(setq browse-url-browser-function 'browse-url-generic + browse-url-generic-program (getenv "BROWSER")) + +(setq c-offsets-alist + '((statement-block-intro . +) + (knr-argdecl-intro . 5) + (substatement-open . +) + (substatement-label . 0) + (label . 0) + (statement-case-open . +) + (statement-cont . +) + (arglist-intro . +) + (arglist-close . 0) + (inline-open . 0) + (brace-list-open . +) + (topmost-intro-cont first c-lineup-topmost-intro-cont + c-lineup-gnu-DEFUN-intro-cont))) + (setq custom-file "~/.emacs.d/custom.el") -(setq custom-theme-directory "~/.emacs.d/themes") + (setq default-frame-alist `((border-width . 0) (internal-border-width . 0) (vertical-scroll-bars . nil) (menu-bar-lines . nil) (tool-bar-lines . nil) - (font . "Envy Code R:pixelsize=12"))) + (font . "Inconsolata:pixelsize=18"))) + (setq elnode-do-init nil) -(setq fci-rule-color "darkred") + (setq frame-title-format '(:eval (concat "emacs: " (buffer-name)))) + (setq geiser-repl-history-filename "~/.emacs.d/geiser-history") + (setq gnus-init-file "~/.emacs.d/gnus") + (setq gtags-auto-update t) + (setq help-at-pt-display-when-idle t) -(setq highlight-80+-columns 72) -(setq identica-enable-striping t) -(setq inferior-lisp-program "sbcl") -(setq inhibit-default-init t) -(setq inhibit-local-menu-bar-menus t) -(setq inhibit-startup-message t) -(setq initial-major-mode 'emacs-lisp-mode) -(setq initial-scratch-message nil) + +(setq inferior-lisp-program "sbcl --noinform --no-linedit") + +(setq inhibit-default-init t + inhibit-local-menu-bar-menus t + inhibit-startup-message t) + +(setq initial-major-mode 'emacs-lisp-mode + initial-scratch-message nil) + (setq jabber-avatar-cache-directory "~/.emacs.d/jabber-avatars/") -(setq jabber-chat-buffer-format "*jab:%n*") -(setq jabber-chat-buffer-show-avatar nil) + +(setq jabber-chat-buffer-format "+%n" + jabber-chat-foreign-prompt-format "%t %u/%r <\n" + jabber-chat-local-prompt-format "%t %u/%r >\n" + jabber-groupchat-buffer-format "++%n" + jabber-groupchat-prompt-format "%t %u --\n") + +(setq jabber-chat-buffer-show-avatar nil + jabber-vcard-avatars-publish nil + jabber-vcard-avatars-retrieve nil) + (setq jabber-chat-fill-long-lines nil) -(setq jabber-chat-foreign-prompt-format "%t %u/%r <\n") -(setq jabber-chat-local-prompt-format "%t %u/%r >\n") + (setq jabber-chatstates-confirm nil) + (setq jabber-muc-autojoin '("aethon@muc.ryuslash.org")) + (setq jabber-roster-show-bindings nil) -(setq jabber-vcard-avatars-publish nil) -(setq jabber-vcard-avatars-retrieve nil) +(setq jabber-show-offline-contacts nil) + (setq jit-lock-defer-time 0.2) + +(defun turn-on-compilation-shell-for-pony () + (add-hook 'pony-minor-mode-hook 'compilation-shell-minor-mode nil t)) +(add-hook 'comint-mode-hook 'turn-on-compilation-shell-for-pony) + +(defun oni:smartparens-set-keys () + (local-set-key (kbd "DEL") 'sp-backward-delete-char) + (local-set-key (kbd "<deletechar>") 'sp-delete-char) + (local-set-key (kbd "C-d") 'sp-delete-char)) + +(add-hook 'smartparens-mode-on-hook 'oni:smartparens-set-keys) + +(eval-after-load "emms" + `(progn + (emms-minimalistic) + (emms-default-players) + + (require 'emms-player-mpd) + (add-to-list 'emms-player-list 'emms-player-mpd) + (setq emms-player-mpd-music-directory "/mnt/music/mp3") + + (require 'emms-mode-line) + (setq emms-mode-line-mode-line-function 'oni:mode-line-current-song) + (emms-mode-line 1))) + +(defun oni:set-smartparens-keys () + (local-set-key (kbd "<C-left>") 'sp-forward-barf-sexp) + (local-set-key (kbd "<C-right>") 'sp-forward-slurp-sexp)) + +(defun oni:local-set-smartparens-hook () + (add-hook 'smartparens-mode-hook 'oni:set-smartparens-keys nil t)) + +(add-hook 'python-mode-hook 'oni:local-set-smartparens-hook) + (setq magit-repo-dirs '("~/projects/")) (setq message-log-max 1000) (setq message-send-mail-function 'message-send-mail-with-sendmail) @@ -399,7 +424,7 @@ Also change directories to current working directory." (setq pony-tpl-indent-moves t) (setq rainbow-delimiters-max-face-count 12) (setq redisplay-dont-pause t) -(setq send-mail-function 'smtpmail-send-it) +(setq send-mail-function 'sendmail-send-it) (setq sendmail-program "/usr/bin/msmtp") (setq sentence-end-double-space nil) (setq smex-key-advice-ignore-menu-bar t) @@ -426,30 +451,25 @@ Also change directories to current working directory." (add-hook 'css-mode-hook 'oni:css-mode-func) (add-hook 'diary-display-hook 'oni:diary-display-func) (add-hook 'emacs-startup-hook 'oni:emacs-startup-func) -(add-hook 'emacs-lisp-mode-hook 'oni:emacs-lisp-mode-func) (add-hook 'go-mode-hook 'oni:go-mode-func) (add-hook 'gtags-mode-hook 'oni:gtags-mode-func) (add-hook 'haskell-mode-hook 'oni:haskell-mode-func) -(add-hook 'html-mode-hook 'oni:html-mode-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) (add-hook 'js-mode-hook 'oni:js-mode-func) (add-hook 'js2-mode-hook 'oni:js2-mode-func) (add-hook 'lua-mode-hook 'oni:lua-mode-func) -(add-hook 'magit-log-edit-mode-hook 'oni:magit-log-edit-mode-func) (add-hook 'markdown-mode-hook 'oni:markdown-mode-func) -(add-hook 'message-mode-hook 'oni:message-mode-func) -(add-hook 'org-mode-hook 'oni:org-mode-func) (add-hook 'php-mode-hook 'oni:php-mode-func) (add-hook 'prog-mode-hook 'oni:prog-mode-func) (add-hook 'python-mode-hook 'oni:python-mode-func) -(add-hook 'rst-mode-hook 'oni:rst-mode-func) (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) +(define-key key-translation-map (kbd "C-j") (kbd "C-l")) +(define-key key-translation-map (kbd "C-l") (kbd "C-j")) + (global-set-key (kbd "'") 'oni:self-insert-dwim) (global-set-key (kbd "<XF86HomePage>") 'oni:raise-scratch) (global-set-key (kbd "<XF86Mail>") 'gnus) @@ -471,10 +491,7 @@ Also change directories to current working directory." (global-set-key (kbd "C-c i p") 'identica-update-status-interactive) (global-set-key (kbd "C-c p") 'oni:show-buffer-position) (global-set-key (kbd "C-c t") 'oni:raise-ansi-term) -(global-set-key (kbd "C-d") 'oni:kill-region-or-forward-char) (global-set-key (kbd "C-e") 'oni:move-end-of-dwim) -(global-set-key (kbd "C-k") 'oni:kill-region-or-line) -(global-set-key (kbd "C-w") 'oni:kill-region-or-backward-char) (global-set-key (kbd "M-0") 'delete-window) (global-set-key (kbd "M-1") 'delete-other-windows) (global-set-key (kbd "M-2") 'split-window-below) @@ -503,13 +520,13 @@ Also change directories to current working directory." (add-to-list 'display-buffer-alist - '("^\\*\\(?:.+-\\)?scratch\\*$" . ((display-buffer-same-window . nil)))) + '("^\\*\\(?:.+-\\)?scratch\\*$" display-buffer-same-window)) (add-to-list 'display-buffer-alist - '("^\\*git-project-list\\*$" . ((git-project-show-window . nil)))) + '("^\\*git-project-list\\*$" git-project-show-window)) (add-to-list 'display-buffer-alist - '("^\\*magit: .*\\*$" . ((display-buffer-same-window . nil)))) + '("^\\*magit: .*\\*$" display-buffer-same-window)) (blink-cursor-mode -1) (column-number-mode -1) @@ -532,11 +549,15 @@ Also change directories to current working directory." ;;; Diminish lighter for a bunch of minor modes that should be on in ;;; certain modes and usually just clogg up the mode line. (diminish 'auto-fill-function) -(eval-after-load "eldoc" '(diminish 'eldoc-mode)) -(eval-after-load "paredit" '(diminish 'paredit-mode)) + (eval-after-load "auto-complete" '(diminish 'auto-complete-mode)) +(eval-after-load "eldoc" '(diminish 'eldoc-mode)) (eval-after-load "flycheck" '(diminish 'flycheck-mode)) +(eval-after-load "paredit" '(diminish 'paredit-mode)) +(eval-after-load "rainbow-mode" '(diminish 'rainbow-mode)) (eval-after-load "smartparens" '(diminish 'smartparens-mode)) +(eval-after-load "yasnippet" '(diminish 'yas-minor-mode)) + ;;; Popping up multiple frames out of the blue does not usually play ;;; well with (manual) tiling window managers. @@ -560,30 +581,33 @@ Also change directories to current working directory." (setq eltuki-blog-dir "~/documents/blog") (setq sp-cancel-autoskip-on-backward-movement nil) - -(add-hook 'python-mode-hook 'smartparens-mode) -(add-hook 'html-mode-hook 'smartparens-mode) (defun oni:scroll-down-or-prev-page (arg) "Either scroll down or go to the previous page. Depending on the value of `buffer-narrowed-p'." - (interactive "P") + (interactive "^P") (if (buffer-narrowed-p) - (progn - (narrow-to-page (or arg -1)) - (goto-char (point-min))) + (let ((scroll-error-top-bottom nil)) + (condition-case nil + (scroll-down-command arg) + (beginning-of-buffer + (narrow-to-page -1) + (goto-char (point-min))))) (scroll-down-command arg))) (defun oni:scroll-up-or-next-page (arg) "Either scroll up or go to the next page. Depending on the value of `buffer-narrowed-p'." - (interactive "P") + (interactive "^P") (if (buffer-narrowed-p) - (progn - (narrow-to-page (or arg 1)) - (goto-char (point-min))) + (let ((scroll-error-top-bottom nil)) + (condition-case nil + (scroll-up-command arg) + (end-of-buffer + (narrow-to-page 1) + (goto-char (point-min))))) (scroll-up-command arg))) (global-set-key (kbd "<prior>") 'oni:scroll-down-or-prev-page) @@ -596,15 +620,25 @@ Depending on the value of `buffer-narrowed-p'." (setq eap-music-library "/mnt/music") (setq eap-playlist-library "~/music/playlists") -;;; Turn on `compilation-minor-mode' whenever `pony-minor-mode' starts -;;; in a `comint-mode' buffer. Since buffers like `*ponymanage*' and -;;; `*ponyserver*' don't have their own specialized modes, but use -;;; `comint-mode' and turn on `pony-minor-mode', and I don't want to -;;; enable `compilation-minor-mode' for *every* `comint-mode' buffer, -;;; we can add a hook that adds a local hook. -(defun turn-on-compilation-for-pony () - (add-hook 'pony-minor-mode-hook 'compilation-minor-mode nil t)) -(add-hook 'comint-mode-hook 'turn-on-compilation-for-pony) +;;;; Auto-complete + +(setq-default ac-sources '(ac-source-imenu + ac-source-gtags + ac-source-abbrev + ac-source-yasnippet + ac-source-words-in-buffer + ac-source-words-in-same-mode-buffers + ac-source-dictionary + ac-source-functions + ac-source-symbols + ac-source-variables + ac-source-features)) + +;;;; Magit + +(setq magit-default-tracking-name-function + 'magit-default-tracking-name-branch-only) +(setq magit-diff-refine-hunk 'all) ;;; Finally, load any `customize' settings and slime. (load custom-file) |