diff options
| -rw-r--r-- | c-init.el | 4 | ||||
| -rw-r--r-- | color-theme-init.el | 21 | ||||
| -rw-r--r-- | haskell-init.el | 27 | ||||
| -rw-r--r-- | hoersten-c-style.el | 2 | ||||
| -rw-r--r-- | init.el | 30 |
5 files changed, 53 insertions, 31 deletions
@@ -46,5 +46,5 @@ (add-to-list 'auto-mode-alist '("\\.ipp$" . c++-mode)) (add-to-list 'auto-mode-alist '("\\.inl$" . c++-mode)) -(message "Loading C hook...done") -(provide 'c-init)
\ No newline at end of file +(message "Loading c-init...done") +(provide 'c-init) diff --git a/color-theme-init.el b/color-theme-init.el new file mode 100644 index 0000000..53b238c --- /dev/null +++ b/color-theme-init.el @@ -0,0 +1,21 @@ +;; ~/.emacs.d/color-theme-init.el +;; Luke Hoersten <[email protected]> + +;;; color theme +(if window-system + (progn + (require 'color-theme) + + ;; solarized + (add-to-list 'load-path "~/.emacs.d/thirdparty/color-theme-solarized") + (require 'color-theme-solarized) + (color-theme-solarized-light) + ;; (color-theme-solarized-dark) + + ;; twilight + ;; (load "color-theme-twilight") + ;; (color-theme-twilight) + )) + +(message "Loading color-theme-init...done") +(provide 'color-theme-init) diff --git a/haskell-init.el b/haskell-init.el index bd24e71..c73cc95 100644 --- a/haskell-init.el +++ b/haskell-init.el @@ -2,17 +2,17 @@ ;; Luke Hoersten <[email protected]> ;; 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))))) +;; (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 @@ -22,7 +22,10 @@ (capitalized-words-mode t) (haskell-doc-mode t) (setq + haskell-program-name "/opt/ghc7/bin/ghci" haskell-indent-offset 4 whitespace-line-column 78)) t) ; append instead of prepend else haskell-mode overwrites these settings -(provide 'haskell-init)
\ No newline at end of file + +(message "Loading haskell-init...done") +(provide 'haskell-init) diff --git a/hoersten-c-style.el b/hoersten-c-style.el index 825ca24..043a499 100644 --- a/hoersten-c-style.el +++ b/hoersten-c-style.el @@ -32,5 +32,5 @@ ;;(require 'doxymacs) (setq-default c-default-style "hoersten") ; load c-style -(message "Loading Hoersten C style...done") +(message "Loading hoersten-c-style...done") (provide 'hoersten-c-style) @@ -2,7 +2,7 @@ ;; Luke Hoersten <[email protected]> ;;;; 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 (setq-default ediff-split-window-function @@ -24,6 +24,8 @@ (delete-selection-mode t) ; replace highlighted text (windmove-default-keybindings) ; move between windows with shift-arrow (fset 'yes-or-no-p 'y-or-n-p) ; replace yes/no prompts +(global-hl-line-mode t) ; highlight current line + ;;; coding (which-func-mode t) ; show current function @@ -39,8 +41,7 @@ ;;; Darwin (if (string-match "darwin" (emacs-version)) (progn - (setq-default ns-command-modifier 'control) - (tabbar-mode nil))) + (setq-default mac-command-modifier 'meta))) ;;; Xorg (if window-system @@ -49,15 +50,15 @@ "Get appropriate font based on system and hostname." (cond ((string-match "darwin" (emacs-version)) "Menlo-12") - ((string-match "HoldenCaulfield" (system-name)) "monospace-6") - ((string-match "lhoersten-66113" (system-name)) "monospace-8") - ("monospace-10"))) + ((string-match "HoldenCaulfield" (system-name)) "Ubuntu Mono-6.5") + ((string-match "lhoersten-66113" (system-name)) "Ubuntu Mono-8.5") + ("Ubuntu Mono-10"))) (tool-bar-mode -1) ; remove tool bar (scroll-bar-mode -1) ; remove scroll bar (visual-line-mode t) ; word wrap break on whitespace - (global-hl-line-mode t) ; highlight current line - (set-frame-font (get-font)))) + (set-frame-font (get-font))) + (menu-bar-mode -1)) ;;; terminal (global-set-key (kbd "C-c s") 'eshell) ; start shell @@ -126,20 +127,14 @@ ;;; language init (require 'c-init) ; c specific elisp (require 'haskell-init) ; haskell specific elisp +(require 'color-theme-init) ; haskell specific elisp (require 'vala-mode) ; vala programming language +(require 'rainbow-delimiters) ; multi-colored parens ;;; function init (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 'rainbow-delimiters) ; multi-colored parens - -;;; twilight theme -(if window-system - (progn - (require 'color-theme) - (load "color-theme-twilight") - (color-theme-twilight))) ;;; yasnippets (add-to-list 'load-path "~/.emacs.d/thirdparty/yasnippet") @@ -148,6 +143,9 @@ (yas/load-directory "~/.emacs.d/thirdparty/yasnippet/snippets") (setq-default yas/prompt-functions '(yas/ido-prompt yas/dropdown-prompt)) ; use ido for multiple snippets +;;; java-mode +(add-hook 'java-mode-hook (lambda () (setq whitespace-line-column 140))) + ;;; zencoding-mode - html (require 'zencoding-mode) (add-hook 'sgml-mode-hook 'zencoding-mode) ; Auto-start on any markup modes |