summaryrefslogtreecommitdiffstats
path: root/emacs.d
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2014-12-24 13:28:47 -0500
committerDavid Robillard <d@drobilla.net>2014-12-24 13:29:41 -0500
commit2e75f344760f6a095afb373ee7be39fe87dc40b9 (patch)
tree2bd13ebb1fa5dbe65f4ee8c96e8690353358d396 /emacs.d
parentc8879b154b1254e7558c359289b96446c52fd462 (diff)
downloaddotfiles-2e75f344760f6a095afb373ee7be39fe87dc40b9.tar.gz
dotfiles-2e75f344760f6a095afb373ee7be39fe87dc40b9.tar.bz2
dotfiles-2e75f344760f6a095afb373ee7be39fe87dc40b9.zip
ERC configuration and portability fixes.
Diffstat (limited to 'emacs.d')
-rw-r--r--emacs.d/init.el30
1 files changed, 21 insertions, 9 deletions
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 03d2f43..5608ae4 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -9,6 +9,10 @@
;(require 'sublimity-scroll)
(setq tramp-default-method "scp")
+(require 'package)
+(add-to-list 'package-archives
+ '("melpa" . "http://melpa.milkbox.net/packages/") t)
+
;; Garbage collect much less often (every 10 MiB)
(setq-default gc-cons-threshold 10000000)
@@ -41,11 +45,13 @@
;; If there is more than one, they won't work right.
'(column-number-mode t)
'(compilation-scroll-output t)
+ '(dired-listing-switches "-al --time-style=long-iso")
'(fill-column 79)
'(font-lock-maximum-decoration t)
'(frame-background-mode (quote dark))
'(fringe-mode 0 nil (fringe))
- '(grep-find-command "find . -type f -not -name \"*.svn-base\" -print0 | xargs -0 -e grep -I -n -s -F ")
+ '(grep-find-command
+ "find . -type f -not -name \"*.svn-base\" -print0 | xargs -0 grep -I -n -s -F ")
'(indicate-empty-lines t)
'(inhibit-startup-screen t)
'(jshint-mode-node-program "nodejs")
@@ -59,8 +65,7 @@
'(show-paren-mode t)
'(speedbar-use-images f)
'(split-window-preferred-function (quote split-window-horizontally))
- '(tool-bar-mode nil)
- '(dired-listing-switches "-al --time-style=long-iso"))
+ '(tool-bar-mode nil))
;; Set colours from solarized palette http://ethanschoonover.com/solarized
(custom-set-faces
@@ -68,7 +73,7 @@
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
- '(default ((t (:stipple nil :background "grey10" :foreground "grey80" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 130 :width normal :foundry "unknown" :family "Droid Sans Mono"))))
+ '(default ((t (:stipple nil :background "grey10" :foreground "grey80" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 90 :width normal :foundry "unknown" :family "DejaVu Sans Mono"))))
'(bold ((t (:weight bold))))
'(cursor ((t (:background "grey80"))))
'(diff-added ((t (:foreground "#859900"))))
@@ -151,6 +156,7 @@
(global-set-key (kbd "C-c d") 'svn-status-show-svn-diff)
(global-set-key (kbd "C-c m") 'magit-status)
(global-set-key (kbd "C-c w") 'rotate-windows)
+(global-set-key (kbd "C-c e") 'erc-track-switch-buffer)
;; Shrink fringe and remove scroll bars
;(fringe-mode 'minimal)
@@ -274,11 +280,17 @@
'("\\.md" . markdown-mode))
auto-mode-alist))
+;; IRC configuration
+(require 'erc)
+
+(erc-autojoin-mode t)
+(setq erc-autojoin-channels-alist
+ '((".*\\.freenode.net" "#ardour" "#ardour-dev" "#ardour-mixbus-dev" "#ingen" "#lv2")))
+
+(erc-track-mode t)
+(setq erc-track-exclude-types '("JOIN" "NICK" "PART" "QUIT" "MODE"
+ "324" "329" "332" "333" "353" "477"))
+
;; Start server for emacsclient
(server-start)
(put 'narrow-to-region 'disabled nil)
-
-(add-to-list 'load-path "/home/drobilla/src/others/jshint-mode")
-(require 'flymake-jshint)
-(add-hook 'javascript-mode-hook
- (lambda () (flymake-mode t)))