 (define-key global-map (kbd "RET") 'newline-and-indent)
 
 (add-hook 'text-mode-hook 'auto-fill-mode)
+(add-hook 'html-mode-hook (lambda ()
+                            (auto-fill-mode -1)))
+
+(add-hook 'prog-mode-hook
+          (lambda ()
+            (font-lock-add-keywords nil
+                                    '(("\\<\\(FIXME\\|TODO\\):" 1 'font-lock-warning-face prepend)
+                                      ("\\<\\(and\\|or\\|not\\)\\>" .
+                                       'font-lock-keyword-face)))))
+
+(electric-pair-mode t)
+
+(setq package-archives '(("gnu" . "http://elpa.gnu.org/packages/")
+                         ("marmalade" . "http://marmalade-repo.org/packages/")
+                         ("melpa" . "http://melpa.milkbox.net/packages/")))
 
 ;; --- flyspell ----------------------------------------------------------------
 (let ((langs '("american"

;; === emacs wiki stuff ========================================================
; --- misc functions -----------------------------------------------------------
(defun my-dbl (x)

      (append '(("\\.cs$" . csharp-mode)) auto-mode-alist))
(setq auto-mode-alist
      (append '(("\\.csproj$" . xml-mode)) auto-mode-alist))

;; --- coffeescript ------------------------------------------------------------
(setq coffee-tab-width 4)
