Skip to content
This repository
Browse code

Emacs updates.

  • Loading branch information...
commit 63eddebc61425bceaa4cf9fd7ef7ab21ed202eee 1 parent f1bba42
Phil Hagelberg authored
17 .emacs.d/init.el
@@ -11,8 +11,7 @@
11 11 marmalade-server "http://marmalade-repo.org/"
12 12 custom-file (expand-file-name "~/.emacs.d/custom.el"))
13 13
14   -(global-set-key (kbd "C-c q") 'join-line)
15   -
  14 +(ignore-errors (load "~/src/lein/pcmpl-lein.el"))
16 15 (ignore-errors (load "~/src/safe/.elisp/sonian.el")) ; for work
17 16
18 17 ;; Packages
@@ -21,16 +20,22 @@
21 20 (load-file "/home/phil/.emacs.d/package-23.el"))
22 21
23 22 (add-to-list 'package-archives
24   - '("marmalade" . "http://marmalade-repo.org/packages/") t)
  23 + '("marmalade" . "http://marmalade-repo.org/packages/") t)
25 24
26 25 (package-initialize)
27 26
28   -(dolist (p '(clojure-mode slime slime-repl clojure-test-mode magit htmlize
29   - scpaste paredit starter-kit starter-kit-lisp
30   - idle-highlight-mode markdown-mode marmalade))
  27 +(when (featurep 'smex)
  28 + (global-set-key (kbd "M-x") 'smex)
  29 + (smex-initialize))
  30 +
  31 +(dolist (p '(clojure-mode slime slime-repl clojure-test-mode htmlize
  32 + scpaste paredit starter-kit starter-kit-lisp smex
  33 + idle-highlight-mode marmalade oddmuse scpaste))
31 34 (when (not (package-installed-p p))
32 35 (package-install p)))
33 36
  37 +(defalias 'guns 'gnus)
  38 +
34 39 ;; why not?
35 40 (eshell)
36 41 ;; graaaaaaah! eshell doesn't respect eval-after-load for some reason:
3  .emacs.d/phil/bindings.el
@@ -3,3 +3,6 @@
3 3
4 4 ;; Start a new eshell even if one is active.
5 5 (global-set-key (kbd "C-x M") (lambda () (interactive) (eshell t)))
  6 +
  7 +(global-set-key (kbd "C-c C-j") 'clojure-jack-in)
  8 +(global-set-key (kbd "C-c g") 'magit-status)
27 .emacs.d/phil/cosmetics.el
... ... @@ -1,5 +1,7 @@
1 1 (defalias 'zb 'color-theme-zenburn)
2   -(defalias 'bb 'color-theme-blackboard)
  2 +(defalias 'tw 'color-theme-twilight)
  3 +(defalias 'sl 'color-theme-solarized)
  4 +
3 5 (defalias 'ff 'find-file)
4 6
5 7 (defun inconsolata (size)
@@ -20,19 +22,18 @@
20 22 (read-from-minibuffer "Size: ")))
21 23 "-*-*-*-c-80-iso10646-1")))
22 24
23   -;; If we don't have XFT, let's at least pick a decent default.
24   -(if (< emacs-major-version 23)
25   - (ignore-errors
26   - (set-default-font (concat "-xos4-terminus-medium-r-normal--"
27   - "16-160-72-72-c-80-iso8859-1"))))
28   -
29 25 ;; lose the stupid pipe chars on the split-screen bar
30   -
31   -(set-face-background 'vertical-border "white")
32 26 (set-face-foreground 'vertical-border "white")
33 27
34   -(eval-after-load 'zenburn
35   - '(progn (set-face-background 'vertical-border "black")
36   - (set-face-foreground 'vertical-border "black")))
  28 +(defun fix-zb ()
  29 + (interactive)
  30 + (set-face-background 'vertical-border "black")
  31 + (set-face-foreground 'vertical-border "black")
  32 + (set-face-foreground 'font-lock-keyword-face "#f0dfaf")
  33 + (set-face-foreground 'eshell-prompt "turquoise"))
  34 +
  35 +(eval-after-load 'color-theme-zenburn
  36 + '(fix-zb))
37 37
38   -(setq org-hide-leading-stars t)
  38 +(eval-after-load 'hl-line
  39 + '(set-face-background 'hl-line "darkseagreen2"))
4 .emacs.d/phil/misc.el
... ... @@ -1,4 +0,0 @@
1   -(add-hook 'oddmuse-mode-hook
2   - (lambda ()
3   - (unless (string-match "question" oddmuse-post)
4   - (setq oddmuse-post (concat "uihnscuskc=1;" oddmuse-post)))))
7 .emacs.d/phil/my-irc.el
@@ -53,3 +53,10 @@
53 53 nick msg)))))
54 54
55 55 (add-hook 'erc-text-matched-hook 'call-libnotify)
  56 +
  57 +(defun window-register-bottom (r &optional x)
  58 + (interactive "cJump to register: \nP")
  59 + (jump-to-register r)
  60 + (walk-windows (lambda (w) (end-of-buffer))))
  61 +
  62 +(global-set-key (kbd "C-x w") 'window-register-bottom)
18 .emacs.d/phil/programming.el
@@ -4,8 +4,6 @@
4 4 (require 'inf-ruby)
5 5 (inf-ruby-keys)))
6 6
7   -(add-hook 'clojure-mode-hook 'esk-turn-on-whitespace)
8   -
9 7 ;; devilspie config
10 8 (add-to-list 'auto-mode-alist '("\\.ds$" . lisp-mode))
11 9
@@ -13,25 +11,19 @@
13 11 (set-default 'tab-width 4)
14 12 (set-default 'c-basic-offset 2)
15 13
16   -(add-hook 'xml-mode-hook 'esk-run-coding-hook)
17   -(add-hook 'java-mode-hook 'esk-run-coding-hook)
18   -
19 14 (eval-after-load 'java-mode
20 15 '(define-key java-mode-map (kbd "C-M-h") 'backward-kill-word))
21 16
22 17 (add-to-list 'auto-mode-alist '("\\.mirah$" . ruby-mode))
23 18
24   -(eval-after-load 'slime
25   - '(durendal-enable))
26   -
27   -(global-set-key (kbd "C-c C-j") 'durendal-jack-in)
28   -(global-set-key (kbd "C-c g") 'magit-status)
29   -
30 19 (add-hook 'slime-repl-mode-hook 'clojure-mode-font-lock-setup)
31 20
32   -(setq slime-kill-without-query-p t
33   - slime-net-coding-system 'utf-8-unix)
  21 +(setq slime-kill-without-query-p t)
34 22
35 23 ;; move to slime
36 24 (put 'slime-lisp-host 'safe-local-variable 'stringp)
37 25 (put 'slime-port 'safe-local-variable 'integerp)
  26 +
  27 +(defalias 'tdoe 'toggle-debug-on-error)
  28 +
  29 +(setq confluence-url "http://dev.clojure.org/")
25 .emacs.d/phil/workarounds.el
... ... @@ -1,10 +1,7 @@
1 1 ;;; broken ido
2 2 (defun ido-directory-too-big-p (arg) nil)
3 3
4   -;; awesome sometimes, but right now more trouble than it's worth
5   -(setq tramp-mode nil
6   - tramp-unload-hook nil
7   - compilation-scroll-output t ; byte-compilation fails w/o this
  4 +(setq compilation-scroll-output t ; byte-compilation fails w/o this
8 5 ido-enable-tramp-completion nil)
9 6
10 7 (add-hook 'eshell-mode-hook
@@ -20,6 +17,20 @@
20 17 (flet ((magit-need-refresh (f)))
21 18 (magit-cherry-pick-item))))))
22 19
23   -;; some terminal emulators get confused
24   -;; (define-key paredit-mode-map (kbd "<deletechar>") 'paredit-backward-delete)
25   -;; (define-key paredit-mode-map (kbd "M-<deletechar>") 'backward-kill-word)
  20 +;; come on guys; autoloads are not rocket science
  21 +(add-to-list 'load-path "~/.emacs.d/elpa/color-theme-zenburn-0.1")
  22 +(add-to-list 'load-path "~/.emacs.d/elpa/color-theme-twilight-0.1")
  23 +(autoload 'color-theme-zenburn "color-theme-zenburn" nil t)
  24 +(autoload 'color-theme-twilight "color-theme-twilight" nil t)
  25 +(add-to-list 'load-path "~/.emacs.d/elpa/yaoddmuse-0.1.1")
  26 +
  27 +(add-hook 'oddmuse-mode-hook
  28 + (lambda ()
  29 + (unless (string-match "question" oddmuse-post)
  30 + (setq oddmuse-post (concat "uihnscuskc=1;" oddmuse-post)))))
  31 +
  32 +;; no clippy plz
  33 +(when (not (package-installed-p 'magit))
  34 + (package--with-work-buffer
  35 + "http://tromey.com/elpa/" "magit-0.8.1.el"
  36 + (package-unpack-single "magit" "0.8.1" "Control Git from Emacs" nil)))
639 .emacs.old/#.newsrc-dribble#
0 additions, 639 deletions not shown
18 src/starter-kit/phil/cosmetics.el
... ... @@ -1,18 +0,0 @@
1   -(defalias 'zb 'color-theme-zenburn)
2   -(defalias 'bb 'color-theme-blackboard)
3   -(defalias 'ff 'find-file)
4   -
5   -(defun inconsolata (size)
6   - (interactive "p")
7   - (set-default-font
8   - (concat "-unknown-Inconsolata-normal-normal-normal-*-"
9   - (if (stringp size) size
10   - (if (= 1 size) "16"
11   - (read-from-minibuffer "Size: ")))
12   - "-*-*-*-m-0-*-*")))
13   -
14   -;; If we don't have XFT, let's at least pick a decent default.
15   -(if (< emacs-major-version 23)
16   - (ignore-errors
17   - (set-default-font (concat "-xos4-terminus-medium-r-normal--"
18   - "16-160-72-72-c-80-iso8859-1"))))
47 src/starter-kit/phil/init.el
... ... @@ -1,47 +0,0 @@
1   -;;; My personalizations
2   -
3   -;; elisp libraries I run from source checkouts:
4   -
5   -(add-to-list 'load-path "/home/phil/src/emacs-w3m")
6   -(add-to-list 'load-path "/home/phil/src/twittering-mode")
7   -(add-to-list 'load-path "/home/phil/src/clojure-mode")
8   -(add-to-list 'load-path "/home/phil/src/epresent")
9   -
10   -(autoload 'twit "twittering-mode" "twitter" t)
11   -
12   -(require 'clojure-mode)
13   -
14   -(autoload 'clojure-test-mode "clojure-test-mode" "Clojure test mode" t)
15   -(autoload 'clojure-test-maybe-enable "clojure-test-mode" "" t)
16   -(add-hook 'clojure-mode-hook 'clojure-test-maybe-enable)
17   -
18   -(autoload 'w3m "w3m" "w3m browser" t)
19   -
20   -(autoload 'epresent-run-frame "epresent" "" t)
21   -(global-set-key [f12] 'epresent-run-frame)
22   -
23   -(setq epresent-mode-line-format mode-line-format)
24   -
25   -(eval-after-load 'epresent
26   - '(set-face-attribute 'epresent-title-face nil :underline nil))
27   -
28   -;; Clojure confluence
29   -
30   -(setq confluence-url "http://dev.clojure.org/confluence/rpc/xmlrpc")
31   -(global-set-key "\C-xwf" 'confluence-get-page)
32   -
33   -;; Random stuff
34   -
35   -(setq-default save-place t)
36   -(setq whitespace-line-column 80
37   - twittering-username "technomancy")
38   -
39   -(setq browse-url-browser-function 'browse-url-generic
40   - browse-url-generic-program "conkeror")
41   -
42   -(org-remember-insinuate)
43   -
44   -(global-set-key (kbd "C-c C-r") 'remember)
45   -;; (global-set-key (kbd "S-M-x") 'smex)
46   -
47   -(eshell)
54 src/starter-kit/phil/my-irc.el
... ... @@ -1,54 +0,0 @@
1   -(eval-after-load 'erc
2   - '(progn
3   - (setq erc-prompt ">"
4   - erc-fill-column 75
5   - erc-max-buffer-size 100000
6   - erc-hide-list '("JOIN" "PART" "QUIT" "NICK")
7   - erc-track-exclude-types (append '("324" "329" "332" "333"
8   - "353" "477" "MODE")
9   - erc-hide-list)
10   - erc-nick '("technomancy" "TeXnomancy")
11   - erc-autojoin-timing :ident
12   - erc-flood-protect nil
13   - erc-autojoin-channels-alist
14   - '(("freenode.net" "#emacs" "#clojure" "#seattle.rb" "#leiningen"
15   - "#sonian" "#sonian-safe" "#mirah"))
16   - erc-prompt-for-nickserv-password nil)
17   -
18   - (setq-default erc-ignore-list '("Lajla")
19   - erc-ignore-reply-list '("Lajla"))
20   - (require 'erc-services)
21   - (require 'erc-spelling)
22   - (require 'erc-truncate)
23   - (erc-services-mode 1)
24   - (add-to-list 'erc-modules 'highlight-nicknames 'spelling)
25   - (add-hook 'erc-connect-pre-hook (lambda (x) (erc-update-modules)))
26   - (add-hook 'erc-insert-post-hook 'erc-truncate-buffer)
27   - (set-face-foreground 'erc-input-face "dim gray")
28   - (set-face-foreground 'erc-my-nick-face "blue")))
29   -
30   -(setq pcomplete-cycle-completions nil)
31   -
32   -(ignore-errors
33   - (load (expand-file-name "~/.passwords.el"))
34   -
35   - (setq erc-nickserv-passwords
36   - `((freenode (("technomancy" . ,freenode-password)
37   - ("TeXnomancy" . ,freenode-password))))))
38   -
39   -(defun clean-message (s)
40   - (setq s (replace-regexp-in-string "'" "&apos;"
41   - (replace-regexp-in-string "\"" "&quot;"
42   - (replace-regexp-in-string "&" "&amp;"
43   - (replace-regexp-in-string "<" "&lt;"
44   - (replace-regexp-in-string ">" "&gt;" s)))))))
45   -
46   -(defun call-libnotify (matched-type nick msg)
47   - (let* ((cmsg (split-string (clean-message msg)))
48   - (nick (first (split-string nick "!")))
49   - (msg (mapconcat 'identity (rest cmsg) " ")))
50   - (shell-command-to-string
51   - (format "notify-send -i /home/phil/src/emacs/etc/images/icons/hicolor/scalable/apps/emacs.svg '%s says:' '%s'"
52   - nick msg))))
53   -
54   -(add-hook 'erc-text-matched-hook 'call-libnotify)
22 src/starter-kit/phil/my-rudel.el
... ... @@ -1,22 +0,0 @@
1   -;; Pairing magic!
2   -
3   -(ignore-errors
4   - (when (= emacs-major-version 23)
5   - (load-file "~/src/rudel/rudel-loaddefs.el")))
6   -
7   -(setq rudel-configured-sessions
8   - `((:name "localhost" :backend obby
9   - :host "localhost" :username ,user-login-name
10   - :color "light steel blue"
11   - :encryption t :port 6522
12   - :global-password "" :user-password "")
13   - (:name "puyo" :backend obby
14   - :host "puyo.local" :username ,user-login-name
15   - :color "light steel blue"
16   - :encryption t :port 6522)))
17   -
18   -;; (add-hook 'rudel-document-attach-hook 'rudel-activate-major-mode)
19   -(add-hook 'rudel-document-attach-hook
20   - (lambda (doc buffer) (rudel-mode-line-publish-state-minor-mode t)))
21   -
22   -(setq rudel-overlay-author-display nil)
46 src/starter-kit/phil/programming.el
... ... @@ -1,46 +0,0 @@
1   -(eval-after-load 'ruby-mode
2   - '(add-hook 'ruby-mode-hook 'esk-paredit-nonlisp))
3   -
4   -;; (eval-after-load 'swank-clojure
5   -;; '(add-to-list 'swank-clojure-extra-vm-args
6   -;; "-agentlib:jdwp=transport=dt_socket,address=8021,server=y,suspend=n"))
7   -
8   -(add-hook 'clojure-mode-hook 'turn-on-whitespace)
9   -
10   -(setq inferior-lisp-program
11   - "java -cp /home/phil/src/clojure/clojure.jar clojure.main")
12   -
13   -;; unfortunately some codebases use tabs. =(
14   -(set-default 'tab-width 4)
15   -(set-default 'c-basic-offset 2)
16   -
17   -(eval-after-load 'java-mode
18   - '(progn
19   - (define-key java-mode-map (kbd "C-M-h") 'backward-kill-word)))
20   -
21   -(add-to-list 'auto-mode-alist '("\\.duby$" . ruby-mode))
22   -(add-to-list 'auto-mode-alist '("\\.mirah$" . ruby-mode))
23   -
24   -(setq slime-net-coding-system 'utf-8-unix)
25   -
26   -(add-to-list 'load-path "/home/phil/src/durendal")
27   -(require 'durendal)
28   -
29   -(durendal-enable)
30   -(global-set-key (kbd "C-c C-j") 'durendal-jack-in)
31   -
32   -(add-hook 'slime-repl-mode-hook 'clojure-mode-font-lock-setup)
33   -
34   -(setq slime-kill-without-query-p t)
35   -;; move to slime
36   -(put 'slime-lisp-host 'safe-local-variable 'stringp)
37   -(put 'slime-port 'safe-local-variable 'integerp)
38   -
39   -(eval-after-load 'clojure-mode
40   - (font-lock-add-keywords 'clojure-mode
41   - '(("\\<comp\\>"
42   - (0
43   - (progn (compose-region
44   - (match-beginning 0) (match-end 0)
45   - "∘")
46   - nil))))))
4 src/starter-kit/phil/registers.el
... ... @@ -1,4 +0,0 @@
1   -(set-register ?n '(file . "~/documents/notes.org"))
2   -(set-register ?s '(file . "~/src/safe/log.org"))
3   -(set-register ?p '(file . "~/.emacs.d/phil/init.el"))
4   -(set-register ?x '(file . "~/.xbindkeysgrc.scm"))
2  src/starter-kit/phil/safe.el
... ... @@ -1,2 +0,0 @@
1   -(ignore-errors
2   - (load "~/src/safe/.elisp/sonian-navigation.el"))
26 src/starter-kit/phil/workarounds.el
... ... @@ -1,26 +0,0 @@
1   -;;; broken ido
2   -(defun ido-directory-too-big-p (arg) nil)
3   -
4   -;; awesome sometimes, but right now more trouble than it's worth
5   -(setq tramp-mode nil
6   - tramp-unload-hook nil
7   - ido-enable-tramp-completion nil)
8   -
9   -(add-hook 'eshell-mode-hook
10   - '(lambda () (fmakunbound 'eshell/sudo)
11   - (fmakunbound 'eshell/su)))
12   -
13   -;; plz not to refresh log buffer when I cherry-pick, mkay?
14   -(eval-after-load 'magit
15   - '(ignore-errors (define-key magit-log-mode-map (kbd "A")
16   - (lambda ()
17   - (interactive)
18   - (flet ((magit-need-refresh (f)))
19   - (magit-cherry-pick-item))))))
20   -
21   -;; temp. workaround for lexbind bug
22   -(setq high '())
23   -
24   -;; some terminal emulators get confused
25   -;; (define-key paredit-mode-map (kbd "<deletechar>") 'paredit-backward-delete)
26   -;; (define-key paredit-mode-map (kbd "M-<deletechar>") 'backward-kill-word)

0 comments on commit 63eddeb

Please sign in to comment.
Something went wrong with that request. Please try again.