Rename emacs to emacs.el

1 files changed, 34 insertions, 9 deletions

diff --git a/emacs b/emacs.el
index 2b34a07..e5c6e42 100644
--- a/emacs
+++ b/emacs.el
@@ -48,12 +48,23 @@
 (add-to-list 'load-path "/usr/share/emacs/site-lisp/cc-mode")
 (load "cc-mode.el" nil t t)
 
+(defconst my-cc-style
+  '("cc-mode"
+    (c-offsets-alist . ((innamespace . [0])))))
+
+(c-add-style "my-cc-mode" my-cc-style)
+(setq c-default-style "my-cc-mode")
+
 (autoload 'flex-mode "flex-mode.el" "Flex mode." t)
 (autoload 'bison-mode "bison-mode.el" "Bison mode." t)
 
+(load "/usr/share/emacs/site-lisp/haskell-mode/haskell-font-lock.el")
+(load "/usr/share/emacs/site-lisp/haskell-mode/haskell-indentation.el")
+(load "/usr/share/emacs/site-lisp/haskell-mode/haskell-doc.el")
 (load "/usr/share/emacs/site-lisp/haskell-mode/haskell-mode")
 (add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
 (add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
+(add-to-list 'auto-mode-alist '("\\.hs" . haskell-mode))
 
 ;(setq erlang-root-dir "/usr/lib/erlang")
 ;(setq exec-path (cons "/usr/lib/erlang/bin" exec-path))
@@ -80,6 +91,11 @@
 (autoload 'php-mode "php-mode.el" "Php mode." t)
 (setq auto-mode-alist (append '(("/*.\.php[345]?$" . php-mode)) auto-mode-alist))
 
+(defun my-setup-sh-mode ()
+  (setq sh-basic-offset 8
+	sh-indentation 8))
+(add-hook 'sh-mode-hook 'my-setup-sh-mode)
+
 (require 'cmake-mode)
 (setq auto-mode-alist
       (append '(("CMakeLists\\.txt\\'" . cmake-mode)
@@ -97,6 +113,8 @@
 (setq auto-mode-alist (cons '("\.po\'\|\.po\." . po-mode) auto-mode-alist))
 (autoload 'po-mode "po-mode" "Major mode for translators to edit PO files" t)
 
+(require 'haml-mode)
+
 (setq TeX-auto-save t)
 (setq TeX-parse-self t)
 (setq-default TeX-master nil)
@@ -109,6 +127,8 @@
 ;(require 'tramp)
 ;(setq tramp-default-method "scp")
 
+(require 'multi-term)
+
 (column-number-mode t)
 (show-paren-mode t)
 
@@ -116,15 +136,17 @@
 ;(global-set-key "\C-ca" 'org-agenda)
 (global-font-lock-mode 1)
 
+
 (custom-set-variables
-  ;; custom-set-variables was added by Custom.
-  ;; 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.
+ ;; custom-set-variables was added by Custom.
+ ;; 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.
  '(TeX-PDF-mode t)
+ '(agda2-include-dirs (quote ("." "/home/neoraider/Devel/Agda/lib-0.7/src")))
  '(ecb-options-version "2.32")
  '(org-agenda-files (quote ("~/Privat/Termine.org")))
- '(safe-local-variable-values (quote ((py-indent-offset . 4))))
+ '(safe-local-variable-values (quote ((LaTeX-indent-level . 8) (py-indent-offset . 4))))
  '(scroll-bar-mode nil)
  '(transient-mark-mode (quote (only . t))))
 
@@ -132,10 +154,10 @@
 
 (desktop-save-mode t)
 (custom-set-faces
-  ;; custom-set-faces was added by Custom.
-  ;; 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.
+ ;; custom-set-faces was added by Custom.
+ ;; 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.
  )
 
 (ede-cpp-root-project "gmrf"
@@ -147,3 +169,6 @@
 		      :name "GMRF/proto/babel"
 		      :file "~/Devel/C/gmrf/proto-babel/CMakeLists.txt"
 		      :system-include-path '("~/Devel/C/gmrf/gmrf/include"))
+
+(load-file (let ((coding-system-for-read 'utf-8))
+                (shell-command-to-string "agda-mode locate")))