diff options
| -rw-r--r-- | align-with-spaces.el (renamed from hoersten-align-with-spaces.el) | 4 | ||||
| -rw-r--r-- | hoersten-c-style.el | 2 | ||||
| -rw-r--r-- | init.el | 43 | ||||
| -rw-r--r-- | init_eshell.sh | 1 | ||||
| -rw-r--r-- | move-line.el | 2 | ||||
| -rw-r--r-- | pastebin-region.el (renamed from hoersten-pastebin-region.el) | 4 | ||||
| -rw-r--r-- | thirdparty/color-theme-twilight.el (renamed from color-theme-twilight.el) | 0 | ||||
| -rw-r--r-- | thirdparty/pretty-mode.el (renamed from pretty-mode.el) | 0 | ||||
| -rw-r--r-- | thirdparty/vala-mode.el (renamed from vala-mode.el) | 0 | ||||
| -rw-r--r-- | thirdparty/zencoding-mode.el (renamed from zencoding-mode.el) | 0 |
10 files changed, 34 insertions, 22 deletions
diff --git a/hoersten-align-with-spaces.el b/align-with-spaces.el index fd4806d..cf0ad39 100644 --- a/hoersten-align-with-spaces.el +++ b/align-with-spaces.el @@ -12,5 +12,5 @@ (indent-region beg end) (whitespace-cleanup-region beg end))) -(message "Loaded Hoersten align-with-spaces function") -(provide 'hoersten-align-with-spaces) +(message "Loading align-with-spaces...done") +(provide 'align-with-spaces) diff --git a/hoersten-c-style.el b/hoersten-c-style.el index a3122fb..1f17392 100644 --- a/hoersten-c-style.el +++ b/hoersten-c-style.el @@ -73,5 +73,5 @@ (add-to-list 'auto-mode-alist '("\\.ipp$" . c++-mode)) (add-to-list 'auto-mode-alist '("\\.inl$" . c++-mode)) -(message "Loaded Hoersten C style") +(message "Loading Hoersten C style...done") (provide 'hoersten-c-style)
\ No newline at end of file @@ -3,7 +3,8 @@ ;;;; General ;;;; -(add-to-list 'load-path "~/.emacs.d") ; set default emacs load path +(add-to-list 'load-path "~/.emacs.d") ; set default emacs load path +(add-to-list 'load-path "~/.emacs.d/thirdparty") ; set default third party path (setq-default ediff-split-window-function @@ -12,14 +13,13 @@ inhibit-splash-screen t ; disable splash screen truncate-lines t ; truncate, not wrap, lines indent-tabs-mode nil ; only uses spaces for indentation - split-width-threshold 181) ; min width to split window horizontially + split-width-threshold 181 ; min width to split window horizontially + reb-re-syntax 'string) ; use string syntax for regexp builder (put 'set-goal-column 'disabled nil) ; enable goal column setting (put 'narrow-to-region 'disabled nil) ; enable hiding (put 'narrow-to-page 'disabled nil) -(menu-bar-mode -1) ; remove menu bar -(display-time-mode t) ; show clock (column-number-mode t) ; show column numbers (delete-selection-mode t) ; replace highlighted text (windmove-default-keybindings) ; move between windows with shift-arrow @@ -51,8 +51,8 @@ "Get appropriate font based on system and hostname." (cond ((string-match "darwin" (emacs-version)) "Menlo-12") - ((string-match "HoldenCaulfield" (system-name)) "monospace-7") - ((string-match "lhoersten-66113" (system-name)) "monospace-8") + ((string-match "HoldenCaulfield" (system-name)) "monospace-6") + ((string-match "lhoersten-66113" (system-name)) "monospace-9") ("monospace-10"))) (tool-bar-mode -1) ; remove tool bar @@ -73,7 +73,7 @@ 'eshell-mode-hook '(lambda () (setenv "TERM" "emacs") ; enable colors - (setenv "PATH" (concat "~/.cabal/bin:" (getenv "PATH"))))) ; add cabal binaries + (setenv "PATH" (concat "/opt/ghc7/bin:" "~/.cabal/bin:" (getenv "PATH"))))) ;;;; Mode-Specific ;;;; @@ -118,6 +118,19 @@ indent-tabs-mode t))) ;;; haskell-mode +;; scion +(if (file-exists-p "~/.cabal/share/scion-0.1.0.10/emacs") + (progn + (add-to-list 'load-path "~/.cabal/share/scion-0.1.0.10/emacs") + (require 'scion) + (setq scion-program "~/.cabal/bin/scion-server") + (add-hook + 'haskell-mode-hook + (lambda () + (scion-mode 1) + (scion-flycheck-on-save 1) + (setq scion-completing-read-function 'ido-completing-read))))) + (add-hook 'haskell-mode-hook (lambda () @@ -128,7 +141,7 @@ (setq haskell-font-lock-symbols 'unicode haskell-indent-offset 4 - whitespace-line-column 78)) + whitespace-line-column 120)) t) ; append instead of prepend else haskell-mode overwrites these settings ;;; org-mode @@ -159,21 +172,21 @@ ;;;; Requires ;;;; -(require 'hoersten-align-with-spaces) ; use only spaces for alignment -(require 'hoersten-pastebin-region) ; send selected text to pastebin -(require 'hoersten-c-style) ; load c specific lisp -(require 'vala-mode) ; vala programming language -(require 'move-line) ; move line up or down +(require 'hoersten-c-style) ; load c specific lisp +(require 'align-with-spaces) ; use only spaces for alignment +(require 'pastebin-region) ; send selected text to pastebin +(require 'move-line) ; move line up or down +(require 'vala-mode) ; vala programming language ;;; pretty-mode - unicode character replacement (require 'pretty-mode) (global-pretty-mode t) ;;; yasnippets -(add-to-list 'load-path "~/.emacs.d/yasnippet") +(add-to-list 'load-path "~/.emacs.d/thirdparty/yasnippet") (require 'yasnippet) (yas/initialize) -(yas/load-directory "~/.emacs.d/yasnippet/snippets") +(yas/load-directory "~/.emacs.d/thirdparty/yasnippet/snippets") (setq-default yas/prompt-functions '(yas/ido-prompt yas/dropdown-prompt)) ; use ido for multiple snippets ;;; zencoding-mode - html diff --git a/init_eshell.sh b/init_eshell.sh deleted file mode 100644 index 9c09327..0000000 --- a/init_eshell.sh +++ /dev/null @@ -1 +0,0 @@ -export LOCAL_QUOTES=~/Trade/localQuotes/ diff --git a/move-line.el b/move-line.el index 6020a63..dc26b1b 100644 --- a/move-line.el +++ b/move-line.el @@ -26,5 +26,5 @@ (global-set-key (kbd "M-p") 'move-line-up) (global-set-key (kbd "M-n") 'move-line-down) -(message "Loaded move-line function") +(message "Loading move-line...done") (provide 'move-line) diff --git a/hoersten-pastebin-region.el b/pastebin-region.el index 70ca651..fbae423 100644 --- a/hoersten-pastebin-region.el +++ b/pastebin-region.el @@ -39,5 +39,5 @@ (insert redirected) (clipboard-kill-ring-save (point-min) (point-max)))))))))) -(message "Loaded Hoersten pastebin") -(provide 'hoersten-pastebin-region) +(message "Loading pastebin-region...done") +(provide 'pastebin-region) diff --git a/color-theme-twilight.el b/thirdparty/color-theme-twilight.el index c45b463..c45b463 100644 --- a/color-theme-twilight.el +++ b/thirdparty/color-theme-twilight.el diff --git a/pretty-mode.el b/thirdparty/pretty-mode.el index 385605b..385605b 100644 --- a/pretty-mode.el +++ b/thirdparty/pretty-mode.el diff --git a/vala-mode.el b/thirdparty/vala-mode.el index 0358790..0358790 100644 --- a/vala-mode.el +++ b/thirdparty/vala-mode.el diff --git a/zencoding-mode.el b/thirdparty/zencoding-mode.el index 19b6dea..19b6dea 100644 --- a/zencoding-mode.el +++ b/thirdparty/zencoding-mode.el |