From bab8601a498e6bd18c612b849c21235dd4bf65f6 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 9 Apr 2013 16:53:19 +0200 Subject: [PATCH] Emacs: Stop using org I like literal programming, but I'm nog good at writing stories for each change. --- emacs/.gitignore | 1 - emacs/Makefile | 4 - emacs/init.el | 607 +++++++++++++++++++++++++++++ emacs/init.org | 844 ----------------------------------------- emacs/site-lisp/ext.el | 10 - 5 files changed, 607 insertions(+), 859 deletions(-) create mode 100644 emacs/init.el delete mode 100644 emacs/init.org diff --git a/emacs/.gitignore b/emacs/.gitignore index 66209de..771231f 100644 --- a/emacs/.gitignore +++ b/emacs/.gitignore @@ -13,5 +13,4 @@ templates/ rinit.* !rinit.org history -init.el *.html diff --git a/emacs/Makefile b/emacs/Makefile index db6203e..43ee5ec 100644 --- a/emacs/Makefile +++ b/emacs/Makefile @@ -5,7 +5,3 @@ modules=eshell site-lisp snippets EMACS=emacs include ../dotfiles.mk - -init.el: init.org - $(EMACS) -Q -batch \ - -eval "(progn (require 'org) (require 'ob-tangle) (org-babel-tangle-file \"$^\"))" diff --git a/emacs/init.el b/emacs/init.el new file mode 100644 index 0000000..60ba521 --- /dev/null +++ b/emacs/init.el @@ -0,0 +1,607 @@ +;;; Turn the menu, scroll-bar and tool-bar off quickly, so they don't +;;; jump around as much. +(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))) + +;;; Load my very own theme. +(eval-after-init (load-theme 'yoshi t)) + +;;; Add some project directories and my site-lisp directory to the +;;; load path to make it easy to (auto)load them. +(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. +(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) + ;; there were errors + (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) + (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 '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. +(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." + (ignore win) + (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) + +;;; 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"))) +(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-nick "ryuslash") + +(defun oni:erc-mode-func () + "Function for `erc-mode-hook'." + (erc-fill-mode -1) + (visual-line-mode) + (setq truncate-lines nil)) + +(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")) + (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)) ?# ?$))) + (concat + (propertize (char-to-string status) + 'face `(:foreground ,(if (= status ?+) + "green" + "red"))) + " " + (propertize (substring hostname 0 -1) 'face 'mode-line-buffer-id) + " " + (propertize (oni:shorten-dir dir) 'face 'font-lock-string-face) + " " + (when (not (string= branch "")) + (propertize + ;; Cut off "* " and "\n" + (substring branch 2 -1) + 'face 'font-lock-function-name-face)) + " \n" + (propertize (char-to-string userstatus) + 'face `(:foreground "blue")) + "> "))) + +(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) + +(defun oni:raise-eshell () + "Start or switch back to `eshell'. +Also change directories to current working directory." + (interactive) + (let ((dir (file-name-directory + (or (buffer-file-name) "~/"))) + (hasfile (not (eq (buffer-file-name) nil)))) + (eshell) + (if (and hasfile (eq eshell-process-list nil)) + (progn + (eshell/cd dir) + (eshell-reset))))) + +(global-set-key (kbd "") '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. +(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 '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)) + +(eval-after-load "jabber" '(oni:jabber-init)) + +(autoload 'jabber-message-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) + +(setq jabber-history-enabled t + jabber-history-muc-enabled t) + +(setq jabber-use-global-history nil + jabber-history-dir "~/.emacs.d/jabber-hist") + +(setq jabber-account-list '(("ryuslash@jabber.org") + ("tom@ryuslash.org/drd" + (:connection-type . ssl)))) + +(defun oni:ido-init () + "Initialization functionn for ido." + (setq ido-ignore-buffers + (list "^\\` " "^irc\\." "^\\#" "^\\*Customize Option:" + (eval-when-compile + (regexp-opt + '("*-jabber-roster-*" + "*Messages*" + "*fsm-debug*" + "*magit-process*" + "*magit-edit-log*" + "*Backtrace*" + "*Ibuffer*")))))) + +(eval-after-load "ido" '(oni:ido-init)) + +(setq ido-auto-merge-delay-time 1000000) + +(setq ido-default-buffer-method 'selected-window) + +(setq ido-max-window-height 1) + +(setq ido-save-directory-list-file nil) + +(ido-mode) + +(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) + +(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)) + +(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)) + +(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) + +(require 'uniquify) +(require 'ext) +(require 'oni) + +(setq-default c-basic-offset 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 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=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 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-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 jit-lock-defer-time 0.2) +(setq magit-repo-dirs '("~/projects/")) +(setq message-log-max 1000) +(setq message-send-mail-function 'message-send-mail-with-sendmail) +(setq message-sendmail-extra-arguments '("-a" "ryuslash")) +(setq package-archives + '(("melpa" . "http://melpa.milkbox.net/packages/") + ("marmalade" . "http://marmalade-repo.org/packages/") + ("gnu" . "http://elpa.gnu.org/packages/"))) +(setq package-load-list '((htmlize "1.39") + (lua-mode "20111107") + all)) +(setq php-function-call-face 'font-lock-function-name-face) +(setq php-mode-force-pear t) +(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 sendmail-program "/usr/bin/msmtp") +(setq sentence-end-double-space nil) +(setq smex-key-advice-ignore-menu-bar t) +(setq smex-save-file "~/.emacs.d/smex-items") +(setq split-height-threshold 40) +(setq time-stamp-active t) +(setq time-stamp-format "%04y-%02m-%02d %02H:%02M:%02S (%u)") +(setq type-break-good-rest-interval (* 60 10)) +(setq type-break-interval (* 60 50)) +(setq type-break-keystroke-threshold '(nil . nil)) +(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 w3m-fill-column 72) +(setq window-combination-resize t) +(setq yas-fallback-behavior nil) +(setq yas-prompt-functions '(yas-ido-prompt)) + +(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) +(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 "") 'oni:raise-scratch) +(global-set-key (kbd "") 'gnus) +(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) +(global-set-key (kbd "") 'oni:show-org-index) +(global-set-key (kbd "C-<") 'oni:indent-shift-left) +(global-set-key (kbd "C->") 'oni:indent-shift-right) +(global-set-key (kbd "C-M-4") 'split-window-vertically) +(global-set-key (kbd "C-M-SPC") 'er/expand-region) +(global-set-key (kbd "C-M-d") 'kill-word) +(global-set-key (kbd "C-M-w") 'backward-kill-word) +(global-set-key (kbd "C-S-k") 'kill-whole-line) +(global-set-key (kbd "C-a") 'oni:move-beginning-of-dwim) +(global-set-key (kbd "C-c a") 'org-agenda) +(global-set-key (kbd "C-c c") 'org-capture) +(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) +(global-set-key (kbd "M-3") 'split-window-right) +(global-set-key (kbd "M-4") 'split-window-horizontally) +(global-set-key (kbd "M-o") 'other-window) +(global-set-key (kbd "\"") 'oni:self-insert-dwim) + +(if (daemonp) + (global-set-key "\C-x\C-c" 'oni:close-client-window)) + +(when (or window-system (daemonp)) + (global-unset-key "\C-z")) + +(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 '("\\.php[345]?$" . php-mode)) +(add-to-list 'auto-mode-alist '("\\.po\\'\\|\\.po\\." . po-mode)) +(add-to-list 'auto-mode-alist '("\\.tpl$" . html-mode)) +(add-to-list 'auto-mode-alist '("^PKGBUILD$" . shell-script-mode)) +(add-to-list 'auto-mode-alist '("^\\.Xmodmap$" . xmodmap-mode)) + +(add-to-list 'debug-ignored-errors "^Can't shift all lines enough") + +(add-to-list + 'display-buffer-alist + '("^\\*\\(?:.+-\\)?scratch\\*$" . ((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 + '("^\\*magit: .*\\*$" . ((display-buffer-same-window . nil)))) + +(blink-cursor-mode -1) +(column-number-mode -1) +(line-number-mode -1) +(tooltip-mode -1) + +(package-initialize) + +(auto-insert-mode) +(electric-indent-mode) +(savehist-mode) +(show-paren-mode) +(winner-mode) + +(smex-initialize) +(help-at-pt-set-timer) +(windmove-default-keybindings) +(global-diff-hl-mode) + +;;; 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 "flycheck" '(diminish 'flycheck-mode)) +(eval-after-load "smartparens" '(diminish 'smartparens-mode)) + +;;; Popping up multiple frames out of the blue does not usually play +;;; well with (manual) tiling window managers. +(setq ediff-window-setup-function 'ediff-setup-windows-plain) + +;;; Not being able to find newly written functions in imenu is a pain. +(setq imenu-auto-rescan t) + +;;; Yanking at click makes not sense to me. I normally have my cursor +;;; where it needs to point and if I *have* to use the mouse I prefer +;;; just clicking it wherever it lands, without having to drag it all +;;; the way to the proper place. +(setq mouse-yank-at-point t) + +;;; Always having to move the cursor around so much after scrolling +;;; gets annoying. +(setq scroll-preserve-screen-position t) + +;;; I store my blog posts in `~/documents/blog', not the default +;;; `~/Blog'. +(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") + (if (buffer-narrowed-p) + (progn + (narrow-to-page (or arg -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") + (if (buffer-narrowed-p) + (progn + (narrow-to-page (or arg 1)) + (goto-char (point-min))) + (scroll-up-command arg))) + +(global-set-key (kbd "") 'oni:scroll-down-or-prev-page) +(global-set-key (kbd "") 'oni:scroll-up-or-next-page) + +;;; Emacs Alsa Player +(add-to-list 'load-path "~/.emacs.d/site-lisp/eap") +(load "eap-autoloads") + +(setq eap-music-library "/mnt/music") +(setq eap-playlist-library "~/music/playlists") + +;;; Finally, load any `customize' settings and slime. +(load custom-file) +(load (expand-file-name "~/quicklisp/slime-helper.el")) diff --git a/emacs/init.org b/emacs/init.org deleted file mode 100644 index a127d78..0000000 --- a/emacs/init.org +++ /dev/null @@ -1,844 +0,0 @@ -#+TITLE: Emacs init -#+LINK: yoshi-theme http://ryuslash.org/projects/yoshi-theme.html -#+OPTIONS: author:nil num:nil -#+PROPERTY: tangle init.el -#+STARTUP: showall - -Disable the ~menu-bar-mode~, ~tool-bar-mode~ and ~scroll-bar-mode~ early on -so the disappear quickly after emacs starts up. - -#+BEGIN_SRC emacs-lisp - (menu-bar-mode -1) - (scroll-bar-mode -1) - (tool-bar-mode -1) -#+END_SRC - -Define a macro for deferring code until after emacs has started up. -This gets used by certain functions that rely on packages installed -from ELPA. These packages don't get loaded until /after/ the init file -has completed loading. - -#+BEGIN_SRC emacs-lisp - (defmacro eval-after-init (&rest body) - "Defer execution of BODY until after Emacs init." - `(add-hook 'emacs-startup-hook #'(lambda () ,@body))) -#+END_SRC - -Defer loading my theme until after emacs initialization. This is -because it has been installed with ~package.el~, and the packages aren't -added to the ~load-path~ until _after_ ~init.el~ has been run through. - -#+BEGIN_SRC emacs-lisp - (eval-after-init (load-theme 'yoshi t)) -#+END_SRC - -Add some of my project directories and other important directories -into ~load-path~ so I can easily load libraries in them. Also, if it -exists, load ~loaddefs.el~ in each directory for autoloads. - -#+BEGIN_SRC emacs-lisp - (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")) -#+END_SRC - -Replace the question of ~yes~ or ~no~ with just ~y~ or ~n~, I have never (yet) -accidentally typed a ~y~ or ~n~ when asked and typing ~yes~ or ~no~ is just -too much work. - -#+BEGIN_SRC emacs-lisp - (defalias 'yes-or-no-p 'y-or-n-p) -#+END_SRC - -Replace these functions with better alternatives. They offer the same -functionality, plus more. - -#+BEGIN_SRC emacs-lisp - (defalias 'list-buffers 'ibuffer) - (defalias 'dabbrev-expand 'hippie-expand) -#+END_SRC - -#+BEGIN_SRC emacs-lisp - (setq compilation-scroll-output t) -#+END_SRC - -#+BEGIN_SRC emacs-lisp - (add-hook 'clojure-mode-hook 'paredit-mode) - (add-hook 'emacs-lisp-mode-hook 'paredit-mode) - (add-hook 'lisp-mode-hook 'paredit-mode) - (add-hook 'scheme-mode-hook 'paredit-mode) -#+END_SRC - -Load ~flymake-cursor~ after loading ~flymake~, add Python and Go to -"allowed" files and add go error output to error patterns. - -#+BEGIN_SRC emacs-lisp - (defun oni:flymake-init () - "Initialization function for flymake." - (require 'flymake-cursor) - - (add-to-list ; Make sure pyflakes is loaded - 'flymake-allowed-file-name-masks ; for python files. - '("\\.py\\'" ext:flymake-pyflakes-init)) - - (add-to-list ; Error line repexp for go - 'flymake-err-line-patterns ; compilation. - '("^\\([a-zA-Z0-9_]+\\.go\\):\\([0-9]+\\):\\(.*\\)$" - 1 2 nil 3)) - - (add-to-list ; Go uses makefiles, makes - 'flymake-allowed-file-name-masks ; flymaking 'easy'. - '("\\.go$" flymake-simple-make-init))) - - (eval-after-load "flymake" '(oni:flymake-init)) -#+END_SRC - -Disable the GUI for flymake errors. This causes the flymake errors -to be shown in the minibuffer. - -#+BEGIN_SRC emacs-lisp - (setq flymake-gui-warnings-enabled nil) -#+END_SRC - -Add a bunch of pep8, flymake and pyflakes messages to warning and -info patterns, set the log file to somewhere in my home directory -and set logging level to 0. - -#+BEGIN_SRC emacs-lisp - (setq flymake-info-line-regexp - (eval-when-compile - (regexp-opt - '("Invalid name" - "String statement has no effect" - "Missing docstring" - "Empty docstring" - "multiple imports on one line" - "expected 2 blank lines, found 1" - "expected 2 blank lines, found 0" - "TODO:" - "whitespace after '{'" - "whitespace before '}'" - "whitespace before ':'" - "whitespace after '('" - "whitespace before ')'" - "whitespace after '['" - "whitespace before ']'" - "the backslash is redundant between brackets" - "continuation line over-indented for visual indent" - "continuation line under-indented for visual indent" - "Too many statements" - "comparison to None should be" - "missing whitespace around operator" - "missing whitespace after ','" - "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) - (setq flymake-warn-line-regexp - (eval-when-compile - (regexp-opt '("warning" - "Warning" - "redefinition of unused" - "Redefining built-in" - "Redefining name" - "Unused argument" - "Unused variable" - "Dangerous default value {} as argument" - "no newline at end of file" - "Access to a protected member")))) -#+END_SRC - -After loading ~flycheck~ Remove the default python checkers and -replace them with my own, which tries both ~flake8~ and ~pylint~. - -#+BEGIN_SRC emacs-lisp - (eval-after-load "flycheck" - '(progn - (mapc (lambda (c) (delete c flycheck-checkers)) - '(python-pylint python-pyflakes)))) -#+END_SRC - -Make the ~C-l~ look like a line of ~-~ up to =fill-column= or -=fci-rule-column= and remove the string displayed before the ~C-l~. - -#+BEGIN_SRC emacs-lisp - (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." - (make-string - (1- (if (boundp 'fci-rule-column) - fci-rule-column fill-column)) ?-)) - - (setq pp^L-^L-string-function 'oni:pretty-control-l-function) -#+END_SRC - -Remove the string displayed before the ~C-l~. - -#+BEGIN_SRC emacs-lisp - (setq pp^L-^L-string-pre nil) -#+END_SRC - -Enable =pretty-control-l-mode= at startup and whenever a new frame is -created. - -#+BEGIN_SRC emacs-lisp - (add-hook 'emacs-startup-hook 'pretty-control-l-mode) - (add-hook 'after-make-frame-functions - '(lambda (arg) (pretty-control-l-mode))) -#+END_SRC - -Automatically join some channels when connecting to freenode.net. - -#+BEGIN_SRC emacs-lisp - (setq erc-autojoin-channels-alist - '(("freenode.net" "#ninthfloor" "#emacs"))) -#+END_SRC - -Don't show ~PART~ messages. - -#+BEGIN_SRC emacs-lisp - (setq erc-hide-list '("PART")) -#+END_SRC - -Insert a timestamp every time a message comes in, print it on the -left and print the hour and minute parts of the time. - -#+BEGIN_SRC emacs-lisp - (setq erc-insert-timestamp-function 'erc-insert-timestamp-left) - (setq erc-timestamp-format "[%H:%M] ") - (setq erc-timestamp-only-if-changed-flag nil) -#+END_SRC - -Set my nickname. - -#+BEGIN_SRC emacs-lisp - (setq erc-nick "ryuslash") -#+END_SRC - -When starting ERC disable truncating lines, don't let ERC fill each -line and enable =visual-line-mode=. - -#+BEGIN_SRC emacs-lisp - (defun oni:erc-mode-func () - "Function for `erc-mode-hook'." - (erc-fill-mode -1) - (visual-line-mode) - (setq truncate-lines nil)) - - (add-hook 'erc-mode-hook 'oni:erc-mode-func) -#+END_SRC - -Add ~unison~ to the list of =eshell-visual-commands= because it -expects unbuffered input and eshell just doesn't give that. - -#+BEGIN_SRC emacs-lisp - (eval-after-load "em-term" - '(add-to-list 'eshell-visual-commands "unison")) -#+END_SRC - -Don't let eshell highlight it's prompt, this way I can decide the -colors for it myself. - -#+BEGIN_SRC emacs-lisp - (setq eshell-highlight-prompt nil) -#+END_SRC - -In the prompt: - - - Show the exit status of the last program/command run represented - by a green ~+~ and a red ~-~ sign. - - Show the current hostname with the =mode-line-buffer-id= face. - - Show an abbreviation of the current directory (as seen in ~fish~) - using the =font-lock-string-face= face. - - If we're in a git repository, show the current branch with the - =font-lock-function-name-face= face. - - Show the status of priviledges in blue. - -And set the =eshell-prompt-regexp= to - -#+BEGIN_SRC emacs-lisp - (defun oni:eshell-prompt-function () - "Show a pretty shell prompt." - (let ((status (if (zerop eshell-last-command-status) ?+ ?-)) - (hostname (shell-command-to-string "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)) ?# ?$))) - (concat - (propertize (char-to-string status) - 'face `(:foreground ,(if (= status ?+) - "green" - "red"))) - " " - (propertize (substring hostname 0 -1) 'face 'mode-line-buffer-id) - " " - (propertize (oni:shorten-dir dir) 'face 'font-lock-string-face) - " " - (when (not (string= branch "")) - (propertize - ;; Cut off "* " and "\n" - (substring branch 2 -1) - 'face 'font-lock-function-name-face)) - " \n" - (propertize (char-to-string userstatus) - 'face `(:foreground "blue")) - "> "))) - - (setq eshell-prompt-function 'oni:eshell-prompt-function - eshell-prompt-regexp "^[#$]> ") -#+END_SRC - -Don't truncate lines in eshell, wrap them. - -#+BEGIN_SRC emacs-lisp - (defun oni:eshell-mode-func () - "Function for `eshell-mode-hook'." - (setq truncate-lines nil)) - - (add-hook 'eshell-mode-hook 'oni:eshell-mode-func) -#+END_SRC - -Bind the ~f8~ key to easily show eshell. - -#+BEGIN_SRC emacs-lisp - (defun oni:raise-eshell () - "Start or switch back to `eshell'. - Also change directories to current working directory." - (interactive) - (let ((dir (file-name-directory - (or (buffer-file-name) "~/"))) - (hasfile (not (eq (buffer-file-name) nil)))) - (eshell) - (if (and hasfile (eq eshell-process-list nil)) - (progn - (eshell/cd dir) - (eshell-reset))))) - - (global-set-key (kbd "") 'oni:raise-eshell) -#+END_SRC - -Disable bi-directional text, since I don't write right-to-left -myself and I don't know anyone who does. I have read that it is a -bad idea to disable it completely, but forcing left-to-right should -help. - -#+BEGIN_SRC emacs-lisp - (setq-default bidi-paragraph-direction 'left-to-right) -#+END_SRC - -There are some functions which get disabled by default because they -"confuse new users", but these I like using. - -#+BEGIN_SRC emacs-lisp - (put 'upcase-region 'disabled nil) - (put 'downcase-region 'disabled nil) - (put 'narrow-to-region 'disabled nil) - (put 'scroll-left 'disabled nil) -#+END_SRC - -Don't echo presence updates in the message area. - -#+BEGIN_SRC emacs-lisp - (defun oni:jabber-init () - "Initialization function for jabber." - (remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo)) - - (eval-after-load "jabber" '(oni:jabber-init)) -#+END_SRC - -Autoload functions from =jabber-libnotify= so we can use them in some -hooks. - -#+BEGIN_SRC emacs-lisp - (autoload 'jabber-message-libnotify "jabber-libnotify") - (autoload 'jabber-muc-libnotify "jabber-libnotify") -#+END_SRC - -Enable libnotify alerts for regular and mutli-user chats, this is -preferable to seeing them in the echo area. - -#+BEGIN_SRC emacs-lisp - (add-hook 'jabber-alert-message-hooks 'jabber-message-libnotify) - (add-hook 'jabber-alert-muc-hooks 'jabber-muc-libnotify) -#+END_SRC - -Keep track of what was said to and by my contacts, both for -"personal" chats and muc chats. - -#+BEGIN_SRC emacs-lisp - (setq jabber-history-enabled t - jabber-history-muc-enabled t) -#+END_SRC - -Store history on a per-contact basis and keep these files in -~$HOME/.emacs.d/jabber-hist~. - -#+BEGIN_SRC emacs-lisp - (setq jabber-use-global-history nil - jabber-history-dir "~/.emacs.d/jabber-hist") -#+END_SRC - -Add some accounts. - -#+BEGIN_SRC emacs-lisp - (setq jabber-account-list '(("ryuslash@jabber.org") - ("tom@ryuslash.org/drd" - (:connection-type . ssl)))) -#+END_SRC - -Keep some buffers from showing up when using ido-mode. Either these -get used very rarely or they don't have any really useful -information in them. - -#+BEGIN_SRC emacs-lisp - (defun oni:ido-init () - "Initialization functionn for ido." - (setq ido-ignore-buffers - (list "^\\` " "^irc\\." "^\\#" "^\\*Customize Option:" - (eval-when-compile - (regexp-opt - '("*-jabber-roster-*" - "*Messages*" - "*fsm-debug*" - "*magit-process*" - "*magit-edit-log*" - "*Backtrace*" - "*Ibuffer*")))))) - - (eval-after-load "ido" '(oni:ido-init)) -#+END_SRC - -Ido tries to be smart and find files in other directories, I don't -like that, stop doing that (or at least wait a long time). - -#+BEGIN_SRC emacs-lisp - (setq ido-auto-merge-delay-time 1000000) -#+END_SRC - -Open files in the selected window when switching between buffers. - -#+BEGIN_SRC emacs-lisp - (setq ido-default-buffer-method 'selected-window) -#+END_SRC - -Only ever show one line of possibilities when using ido. I hate it -when the minibuffer grows. - -#+BEGIN_SRC emacs-lisp - (setq ido-max-window-height 1) -#+END_SRC - -Don't save ido state between invocations. - -#+BEGIN_SRC emacs-lisp - (setq ido-save-directory-list-file nil) -#+END_SRC - -Enable =ido-mode=. - -#+BEGIN_SRC emacs-lisp - (ido-mode) -#+END_SRC - -Don't use ido when calling =org-refile= or =org-capture-refile=. - -#+BEGIN_SRC emacs-lisp - (setq ido-ubiquitous-command-exceptions - '(org-refile org-capture-refile)) -#+END_SRC - -Enable =ido-ubiquitous=. - -#+BEGIN_SRC emacs-lisp - (add-hook 'emacs-startup-hook 'ido-ubiquitous-mode) -#+END_SRC - -Call =idomenu= with ~M-n~. - -#+BEGIN_SRC emacs-lisp - (global-set-key (kbd "M-n") 'idomenu) -#+END_SRC - -A new feature in Emacs 24.3 can shorten ~(default ...)~ to ~[...]~ when -prompting for something. The =minibuffer-eldef-shorten-default= should -be set before enabling the =minibuffer-electric-default-mode=. - -#+BEGIN_SRC emacs-lisp - (setq minibuffer-eldef-shorten-default t) - (minibuffer-electric-default-mode) -#+END_SRC - -Don't show any default help messages, if no help message was -specified, just leave the echo area empty. - -#+BEGIN_SRC emacs-lisp - (setq mode-line-default-help-echo "") -#+END_SRC - -Start jedi when =python-mode= is started. - -#+BEGIN_SRC emacs-lisp - (eval-after-load "jedi" '(setcar jedi:server-command "python2")) - (add-hook 'python-mode-hook 'jedi:setup) -#+END_SRC - -Show argument lists and such from jedi in the echo area. - -#+BEGIN_SRC emacs-lisp - (setq jedi:tooltip-method nil) -#+END_SRC - -Define some faces to make editing magit logs nicer. - -#+BEGIN_SRC emacs-lisp - (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) -#+END_SRC - -I have quite a few modifications to my org-mode setup, so don't load -them immediately, they take a little time to load. - -#+BEGIN_SRC emacs-lisp - (eval-after-load "org" '(require 'org-init)) -#+END_SRC - -Found on [[http://emacsredux.com/blog/2013/03/28/indent-defun/][Indent defun - Emacs Redux]], indents a function. Should be -just a tiny bit easier than going to the beginning of a function and -then calling =indent-sexp=, which only works in lisp-like languages -anyway. - -#+BEGIN_SRC emacs-lisp - (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) -#+END_SRC - -Kill the ~*ansi-term*~ buffer (or any term buffer) after the underlying -shell process has finished. When I quit a shell I don't want the -buffer hanging around. - -#+BEGIN_SRC emacs-lisp - (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))))) -#+END_SRC - -I don't have a capslock key on my keyboard, and sometimes it's -annoying to have to hold my shift key for long enums and such. The -idea is to type everything except regular caps in lower case and then -use these functions to fix them. - -#+BEGIN_SRC emacs-lisp - (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)) - - (global-set-key (kbd "C-c u") 'oni:upcase-prev) - (global-set-key (kbd "C-c d") 'oni:downcase-prev) -#+END_SRC - -For some reason, =vala-mode= turns on =indent-tabs-mode=, I don't like -that. - -#+BEGIN_SRC emacs-lisp - (defun oni:vala-mode-func () - "Function for `vala-mode-hook'." - (setq indent-tabs-mode nil)) - - (add-hook 'vala-mode-hook 'oni:vala-mode-func) -#+END_SRC - -#+BEGIN_SRC emacs-lisp - (eval-after-load "rainbow-mode" '(oni:rainbow-mode-init)) - (eval-after-load "smex" '(oni:smex-init)) - (eval-after-load "yasnippet" '(oni:yasnippet-init)) - - (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) - - (require 'uniquify) - (require 'ext) - (require 'oni) - - (setq-default c-basic-offset 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 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=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 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-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 jit-lock-defer-time 0.2) - (setq magit-repo-dirs '("~/projects/")) - (setq message-log-max 1000) - (setq message-send-mail-function 'message-send-mail-with-sendmail) - (setq message-sendmail-extra-arguments '("-a" "ryuslash")) - (setq package-archives - '(("melpa" . "http://melpa.milkbox.net/packages/") - ("marmalade" . "http://marmalade-repo.org/packages/") - ("gnu" . "http://elpa.gnu.org/packages/"))) - (setq package-load-list '((htmlize "1.39") - (lua-mode "20111107") - all)) - (setq php-function-call-face 'font-lock-function-name-face) - (setq php-mode-force-pear t) - (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 sendmail-program "/usr/bin/msmtp") - (setq sentence-end-double-space nil) - (setq smex-key-advice-ignore-menu-bar t) - (setq smex-save-file "~/.emacs.d/smex-items") - (setq split-height-threshold 40) - (setq time-stamp-active t) - (setq time-stamp-format "%04y-%02m-%02d %02H:%02M:%02S (%u)") - (setq type-break-good-rest-interval (* 60 10)) - (setq type-break-interval (* 60 50)) - (setq type-break-keystroke-threshold '(nil . nil)) - (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 w3m-fill-column 72) - (setq window-combination-resize t) - (setq yas-fallback-behavior nil) - (setq yas-prompt-functions '(yas-ido-prompt)) - - (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) - (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 "") 'oni:raise-scratch) - (global-set-key (kbd "") 'gnus) - (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) - (global-set-key (kbd "") 'oni:show-org-index) - (global-set-key (kbd "C-<") 'oni:indent-shift-left) - (global-set-key (kbd "C->") 'oni:indent-shift-right) - (global-set-key (kbd "C-M-4") 'split-window-vertically) - (global-set-key (kbd "C-M-SPC") 'er/expand-region) - (global-set-key (kbd "C-M-d") 'kill-word) - (global-set-key (kbd "C-M-w") 'backward-kill-word) - (global-set-key (kbd "C-S-k") 'kill-whole-line) - (global-set-key (kbd "C-a") 'oni:move-beginning-of-dwim) - (global-set-key (kbd "C-c a") 'org-agenda) - (global-set-key (kbd "C-c c") 'org-capture) - (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) - (global-set-key (kbd "M-3") 'split-window-right) - (global-set-key (kbd "M-4") 'split-window-horizontally) - (global-set-key (kbd "M-o") 'other-window) - (global-set-key (kbd "\"") 'oni:self-insert-dwim) - - (if (daemonp) - (global-set-key "\C-x\C-c" 'oni:close-client-window)) - - (when (or window-system (daemonp)) - (global-unset-key "\C-z")) - - (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 '("\\.php[345]?$" . php-mode)) - (add-to-list 'auto-mode-alist '("\\.po\\'\\|\\.po\\." . po-mode)) - (add-to-list 'auto-mode-alist '("\\.tpl$" . html-mode)) - (add-to-list 'auto-mode-alist '("^PKGBUILD$" . shell-script-mode)) - (add-to-list 'auto-mode-alist '("^\\.Xmodmap$" . xmodmap-mode)) - - (add-to-list 'debug-ignored-errors "^Can't shift all lines enough") - - (add-to-list - 'display-buffer-alist - '("^\\*\\(?:.+-\\)?scratch\\*$" . ((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 - '("^\\*magit: .*\\*$" . ((display-buffer-same-window . nil)))) - - (add-to-list 'compilation-finish-functions 'ext:comp-finish-function) - - (blink-cursor-mode -1) - (column-number-mode -1) - (line-number-mode -1) - (tooltip-mode -1) - - (package-initialize) - - (auto-insert-mode) - (cua-selection-mode t) - (electric-indent-mode) - (electric-pair-mode) - (savehist-mode) - (show-paren-mode) - (winner-mode) - - (smex-initialize) - (help-at-pt-set-timer) - (windmove-default-keybindings) - (global-diff-hl-mode) - - (load custom-file) - ;; (load "rudel-loaddefs.el") - (load (expand-file-name "~/quicklisp/slime-helper.el")) - - (unless (server-running-p) - (server-start)) - - (diminish 'auto-fill-function "_") -#+END_SRC - -# Local Variables: -# eval: (flyspell-mode 1) -# End: diff --git a/emacs/site-lisp/ext.el b/emacs/site-lisp/ext.el index d9e1973..2ed65d4 100644 --- a/emacs/site-lisp/ext.el +++ b/emacs/site-lisp/ext.el @@ -38,16 +38,6 @@ buffer-file-name)))) (list "pycheck.sh" (list local-file)))) -(defun ext:comp-finish-function (buf str) - "Don't show compilation window if everything went ok" - (if (string-match "exited abnormally" str) - ;; there were errors - (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) - (message "No compilation errors!")))) - (defun ext:reload-buffer () "Reload current buffer." (interactive)