From 8e5daed796494e602423bdedb1902fb7519b522e Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Fri, 4 Jan 2013 01:34:02 +0100 Subject: Emacs: Cleanup the other sections --- .emacs.d/init.org | 47 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) (limited to '.emacs.d/init.org') diff --git a/.emacs.d/init.org b/.emacs.d/init.org index 2041f5a..e21f45a 100644 --- a/.emacs.d/init.org +++ b/.emacs.d/init.org @@ -260,30 +260,56 @@ * Aliases - There are some functions that are just better than others, no - matter how politically incorrect it might be to admit. + I've never had any trouble with accidentally pressing ~y~ while being + asked a question, so I've never had any reason to prefer ~yes-or-no-p~ + over ~y-or-n-p~. - #+BEGIN_SRC emacs-lisp :tangle init2.el + #+begin_src emacs-lisp :tangle init2.el (defalias 'yes-or-no-p 'y-or-n-p) + #+end_src + + ~ibuffer~ is a drop-in replacement for ~list-buffers~, but with more + features. + + #+begin_src emacs-lisp :tangle init2.el (defalias 'list-buffers 'ibuffer) + #+end_src + + I don't know if replacing ~dabbrev-expand~ with ~hippie-expand~, but at + least ~hippie-expand~ doesn't use ~dabbrev-expand~, and I haven't + noticed anything wrong so far, and ~hippie-expand~ does so much more + than ~dabbrev-expand~. + + #+BEGIN_SRC emacs-lisp :tangle init2.el (defalias 'dabbrev-expand 'hippie-expand) #+END_SRC * Faces - Define faces for use with ~magit~ log edit mode. + Define a face to how the summary line of git commits as the first + headline of an ~org-mode~ file. - #+BEGIN_SRC emacs-lisp :tangle init2.el + #+begin_src emacs-lisp :tangle init2.el (defface git-commit-summary-face '((t (:inherit org-level-1))) "Face for the git title line." :group 'local) + #+end_src + Define a face to show characters that have been placed beyond the + maximum length of a summary line. + + #+begin_src emacs-lisp :tangle init2.el (defface git-commit-overlong-summary-face '((t (:background "#873732"))) "Face for commit titles that are too long." :group 'local) + #+end_src + + Define a face to show characters that have been placed on the second + line of a git commit. Those should always remain empty. + #+BEGIN_SRC emacs-lisp :tangle init2.el (defface git-commit-nonempty-second-line-face '((t (:inherit git-commit-overlong-summary-face))) "Face for the supposedly empty line in commit messages." @@ -292,19 +318,14 @@ * Keys - With the awesome power of Emacs comes the need for lots of - keybindings. - -** Translation - - Since the ~C-l~ combination is so much easier than ~C-j~ when using - the [[http://colemak.com][colemak]] keyboard layout and ~C-j~ is used so much more, switch - them. + Since the ~C-l~ combination is so much easier than ~C-j~ when using the + [[http://colemak.com][colemak]] keyboard layout and I use ~C-j~ much more, switch them. #+BEGIN_SRC emacs-lisp tangle init2.el (define-key key-translation-map (kbd "C-j") (kbd "C-l")) (define-key key-translation-map (kbd "C-l") (kbd "C-j")) #+END_SRC + * Footnotes [fn:1] Though it doesn't happen often that ~trunk~ is so messed up that -- cgit v1.2.3-54-g00ecf From f10f2a2382d66e1f8b365e4e59d516af04bc1f26 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Fri, 4 Jan 2013 02:08:31 +0100 Subject: Emacs: Move some more things to init.org --- .emacs.d/init.el | 6 ------ .emacs.d/init.org | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) (limited to '.emacs.d/init.org') diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 8a59ddc..ebbb83d 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -8,12 +8,6 @@ (load (concat user-emacs-directory "init2")) -(eval-after-load "eldoc" - '(diminish 'eldoc-mode)) - -(eval-after-load "em-term" - '(add-to-list 'eshell-visual-commands "unison")) - (eval-after-load "emms-source-file" '(progn (require 'emms-setup) diff --git a/.emacs.d/init.org b/.emacs.d/init.org index e21f45a..6e7ca46 100644 --- a/.emacs.d/init.org +++ b/.emacs.d/init.org @@ -326,6 +326,26 @@ (define-key key-translation-map (kbd "C-l") (kbd "C-j")) #+END_SRC +* eldoc + + Diminish ~eldoc~'s lighter to nothing after it loads to keep the + mode-line clean. + + #+begin_src emacs-lisp :tangle init2.el + (eval-after-load "eldoc" + '(diminish 'eldoc-mode)) + #+end_src + +* eshell + + After ~em-term.el~ loads add ~unison~ to the ~eshell-visual-commands~ to + make sure it gets unbuffered input. + + #+begin_src emacs-lisp :tangle init2.el + (eval-after-load "em-term" + '(add-to-list 'eshell-visual-commands "unison")) + #+end_src + * Footnotes [fn:1] Though it doesn't happen often that ~trunk~ is so messed up that -- cgit v1.2.3-54-g00ecf From 7a5a232c27394a8afd87abc2f27b31f62cd91b59 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 15 Jan 2013 12:11:41 +0100 Subject: Emacs: Update some things --- .emacs.d/init.el | 26 ++++++++++----- .emacs.d/init.org | 14 +++++++-- .emacs.d/site-lisp/dzen.el | 4 ++- .emacs.d/site-lisp/oni.el | 34 +++++++++++--------- .emacs.d/site-lisp/org-init.el | 63 +++++++++++++++++++++++++++++++------ .emacs.d/snippets/org-mode/Makefile | 2 +- .emacs.d/snippets/org-mode/project | 51 ++++++++++++++++++++++++++++++ .emacs.d/snippets/org-mode/snippet | 14 +++++++++ 8 files changed, 172 insertions(+), 36 deletions(-) create mode 100644 .emacs.d/snippets/org-mode/project create mode 100644 .emacs.d/snippets/org-mode/snippet (limited to '.emacs.d/init.org') diff --git a/.emacs.d/init.el b/.emacs.d/init.el index ebbb83d..76ac42a 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -40,8 +40,16 @@ '("\\.go$" flymake-simple-make-init)))) (eval-after-load "ido" - '(setq ido-ignore-buffers `(,@ido-ignore-buffers - "^\\*.*\\*$" "^irc\\." "^\\#"))) + '(setq ido-ignore-buffers + (list "^\\` " "^irc\\." "^\\#" "^\\*Customize Option:" + (eval-when-compile + (regexp-opt + '("*-jabber-roster-*" + "*Messages*" + "*fsm-debug*" + "*magit-process*" + "*magit-edit-log*" + "*Backtrace*")))))) (eval-after-load "jabber" '(remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo)) @@ -113,10 +121,10 @@ (vertical-scroll-bars . nil) (menu-bar-lines . nil) (tool-bar-lines . nil) - (font . "monaco-12"))) + (font . "Consolas-14"))) (setq emms-source-file-default-directory "/mnt/music/") (setq erc-autojoin-channels-alist - '(("freenode.net" "#ninthfloor" "#emacs" "#dispass"))) + '(("freenode.net" "#ninthfloor" "#emacs"))) (setq erc-hide-list '("JOIN" "PART" "QUIT")) (setq erc-insert-timestamp-function 'erc-insert-timestamp-left) (setq erc-nick "ryuslash") @@ -177,11 +185,14 @@ (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 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) -(setq ido-ubiquitous-command-exceptions '(org-refile)) +(setq ido-ubiquitous-command-exceptions + '(org-refile org-capture-refile)) (setq inferior-lisp-program "sbcl") (setq inhibit-default-init t) (setq inhibit-local-menu-bar-menus t) @@ -206,9 +217,8 @@ (setq message-sendmail-extra-arguments '("-a" "ryuslash")) (setq package-archives '(("melpa" . "http://melpa.milkbox.net/packages/") - ("ELPA" . "http://tromey.com/elpa/") - ("gnu" . "http://elpa.gnu.org/packages/") - ("marmalade" . "http://marmalade-repo.org/packages/"))) + ("marmalade" . "http://marmalade-repo.org/packages/") + ("gnu" . "http://elpa.gnu.org/packages/"))) (setq package-load-list '((htmlize "1.39") (lua-mode "20111107") all)) diff --git a/.emacs.d/init.org b/.emacs.d/init.org index 6e7ca46..86cafbc 100644 --- a/.emacs.d/init.org +++ b/.emacs.d/init.org @@ -1,6 +1,7 @@ #+TITLE: Emacs init #+STYLE: #+OPTIONS: author:nil +#+STARTUP: showall * Startup @@ -73,7 +74,8 @@ #+BEGIN_SRC emacs-lisp (mapc #'oni:add-to-load-path-maybe-load-defs '("~/projects/emacs/dispass.el" "~/var/src/emacs/mode-icons" - "~/.emacs.d/site-lisp")) + "~/.emacs.d/site-lisp" "~/projects/emacs/pony-mode/src" + "~/projects/emacs/php-mode")) #+END_SRC The =oni:add-to-load-path-maybe-load-defs= function just adds the @@ -321,7 +323,7 @@ Since the ~C-l~ combination is so much easier than ~C-j~ when using the [[http://colemak.com][colemak]] keyboard layout and I use ~C-j~ much more, switch them. - #+BEGIN_SRC emacs-lisp tangle init2.el + #+BEGIN_SRC emacs-lisp :tangle init2.el (define-key key-translation-map (kbd "C-j") (kbd "C-l")) (define-key key-translation-map (kbd "C-l") (kbd "C-j")) #+END_SRC @@ -346,6 +348,14 @@ '(add-to-list 'eshell-visual-commands "unison")) #+end_src +* Window movement + + Make it easier to move through windows by using ~windmove~. + + #+BEGIN_SRC emacs-lisp :tangle init2.el + (windmove-default-keybindings) + #+END_SRC + * Footnotes [fn:1] Though it doesn't happen often that ~trunk~ is so messed up that diff --git a/.emacs.d/site-lisp/dzen.el b/.emacs.d/site-lisp/dzen.el index 2d43f95..6cc3eae 100644 --- a/.emacs.d/site-lisp/dzen.el +++ b/.emacs.d/site-lisp/dzen.el @@ -39,7 +39,9 @@ (defun dzen-update () (let ((strl "") - (strc metal-express-radio-currently-playing) + (strc (if (boundp 'metal-express-radio-currently-playing) + metal-express-radio-currently-playing + "")) (strr (format "jabber: %s ryu: %d gm: %d aet: %d 9n: %d rss: %d\n" (oni:current-jabber-status) diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 79b5f6e..0098ea2 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -61,7 +61,7 @@ DOT are intentionally being skipped." (defvar oni:required-packages '(graphviz-dot-mode htmlize magit rainbow-delimiters rainbow-mode yasnippet markdown-mode flymake flymake-cursor sauron expand-region - fill-column-indicator git-auto-commit-mode idomenu magit smex) + git-auto-commit-mode idomenu magit smex) "List of all the packages I have (want) installed.") (defun oni:after-save-func () @@ -81,7 +81,9 @@ DOT are intentionally being skipped." nil (format "%s%s (in %s minutes)" new-time appt-msg min-to-app) nil) (appt-disp-window min-to-app new-time appt-msg)) - +;; (jabber-send-message (car jabber-connections) +;; "aethon@muc.ryuslash.org" nil "Hi, I'm a programmatic message; this +;; upens up possibilities :)" "groupchat") (defun oni:before-save-func () "Function for `before-save-hook'." (if (eq major-mode 'html-mode) @@ -192,7 +194,8 @@ DOT are intentionally being skipped." (defun oni:html-mode-func () "Function for `html-mode-hook'." (yas-minor-mode) - (fci-mode)) + (highlight-80+-mode) + (flycheck-mode)) (defun oni:indent-shift-left (start end &optional count) "Rigidly indent region. @@ -258,8 +261,7 @@ If COUNT has been specified indent by that much, otherwise look at (defun oni:js-mode-func () "Function for `js-mode-hook'." (rainbow-delimiters-mode) - (local-set-key "\C-j" 'oni:newline-and-indent) - (pretty-symbols-mode -1)) + (local-set-key "\C-j" 'oni:newline-and-indent)) (defun oni:js2-mode-func () "Function for `js2-mode-hook'." @@ -293,7 +295,8 @@ If COUNT has been specified indent by that much, otherwise look at "Function for `lua-mode-hook'." (local-unset-key (kbd ")")) (local-unset-key (kbd "]")) - (local-unset-key (kbd "}"))) + (local-unset-key (kbd "}")) + (flycheck-mode)) (defun oni:magit-log-edit-mode-func () "Function for `magit-log-edit-mode-hook'." @@ -404,24 +407,25 @@ When dealing with braces, add another line and indent that too." (defun oni:php-mode-func () "Function for `php-mode-hook'." - (flymake-mode) (local-set-key "\C-j" 'oni:newline-and-indent) (c-set-offset 'arglist-intro '+) (c-set-offset 'arglist-close '0) (rainbow-delimiters-mode) - (setq fci-rule-column 80)) + (setq-local highlight-80+-columns 80) + (flycheck-mode)) (defun oni:pretty-control-l-function (win) - "Just make a string of either `fci-rule-colum' or `fill-column' -length -1. Use the `-' character. WIN is ignored." + "Just make a string of either `highlight-80+-columns' or +`fill-column' length -1. Use the `-' character. WIN is +ignored." (make-string - (1- (if (boundp 'fci-rule-column) fci-rule-column fill-column)) ?-)) + (1- (if (boundp 'highlight-80+-columns) + highlight-80+-columns fill-column)) ?-)) (defun oni:prog-mode-func () "Function for `prog-mode-hook'." (rainbow-delimiters-mode) - (fci-mode) - (pretty-symbols-mode) + (highlight-80+-mode) (yas-minor-mode) (auto-fill-mode)) @@ -432,10 +436,10 @@ length -1. Use the `-' character. WIN is ignored." (local-set-key (kbd "C-<") 'python-indent-shift-left) (set (make-local-variable 'electric-indent-chars) nil) (rainbow-delimiters-mode) - (setq fci-rule-column 79 + (setq highlight-80+-columns 79 fill-column 72) (setq-local whitespace-style '(tab-mark)) - (fci-mode) + (highlight-80+-mode) (whitespace-mode)) (defun oni:raise-ansi-term (arg) diff --git a/.emacs.d/site-lisp/org-init.el b/.emacs.d/site-lisp/org-init.el index 23ae6a5..b02f0cc 100644 --- a/.emacs.d/site-lisp/org-init.el +++ b/.emacs.d/site-lisp/org-init.el @@ -33,13 +33,60 @@ (eval-after-load "org-crypt" '(org-crypt-use-before-save-magic)) +(defun oni:org-maybe-outline-path () + (let ((outline-path (org-format-outline-path (org-get-outline-path)))) + (unless (string= outline-path "") + (setq outline-path (concat "[ " outline-path " ] "))) + outline-path)) + +(defun oni:set-org-agenda-files () + "Set `org-agenda-files` according to the current time." + (interactive) + (let* ((current-time (decode-time)) + (current-hour (nth 2 current-time)) + (current-dow (nth 6 current-time))) + (if (or (= current-dow 6) (= current-dow 0) ; Saturday or Sunday + (< current-hour 9) (>= current-hour 17)) + (setq org-agenda-files + (append oni:personal-agenda-files oni:common-agenda-files)) + (setq org-agenda-files + (append oni:work-agenda-files oni:common-agenda-files))))) + +(defvar oni:personal-agenda-files + (list (expand-file-name "~/documents/org/tasks")) + "My personal agenda, should only show up at times I don't have + to work.") + +(defvar oni:work-agenda-files + (list (expand-file-name "~/documents/org/aethon.org")) + "My work agenda, should only show up at times I work.") + +(defvar oni:common-agenda-files + (list (expand-file-name "~/documents/org/dailies") + (expand-file-name "~/documents/org/misc/contacts.org") + (expand-file-name "~/documents/org/misc/bookmarks.org")) + "Agenda files that are work-agnostic, should always show up.") + (setq org-agenda-custom-commands - '(("w" "Work todo." tags-todo "work"))) + '(("P" . "Personal only") + ("Pa" "Personal agenda" agenda "" + ((org-agenda-files (append oni:personal-agenda-files + oni:common-agenda-files)))) + ("Pt" "Personal todo" agenda "" + ((org-agenda-files (append oni:personal-agenda-files + oni:common-agenda-files)))) + ("W" . "Work only") + ("Wa" "Work agenda" agenda "" + ((org-agenda-files (append oni:work-agenda-files + oni:common-agenda-files)))) + ("Wt" "Work todo" todo "" + ((org-agenda-files (append oni:work-agenda-files + oni:common-agenda-files)))))) (setq org-agenda-prefix-format '((agenda . " %i %-12:c%?-12t% s") (timeline . " % s") - (todo . " %i %-12:c %(concat \"[ \"(org-format-outline-path (org-get-outline-path)) \" ]\") ") - (tags . " %i %-12:c %(concat \"[ \"(org-format-outline-path (org-get-outline-path)) \" ]\") ") + (todo . " %i %-12:c %(oni:org-maybe-outline-path)") + (tags . " %i %-12:c %(oni:org-maybe-outline-path)") (search . " %i %-12:c"))) (setq org-agenda-sorting-strategy '((agenda habit-down time-up priority-down category-keep) @@ -54,12 +101,6 @@ "* TODO %?\n\n %a"))) (setq org-contacts-files '("~/documents/org/misc/contacts.org")) (setq org-directory (expand-file-name "~/documents/org")) -(setq org-agenda-files - (append - `(,(concat org-directory "/tasks") - ,(concat org-directory "/misc/contacts.org") - ,(concat org-directory "/misc/bookmarks.org")) - org-agenda-files)) (setq org-agenda-show-outline-path nil) (setq org-agenda-todo-ignore-deadlines 'far) (setq org-agenda-todo-ignore-scheduled t) @@ -103,5 +144,9 @@ (org-agenda-to-appt) (ad-activate 'org-agenda-redo) +(oni:set-org-agenda-files) +(run-at-time "09:00" (* 60 60 24) 'oni:set-org-agenda-files) +(run-at-time "17:00" (* 60 60 24) 'oni:set-org-agenda-files) + (provide 'org-init) ;;; org-init.el ends here diff --git a/.emacs.d/snippets/org-mode/Makefile b/.emacs.d/snippets/org-mode/Makefile index e913708..34d4cd9 100644 --- a/.emacs.d/snippets/org-mode/Makefile +++ b/.emacs.d/snippets/org-mode/Makefile @@ -1,4 +1,4 @@ DESTDIR:=$(DESTDIR)/org-mode -objects=codeblock heading +objects=codeblock heading project snippet include ../../../dotfiles.mk diff --git a/.emacs.d/snippets/org-mode/project b/.emacs.d/snippets/org-mode/project new file mode 100644 index 0000000..269d655 --- /dev/null +++ b/.emacs.d/snippets/org-mode/project @@ -0,0 +1,51 @@ +# -*- mode: snippet -*- +# name: project +# key: project +# -- +#+TITLE: ${1:project_name} +#+LINK: src ${2:http://code.ryuslash.org/cgit.cgi/$3$1/} +#+LINK: tar_gz $2${4:snapshot/$1-master}.tar.gz +#+LINK: zip $2$4.zip +#+STARTUP: showall + +#+begin_html + + +#+end_html + +#+INCLUDE: "dlmenu.inc" + +* About + + ${5:A short description about $1} + + | $0Status | $6 | + | Language | $7 | + | License | ${8:GPLv3} | + +* Why? + + ${9:Why did you even think of writing $1?} + +* Features + + ${10:$1 does...} + +* Dependencies + + ${11:$1 needs to have...} + +* Download + + ${12:To download $1...} + +* Install + + ${13:To install $1...} + +* Usage + + ${14:Using $1...} \ No newline at end of file diff --git a/.emacs.d/snippets/org-mode/snippet b/.emacs.d/snippets/org-mode/snippet new file mode 100644 index 0000000..67f15d5 --- /dev/null +++ b/.emacs.d/snippets/org-mode/snippet @@ -0,0 +1,14 @@ +# -*- mode: snippet -*- +# name: snippet +# key: snippet +# -- +#+TITLE: ${1:snippet-name} +#+OPTIONS: toc:nil + +* $1 + + ${2:A short description abount $1} + + #+BEGIN_SRC $3 :tangle yes +$0 + #+END_SRC \ No newline at end of file -- cgit v1.2.3-54-g00ecf From 29189b9cbcb49e41386447d2ed7022021c00d218 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Fri, 18 Jan 2013 23:37:05 +0100 Subject: Emacs: Move mode-icons to ~/projects/emacs From ~/var/src/emacs --- .emacs.d/init.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.emacs.d/init.org') diff --git a/.emacs.d/init.org b/.emacs.d/init.org index 86cafbc..b3f3c31 100644 --- a/.emacs.d/init.org +++ b/.emacs.d/init.org @@ -73,7 +73,7 @@ #+NAME: load-projects #+BEGIN_SRC emacs-lisp (mapc #'oni:add-to-load-path-maybe-load-defs - '("~/projects/emacs/dispass.el" "~/var/src/emacs/mode-icons" + '("~/projects/emacs/dispass.el" "~/projects/emacs/mode-icons" "~/.emacs.d/site-lisp" "~/projects/emacs/pony-mode/src" "~/projects/emacs/php-mode")) #+END_SRC -- cgit v1.2.3-54-g00ecf From 35fc2e3378a3b91547b43b2d0fef28f8d88c1e37 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Fri, 25 Jan 2013 00:32:30 +0100 Subject: emacs: Redo again --- .emacs.d/init.el | 66 +++++--- .emacs.d/init.org | 392 ++++++---------------------------------------- .emacs.d/site-lisp/oni.el | 39 +++-- 3 files changed, 121 insertions(+), 376 deletions(-) (limited to '.emacs.d/init.org') diff --git a/.emacs.d/init.el b/.emacs.d/init.el index b4b6b73..dddef30 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -8,6 +8,23 @@ (load (concat user-emacs-directory "init2")) +(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 "eldoc" '(diminish 'eldoc-mode)) +(eval-after-load "em-term" '(add-to-list 'eshell-visual-commands "unison")) (eval-after-load "emms-source-file" '(oni:emms-init)) (eval-after-load "flymake" '(oni:flymake-init)) (eval-after-load "ido" '(oni:ido-init)) @@ -18,6 +35,24 @@ (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 'geiser-install) +(require 'uniquify) +(require 'ext) +(require 'oni) + (put 'upcase-region 'disabled nil) (put 'downcase-region 'disabled nil) (put 'narrow-to-region 'disabled nil) @@ -36,11 +71,9 @@ (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 - `((".*" ,temporary-file-directory t))) +(setq auto-save-file-name-transforms oni:auto-save-name-transforms) (setq avandu-article-render-function #'avandu-view-w3m) -(setq backup-directory-alist - `((".*" . ,temporary-file-directory))) +(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 . +) @@ -66,6 +99,7 @@ (menu-bar-lines . nil) (tool-bar-lines . nil) (font . "Monaco-12"))) +(setq elnode-do-init nil) (setq emms-source-file-default-directory "/mnt/music/") (setq erc-autojoin-channels-alist '(("freenode.net" "#ninthfloor" "#emacs"))) @@ -153,6 +187,7 @@ (setq jabber-chat-local-prompt-format "%t >\n") (setq jabber-chatstates-confirm nil) (setq jabber-history-dir "~/.emacs.d/jabber") +(setq jabber-muc-autojoin '("aethon@muc.ryuslash.org")) (setq jabber-roster-show-bindings nil) (setq jit-lock-defer-time 0.2) (setq magit-repo-dirs '("~/projects/" "~/var/src/")) @@ -226,6 +261,9 @@ (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 "") 'emms-next) (global-set-key (kbd "") 'oni:emms-toggle-playing) @@ -293,24 +331,15 @@ 'display-buffer-alist '("^\\*magit: .*\\*$" . ((display-buffer-same-window . nil)))) -(unless (oni:required-packages-installed-p) - (message "%s" "Refreshing package database...") - (package-refresh-contents) - (message "%s" " done.") - (mapc #'(lambda (package) - (when (not (package-installed-p package)) - (package-install package))) - oni:required-packages)) - (blink-cursor-mode -1) (column-number-mode -1) (line-number-mode -1) -(menu-bar-mode -1) -(scroll-bar-mode -1) -(tool-bar-mode -1) (tooltip-mode -1) +(package-initialize) + (auto-insert-mode) +(cua-selection-mode t) (electric-indent-mode) (electric-pair-mode) (ido-mode) @@ -321,8 +350,8 @@ (smex-initialize) (help-at-pt-set-timer) - -(load-theme 'yoshi t) +(windmove-default-keybindings) +(global-diff-hl-mode) (load custom-file) ;; (load "rudel-loaddefs.el") @@ -335,7 +364,6 @@ (server-start)) (diminish 'auto-fill-function "_") -(ac-config-default) (provide 'init) diff --git a/.emacs.d/init.org b/.emacs.d/init.org index b3f3c31..ac7f7c1 100644 --- a/.emacs.d/init.org +++ b/.emacs.d/init.org @@ -2,365 +2,75 @@ #+STYLE: #+OPTIONS: author:nil #+STARTUP: showall +#+LINK: yoshi-theme http://ryuslash.org/projects/yoshi-theme.html -* Startup +* Emacs init - Startup requires a bit of customization to handle all my - customizations. - -** Load paths - - I have two versions of Emacs installed on my main computer. I have - a daily build of Emacs's ~trunk~ (or currently ~emacs-24~) branch from - bazaar and I have the official ~emacs~ package from archlinux - installed. I keep that second one around so that the occasional - emacs package that I install using ~pacman~ will recognize it as a - dependency and so that if there has been some horrible mistake in - the ~trunk~ branch I still have a stable version to fall back - on[fn:1]. - -*** Package initialization - - In order for packages installed through ELPA to be included - without having to mess with load paths and such, use: - - #+NAME: package-initialize - #+BEGIN_SRC emacs-lisp - (package-initialize) - #+END_SRC - -*** site-lisp - - Because of the setup I wrote about I need to have both the - self-built ~site-lisp~ directory in my load path *and* the "official" - one. - - #+NAME: load-site-lisps - #+BEGIN_SRC emacs-lisp - (mapc #'oni:add-all-to-load-path - '("/usr/share/emacs/site-lisp" - "/usr/local/emacs/share/emacs/site-lisp")) - #+END_SRC - - The =oni:add-all-to-load-path= function just binds =default-directory= - to the given directory and calls - =normal-top-level-add-subdirs-to-load-path= to add it and all its - subdirectories to the load path. - - #+NAME: add-all - #+BEGIN_SRC emacs-lisp - (defun oni:add-all-to-load-path (dir) - (add-to-list 'load-path dir) - (let ((default-directory dir)) - (normal-top-level-add-subdirs-to-load-path))) - #+END_SRC - -**** TODO Add load paths in different order depending on version - - The officially installed version should load - =/usr/share/emacs/site-lisp= before - =/usr/local/emacs/share/emacs/sit-lisp= and the bzr version should - do the reversed. - -*** Projects - - Then there are some projects I'm working on, which I use on a - daily basis, these should also be added so I don't have to - constantly remove and re-install them through ~package.el~ when - working on them. And there is the ~load-defs.el~ in my personal - ~site-lisp~ directory of course. - - #+NAME: load-projects - #+BEGIN_SRC emacs-lisp - (mapc #'oni:add-to-load-path-maybe-load-defs - '("~/projects/emacs/dispass.el" "~/projects/emacs/mode-icons" - "~/.emacs.d/site-lisp" "~/projects/emacs/pony-mode/src" - "~/projects/emacs/php-mode")) - #+END_SRC - - The =oni:add-to-load-path-maybe-load-defs= function just adds the - given directory to the load path and then looks for a file named - ~loaddefs.el~ within that directory, if it exists it loads it. - - #+NAME: add-with-loaddefs - #+BEGIN_SRC emacs-lisp - (defun oni:add-to-load-path-maybe-load-defs (dir) - (add-to-list 'load-path dir) - (let ((loaddefs (concat dir "/loaddefs.el"))) - (when (file-exists-p loaddefs) - (load loaddefs)))) - #+END_SRC - -*** Themes - - And, finally, I'm also working on a color theme for emacs, this - should be added to ~custom-theme-load-path~. By using =mapc= here as - well I'm keeping in mind that this isn't the first theme I've - worked on and it might not be the last either. - - #+NAME: load-themes - #+BEGIN_SRC emacs-lisp - (mapc #'oni:add-to-custom-theme-load-path - '("~/projects/emacs/yoshi-theme")) - #+END_SRC - - The =oni:add-to-custom-theme-load-path= just adds the given - directory to the cutom theme load path. - - #+NAME: add-themes - #+BEGIN_SRC emacs-lisp - (defun oni:add-to-custom-theme-load-path (dir) - (add-to-list 'custom-theme-load-path dir)) - #+END_SRC - -*** Evaluation - - Because during byte-compilation certain parts loaded so far might - also be required I put it in an =eval-and-compile= form, so that all - components are loaded with ~emacs -Q~ as well. Without this - compilation might fail at certain points. - - #+BEGIN_SRC emacs-lisp :tangle init2.el :noweb yes - (eval-and-compile - <> - - <> - - <> - - <> - <> - <> - <>) - #+END_SRC - -** Modules - - While I try to use =eval-after-load= and =autoload= as much as - possible, some things require direct =require='ing to be of use. - -*** Require - - - ~auto-complete-config~ :: This sets up some default settings to - make ~auto-complete~ work for most[fn:2] of the modes it - supports. - - #+BEGIN_SRC emacs-lisp :tangle init2.el - (require 'auto-complete-config) - #+END_SRC - - - ~geiser-install~ :: Sets up geiser autoloads and such. - - #+BEGIN_SRC emacs-lisp :tangle init2.el - (require 'geiser-install) - #+END_SRC - - - ~uniquify~ :: Provides more helpful buffer name uniquification. - The default of using ~buffer-name<2>~ is boring and - uninformative, ~uniquify~ fixes this. - - #+BEGIN_SRC emacs-lisp :tangle init2.el - (require 'uniquify) - #+END_SRC - - - ~ext~ :: Functions from external sources. - - ~oni~ :: Functions written personally. - - #+BEGIN_SRC emacs-lisp :tangle init2.el - (require 'ext) - (require 'oni) - #+END_SRC - -*** Autoload - - These might not be used at all in a session, so they should only - be loaded when necessary. - - =define-slime-contrib= was used by some module that didn't autoload - or require it[fn:3]. But since I don't use whichever model it - was every day, it is of no use to load it every single time. - - #+BEGIN_SRC emacs-lisp :tangle init2.el - (autoload 'define-slime-contrib "slime") - #+END_SRC - - I installed ~global~ with ~pacman~, but this doesn't add anything to - any =loaddefs.el=, so doesn't create any autoloads. - - #+BEGIN_SRC emacs-lisp :tangle init2.el - (autoload 'gtags-mode "gtags" nil t) - #+END_SRC - - ~jabber.el~ does create ~jabber-autoloads.el~, but I only ever start - using it through ~jabber-connect~, so anything else isn't really - necessary. - - #+BEGIN_SRC emacs-lisp :tangle init2.el - (autoload 'jabber-connect "jabber" nil t) - #+END_SRC - - I used to work a bit on ~php-mode~, but that was a while ago, so - it's still in my ~site-lisp~ directory. - - #+BEGIN_SRC emacs-lisp :tangle init2.el - (autoload 'php-mode "php-mode" nil t) - #+END_SRC - - The same that goes for ~gtags.el~ also goes for ~po-mode.el~. - - #+BEGIN_SRC emacs-lisp :tangle init2.el - (autoload 'po-mode "po-mode" nil t) - #+END_SRC - - And the same that went for ~php-mode~ also goes for ~pony-mode~, - except I'm still working on it and I was too lazy to put it with - my other projects. I should still do that. - - #+BEGIN_SRC emacs-lisp :tangle init2.el - (autoload 'pony-mode "pony-mode" nil t) - #+END_SRC - - ~sawfish.el~ has the same problem that ~gtags.el~ and ~po-mode.el~ have. - - #+BEGIN_SRC emacs-lisp :tangle init2.el - (autoload 'sawfish-mode "sawfish" nil t) - #+END_SRC - - I use =server-running-p= to check whether or not I should start a - new server, but this function isn't autoloaded by default. - - #+BEGIN_SRC emacs-lisp :tangle init2.el - (autoload 'server-running-p "server") - #+END_SRC - - I was starting to try ~slime-js~ to make JavaScript programming - more interesting, but I haven't gotten around to trying it out - fully, yet. It shares issues with ~gtags.el~, ~po-mode.el~ and - ~sawfish.el~. - - #+BEGIN_SRC emacs-lisp :tangle init2.el - (autoload 'slime-js-minor-mode "slime-js" nil t) - #+END_SRC - - I found ~xmodmap-mode~ on the [[http://emacswiki.org][EmacsWiki]] some time ago, it was - simple and a good example of how to use ~define-generic-mode~, but - since it's not really my project and it's really small it just - sits in my ~site-lisp~ directory. - - #+BEGIN_SRC emacs-lisp :tangle init2.el - (autoload 'xmodmap-mode "xmodmap-mode" nil t) - #+END_SRC - - ~w3m~ also has a setup module like ~geiser-install~, but since I only - ever use these two functions to start it, there is no real need - for anything else. - - #+BEGIN_SRC emacs-lisp :tangle init2.el - (autoload 'w3m-bookmark-view "w3m" nil t) - (autoload 'w3m-goto-url "w3m" nil t) - #+END_SRC - -* Aliases - - I've never had any trouble with accidentally pressing ~y~ while being - asked a question, so I've never had any reason to prefer ~yes-or-no-p~ - over ~y-or-n-p~. - - #+begin_src emacs-lisp :tangle init2.el - (defalias 'yes-or-no-p 'y-or-n-p) - #+end_src - - ~ibuffer~ is a drop-in replacement for ~list-buffers~, but with more - features. - - #+begin_src emacs-lisp :tangle init2.el - (defalias 'list-buffers 'ibuffer) - #+end_src - - I don't know if replacing ~dabbrev-expand~ with ~hippie-expand~, but at - least ~hippie-expand~ doesn't use ~dabbrev-expand~, and I haven't - noticed anything wrong so far, and ~hippie-expand~ does so much more - than ~dabbrev-expand~. + Before doing anything else I should make sure that both the + directories ~/usr/local/emacs/share/emacs/site-lisp~ and + ~/usr/share/emacs/site-list~ are included in =load-path=, along with + their subdirectories, but only if they haven't already been added + and exist. Place them at the end of =load-path= so they don't mess up + package precedence. #+BEGIN_SRC emacs-lisp :tangle init2.el - (defalias 'dabbrev-expand 'hippie-expand) + (eval-and-compile + (defun oni:path-init (dir) + "Add DIR to `load-path' and all its subdirectories, unless + DIR is already in `load-path'." + (unless (or (member dir load-path) (not (file-exists-p dir))) + (let ((default-directory dir)) + (add-to-list 'load-path dir t) + (normal-top-level-add-subdirs-to-load-path)))) + (oni:path-init "/usr/share/emacs/site-lisp") + (oni:path-init "/usr/local/emacs/share/emacs/site-lisp")) #+END_SRC -* Faces - - Define a face to how the summary line of git commits as the first - headline of an ~org-mode~ file. - - #+begin_src emacs-lisp :tangle init2.el - (defface git-commit-summary-face - '((t (:inherit org-level-1))) - "Face for the git title line." - :group 'local) - #+end_src - - Define a face to show characters that have been placed beyond the - maximum length of a summary line. - - #+begin_src emacs-lisp :tangle init2.el - (defface git-commit-overlong-summary-face - '((t (:background "#873732"))) - "Face for commit titles that are too long." - :group 'local) - #+end_src - - Define a face to show characters that have been placed on the second - line of a git commit. Those should always remain empty. + Add my project [[yoshi-theme]] to =custom-theme-load-path= and load it. #+BEGIN_SRC emacs-lisp :tangle init2.el - (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) + (add-to-list 'custom-theme-load-path "~/projects/emacs/yoshi-theme/") + (load-theme 'yoshi t) #+END_SRC -* Keys - - Since the ~C-l~ combination is so much easier than ~C-j~ when using the - [[http://colemak.com][colemak]] keyboard layout and I use ~C-j~ much more, switch them. - - #+BEGIN_SRC emacs-lisp :tangle init2.el - (define-key key-translation-map (kbd "C-j") (kbd "C-l")) - (define-key key-translation-map (kbd "C-l") (kbd "C-j")) - #+END_SRC - -* eldoc - - Diminish ~eldoc~'s lighter to nothing after it loads to keep the - mode-line clean. - - #+begin_src emacs-lisp :tangle init2.el - (eval-after-load "eldoc" - '(diminish 'eldoc-mode)) - #+end_src - -* eshell + Remove the ~menu-bar~, ~tool-bar~ and ~scroll-bar~ from the UI since I + don't use them at all. - After ~em-term.el~ loads add ~unison~ to the ~eshell-visual-commands~ to - make sure it gets unbuffered input. + #+BEGIN_SRC emacs-lisp :tangle init2.el + (menu-bar-mode -1) + (scroll-bar-mode -1) + (tool-bar-mode -1) + #+END_SRC - #+begin_src emacs-lisp :tangle init2.el - (eval-after-load "em-term" - '(add-to-list 'eshell-visual-commands "unison")) - #+end_src + Add any other interesting paths to =load-path= and, if it exists, + load the ~loaddefs.el~ file from these directories. -* Window movement + #+BEGIN_SRC emacs-lisp :tangle init2.el + (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 - Make it easier to move through windows by using ~windmove~. + Don't ask ~yes~ or ~no~, ask ~y~ or ~n~, I've never had an accidental ~y~ so + far. #+BEGIN_SRC emacs-lisp :tangle init2.el - (windmove-default-keybindings) + (defalias 'yes-or-no-p 'y-or-n-p) #+END_SRC -* Footnotes + Use =ibuffer= instead of the default =list-buffers= because it has many + more features. -[fn:1] Though it doesn't happen often that ~trunk~ is so messed up that -I can't use it. + #+BEGIN_SRC emacs-lisp :tangle init2.el + (defalias 'list-buffers 'ibuffer) + #+END_SRC -[fn:2] Or perhaps all. + Do the same with =hippie-expand= and =dabbrev-expand=. -[fn:3] I think it was ~slime-js-minor-mode~, but I'm not sure. + #+BEGIN_SRC emacs-lisp :tangle init2.el + (defalias 'dabbrev-expand 'hippie-expand) + #+END_SRC diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index a8d36e9..91c4e27 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -87,6 +87,10 @@ DOT are intentionally being skipped." (interactive) (server-save-buffers-kill-terminal nil)) +(defun oni:color-for (object) + "Generate a hex color by taking the first 6 characters of OBJECT's MD5 sum." + (format "#%s" (substring (md5 object) 0 6))) + (defun oni:compile-el () "Compile the current buffer file if it is an .el file." (let* ((full-file-name (buffer-file-name)) @@ -563,16 +567,6 @@ use. If MODE is not nil, open a new buffer with the name default-directory "' request-pull " (when patchp "-p ") from " " url " " to)))))) -(defun oni:required-packages-installed-p () - "Check if all the packages I need are installed." - (let ((tmp-packages oni:required-packages) - (result t)) - (while (and tmp-packages result) - (if (not (package-installed-p (car tmp-packages))) - (setq result nil)) - (setq tmp-packages (cdr tmp-packages))) - result)) - (defun oni:rst-mode-func () "Function for `rst-mode-hook'." (auto-fill-mode)) @@ -639,6 +633,17 @@ If no direction is given, don't split." (emms-player-mpd-connect)) (emms)) +(defun oni:start-python-test-mail-server () + "Run the python test mailserver." + (interactive) + (start-process "python-test-mail-server" "*py-mail-server*" "python" "-m" + "smtpd" "-n" "-c" "DebuggingServer" "localhost:1025")) + +(defun oni:stop-python-test-mail-server () + "Stop the python test mailserver." + (interactive) + (kill-process "python-test-mail-server")) + (defun oni:term-mode-func () "Function for `term-mode-hook'." (setq truncate-lines nil)) @@ -676,6 +681,14 @@ for easy selection." "Initialization function for yasnippet." (diminish 'yas-minor-mode)) +(defvar oni:auto-save-name-transforms + `((".*" ,temporary-file-directory t)) + "Place all auto-save files in `temporary-file-directory'.") + +(defvar oni:backup-directory-alist + `((".*" . ,temporary-file-directory)) + "Palce all backup files in `temporary-file-directory'.") + (defvar oni:mailbox-map '("top" ("menu" ("ryulash.org" . "ryuslash") @@ -684,11 +697,5 @@ for easy selection." ("aethon" . "aethon"))) "A mailbox map for use with `tmm-prompt'.") -(defvar oni:required-packages - '(graphviz-dot-mode htmlize magit rainbow-delimiters rainbow-mode - yasnippet markdown-mode flymake flymake-cursor sauron expand-region - git-auto-commit-mode idomenu magit smex) - "List of all the packages I have (want) installed.") - (provide 'oni) ;;; oni.el ends here -- cgit v1.2.3-54-g00ecf From 5a1e9f2ea8ec2b7e625539ee2bd4006dce269eb2 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Mon, 28 Jan 2013 00:18:29 +0100 Subject: Move eldoc settings to org --- .emacs.d/init.el | 1 - .emacs.d/init.org | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to '.emacs.d/init.org') diff --git a/.emacs.d/init.el b/.emacs.d/init.el index dddef30..ac10520 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -23,7 +23,6 @@ "Face for the supposedly empty line in commit messages." :group 'local) -(eval-after-load "eldoc" '(diminish 'eldoc-mode)) (eval-after-load "em-term" '(add-to-list 'eshell-visual-commands "unison")) (eval-after-load "emms-source-file" '(oni:emms-init)) (eval-after-load "flymake" '(oni:flymake-init)) diff --git a/.emacs.d/init.org b/.emacs.d/init.org index ac7f7c1..d46e722 100644 --- a/.emacs.d/init.org +++ b/.emacs.d/init.org @@ -74,3 +74,11 @@ #+BEGIN_SRC emacs-lisp :tangle init2.el (defalias 'dabbrev-expand 'hippie-expand) #+END_SRC + + Don't show it when ~eldoc~ is running, I almost assume that it is + whenever I'm working in a mode that supports it anyway. This should + only execute once ~eldoc~ has been loaded. + + #+BEGIN_SRC emacs-lisp :tangle init2.el + (eval-after-load "eldoc" '(diminish 'eldoc-mode)) + #+END_SRC -- cgit v1.2.3-54-g00ecf From 7d719f694b745151093db7da3ad9ee9c63483368 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Mon, 28 Jan 2013 00:43:57 +0100 Subject: Move eshell settings to org --- .emacs.d/init.el | 6 --- .emacs.d/init.org | 93 +++++++++++++++++++++++++++++++++++++++++++++++ .emacs.d/site-lisp/oni.el | 46 ----------------------- 3 files changed, 93 insertions(+), 52 deletions(-) (limited to '.emacs.d/init.org') diff --git a/.emacs.d/init.el b/.emacs.d/init.el index ac10520..979c0f5 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -23,7 +23,6 @@ "Face for the supposedly empty line in commit messages." :group 'local) -(eval-after-load "em-term" '(add-to-list 'eshell-visual-commands "unison")) (eval-after-load "emms-source-file" '(oni:emms-init)) (eval-after-load "flymake" '(oni:flymake-init)) (eval-after-load "ido" '(oni:ido-init)) @@ -107,9 +106,6 @@ (setq erc-nick "ryuslash") (setq erc-timestamp-format "[%H:%M] ") (setq erc-timestamp-only-if-changed-flag nil) -(setq eshell-highlight-prompt nil) -(setq eshell-prompt-function 'oni:eshell-prompt-function) -(setq eshell-prompt-regexp "^[#$]> ") (setq fci-rule-color "darkred") (setq flymake-gui-warnings-enabled nil) (setq flymake-info-line-regexp @@ -235,7 +231,6 @@ (add-hook 'diary-display-hook 'oni:diary-display-func) (add-hook 'emacs-lisp-mode-hook 'oni:emacs-lisp-mode-func) (add-hook 'erc-mode-hook 'oni:erc-mode-func) -(add-hook 'eshell-mode-hook 'oni:eshell-mode-func) (add-hook 'flymake-mode-hook 'oni:flymake-mode-func) (add-hook 'go-mode-hook 'oni:go-mode-func) (add-hook 'gtags-mode-hook 'oni:gtags-mode-func) @@ -275,7 +270,6 @@ (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:raise-eshell) (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) diff --git a/.emacs.d/init.org b/.emacs.d/init.org index d46e722..9caead5 100644 --- a/.emacs.d/init.org +++ b/.emacs.d/init.org @@ -82,3 +82,96 @@ #+BEGIN_SRC emacs-lisp :tangle init2.el (eval-after-load "eldoc" '(diminish 'eldoc-mode)) #+END_SRC + +** Eshell + + 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 :tangle init2.el + (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 :tangle init2.el + (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 :tangle init2.el + (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 :tangle init2.el + (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 :tangle init2.el + (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 diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 91c4e27..d6aae02 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -147,39 +147,6 @@ DOT are intentionally being skipped." (visual-line-mode) (setq truncate-lines nil)) -(defun oni:eshell-mode-func () - "Function for `eshell-mode-hook'." - (setq truncate-lines 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")) - "> "))) - (defun oni:flymake-init () "Initialization function for flymake." (require 'flymake-cursor) @@ -492,19 +459,6 @@ ignored." (switch-to-buffer buffer) (call-interactively 'ansi-term)))) -(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))))) - (defun oni:raise-scratch (&optional mode) "Show the *scratch* buffer. If called with a universal argument, ask the user which mode to -- cgit v1.2.3-54-g00ecf From 8fddc0d0a741ca8b77c08a6c8f33ce1ee6a5925e Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Sat, 2 Feb 2013 00:56:15 +0100 Subject: emacs: Move EMMS settings to init.org --- .emacs.d/init.el | 7 ------- .emacs.d/init.org | 46 ++++++++++++++++++++++++++++++++++++++++++++++ .emacs.d/site-lisp/oni.el | 29 ----------------------------- 3 files changed, 46 insertions(+), 36 deletions(-) (limited to '.emacs.d/init.org') diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 61e0f96..5d6a328 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -23,7 +23,6 @@ "Face for the supposedly empty line in commit messages." :group 'local) -(eval-after-load "emms-source-file" '(oni:emms-init)) (eval-after-load "flymake" '(oni:flymake-init)) (eval-after-load "ido" '(oni:ido-init)) (eval-after-load "jabber" '(oni:jabber-init)) @@ -98,7 +97,6 @@ (tool-bar-lines . nil) (font . "Envy Code R:pixelsize=18"))) (setq elnode-do-init nil) -(setq emms-source-file-default-directory "/mnt/music/") (setq erc-autojoin-channels-alist '(("freenode.net" "#ninthfloor" "#emacs"))) (setq erc-hide-list '("JOIN" "PART" "QUIT")) @@ -259,13 +257,8 @@ (define-key key-translation-map (kbd "C-l") (kbd "C-j")) (global-set-key (kbd "'") 'oni:self-insert-dwim) -(global-set-key (kbd "") 'emms-next) -(global-set-key (kbd "") 'oni:emms-toggle-playing) -(global-set-key (kbd "") 'emms-previous) -(global-set-key (kbd "") 'emms-stop) (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) diff --git a/.emacs.d/init.org b/.emacs.d/init.org index 9caead5..50a4161 100644 --- a/.emacs.d/init.org +++ b/.emacs.d/init.org @@ -83,6 +83,52 @@ (eval-after-load "eldoc" '(diminish 'eldoc-mode)) #+END_SRC + Use the standard EMMS configuration and add some MPD settings. + + #+BEGIN_SRC emacs-lisp :tangle init2.el + (defun oni:emms-init () + "Initialization function for EMMS." + (require 'emms-setup) + (require 'emms-player-mpd) + + (emms-standard) + + (add-to-list 'emms-info-functions 'emms-info-mpd) + (add-to-list 'emms-player-list 'emms-player-mpd) + + (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 "emms-source-file" '(oni:emms-init)) + (setq emms-source-file-default-directory "/mnt/music/") + #+END_SRC + + Add some keybindings for EMMS. + + #+BEGIN_SRC emacs-lisp :tangle init2.el + (defun oni:emms-toggle-playing () + "Toggle between playing/paused states." + (interactive) + (if (eq emms-player-playing-p nil) + (emms-start) + (emms-pause))) + + (defun oni:start-emms () + "Check to see if the function `emms' exists, if not call + `emms-player-mpd-connect' and assume that will have loaded it." + (interactive) + (unless (fboundp 'emms) + (emms-player-mpd-connect)) + (emms)) + + (global-set-key (kbd "") 'emms-next) + (global-set-key (kbd "") 'oni:emms-toggle-playing) + (global-set-key (kbd "") 'emms-previous) + (global-set-key (kbd "") 'emms-stop) + (global-set-key (kbd "") 'oni:start-emms) + #+END_SRC + ** Eshell Add ~unison~ to the list of =eshell-visual-commands= because it diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 453c01a..78dcb8f 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -104,27 +104,6 @@ DOT are intentionally being skipped." "Function for `emacs-lisp-mode-hook'." (eldoc-mode)) -(defun oni:emms-init () - "Initialization function for EMMS." - (require 'emms-setup) - (require 'emms-player-mpd) - - (emms-standard) - - (add-to-list 'emms-info-functions 'emms-info-mpd) - (add-to-list 'emms-player-list 'emms-player-mpd) - - (setq emms-player-mpd-server-name "localhost") - (setq emms-player-mpd-server-port "6600") - (setq emms-player-mpd-music-directory "/mnt/music/mp3")) - -(defun oni:emms-toggle-playing () - "Toggle between playing/paused states." - (interactive) - (if (eq emms-player-playing-p nil) - (emms-start) - (emms-pause))) - (defun oni:erc-mode-func () "Function for `erc-mode-hook'." (erc-fill-mode -1) @@ -562,14 +541,6 @@ If no direction is given, don't split." ((?h) (split-window-horizontally)) (t window)))) -(defun oni:start-emms () - "Check to see if the function `emms' exists, if not call -`emms-player-mpd-connect' and assume that will have loaded it." - (interactive) - (unless (fboundp 'emms) - (emms-player-mpd-connect)) - (emms)) - (defun oni:start-python-test-mail-server () "Run the python test mailserver." (interactive) -- cgit v1.2.3-54-g00ecf From 9cd4c8ed8ca61df9a2839cb3b151b71f15c5e0a6 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Sat, 2 Feb 2013 01:08:59 +0100 Subject: emacs: Move flymake settings to init.org --- .emacs.d/init.el | 48 ----------------------------- .emacs.d/init.org | 77 +++++++++++++++++++++++++++++++++++++++++++++++ .emacs.d/site-lisp/oni.el | 22 -------------- 3 files changed, 77 insertions(+), 70 deletions(-) (limited to '.emacs.d/init.org') diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 5d6a328..4f109f6 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -23,7 +23,6 @@ "Face for the supposedly empty line in commit messages." :group 'local) -(eval-after-load "flymake" '(oni:flymake-init)) (eval-after-load "ido" '(oni:ido-init)) (eval-after-load "jabber" '(oni:jabber-init)) (eval-after-load "newst-treeview" '(require 'newsticker-init)) @@ -105,52 +104,6 @@ (setq erc-timestamp-format "[%H:%M] ") (setq erc-timestamp-only-if-changed-flag nil) (setq fci-rule-color "darkred") -(setq flymake-gui-warnings-enabled nil) -(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")))) (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") @@ -229,7 +182,6 @@ (add-hook 'diary-display-hook 'oni:diary-display-func) (add-hook 'emacs-lisp-mode-hook 'oni:emacs-lisp-mode-func) (add-hook 'erc-mode-hook 'oni:erc-mode-func) -(add-hook 'flymake-mode-hook 'oni:flymake-mode-func) (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) diff --git a/.emacs.d/init.org b/.emacs.d/init.org index 50a4161..5edf00e 100644 --- a/.emacs.d/init.org +++ b/.emacs.d/init.org @@ -129,6 +129,83 @@ (global-set-key (kbd "") 'oni:start-emms) #+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 :tangle init2.el + (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, 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 :tangle init2.el + (setq flymake-gui-warnings-enabled nil) + (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 + ** Eshell Add ~unison~ to the list of =eshell-visual-commands= because it diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 78dcb8f..b1c8b14 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -110,28 +110,6 @@ DOT are intentionally being skipped." (visual-line-mode) (setq truncate-lines nil)) -(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))) - -(defun oni:flymake-mode-func () - "Function for `flymake-mode-hook'." - (local-set-key [M-P] 'flymake-goto-prev-error) - (local-set-key [M-N] 'flymake-goto-next-error)) - (defun oni:go-mode-func () "Function for `go-mode-hook'." (setq indent-tabs-mode nil) -- cgit v1.2.3-54-g00ecf From c3aa5bb8b4b3e900037ac31a0c8006147ea68f10 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Wed, 6 Feb 2013 11:48:18 +0100 Subject: emacs: Use flycheck for python --- .emacs.d/init.org | 23 +++++++++++++++++++++++ .emacs.d/site-lisp/oni.el | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) (limited to '.emacs.d/init.org') diff --git a/.emacs.d/init.org b/.emacs.d/init.org index 5edf00e..9070798 100644 --- a/.emacs.d/init.org +++ b/.emacs.d/init.org @@ -206,6 +206,29 @@ "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 :tangle init2.el + (eval-after-load "flycheck" + '(progn + (flycheck-declare-checker python-pycheck + "Uses pycheck.sh to check for errors/warnings." + :command '("pycheck.sh" source-inplace) + :error-patterns + '(("^\\(?1:.*\\):\\(?2:[0-9]+\\): Warning (W.*): \\(?4:.*\\)$" warning) + ("^\\(?1:.*\\):\\(?2:[0-9]+\\): Error (E.*): \\(?4:.*\\)$" error) + ("^\\(?1:.*\\):\\(?2:[0-9]+\\): \\[F\\] \\(?4:.*\\)$" error) + ("^\\(?1:.*?\\):\\(?2:[0-9]+\\):\\(?:\\(?3:[0-9]+\\):\\)? \\(?4:E[0-9]+.*\\)$" error) + ("^\\(?1:.*?\\):\\(?2:[0-9]+\\):\\(?:\\(?3:[0-9]+\\):\\)? \\(?4:W[0-9]+.*\\)$" warning) + ("^\\(?1:.*\\):\\(?2:[0-9]+\\): \\(?4:.*\\)$" error)) + :modes 'python-mode) + + (mapc (lambda (c) (delete c flycheck-checkers)) + '(python-flake8 python-pylint python-pyflakes)) + (add-to-list 'flycheck-checkers 'python-pycheck))) + #+END_SRC + ** Eshell Add ~unison~ to the list of =eshell-visual-commands= because it diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index b1c8b14..09a9d79 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -376,7 +376,7 @@ When dealing with braces, add another line and indent that too." (defun oni:python-mode-func () "Function for `python-mode-hook'." - (flymake-mode) + (flycheck-mode) (local-set-key (kbd "C->") 'python-indent-shift-right) (local-set-key (kbd "C-<") 'python-indent-shift-left) (set (make-local-variable 'electric-indent-chars) nil) -- cgit v1.2.3-54-g00ecf From 7f8b8daf4bb2736e240c9b7d2b619ec136f6c4d8 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Thu, 7 Feb 2013 10:03:30 +0100 Subject: Emacs: remove my checker I don't like the way epylint works... --- .emacs.d/init.org | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to '.emacs.d/init.org') diff --git a/.emacs.d/init.org b/.emacs.d/init.org index 9070798..f4acfca 100644 --- a/.emacs.d/init.org +++ b/.emacs.d/init.org @@ -212,21 +212,8 @@ #+BEGIN_SRC emacs-lisp :tangle init2.el (eval-after-load "flycheck" '(progn - (flycheck-declare-checker python-pycheck - "Uses pycheck.sh to check for errors/warnings." - :command '("pycheck.sh" source-inplace) - :error-patterns - '(("^\\(?1:.*\\):\\(?2:[0-9]+\\): Warning (W.*): \\(?4:.*\\)$" warning) - ("^\\(?1:.*\\):\\(?2:[0-9]+\\): Error (E.*): \\(?4:.*\\)$" error) - ("^\\(?1:.*\\):\\(?2:[0-9]+\\): \\[F\\] \\(?4:.*\\)$" error) - ("^\\(?1:.*?\\):\\(?2:[0-9]+\\):\\(?:\\(?3:[0-9]+\\):\\)? \\(?4:E[0-9]+.*\\)$" error) - ("^\\(?1:.*?\\):\\(?2:[0-9]+\\):\\(?:\\(?3:[0-9]+\\):\\)? \\(?4:W[0-9]+.*\\)$" warning) - ("^\\(?1:.*\\):\\(?2:[0-9]+\\): \\(?4:.*\\)$" error)) - :modes 'python-mode) - (mapc (lambda (c) (delete c flycheck-checkers)) - '(python-flake8 python-pylint python-pyflakes)) - (add-to-list 'flycheck-checkers 'python-pycheck))) + '(python-pylint python-pyflakes)))) #+END_SRC ** Eshell -- cgit v1.2.3-54-g00ecf