   :ensure t
   :init (global-flycheck-mode))
 
-;;;;;;;;;;;;;;;;
-;; Versioning ;;
-;;;;;;;;;;;;;;;;
-
-(use-package magit
-  :ensure t
-  :config (progn
-	    (setq magit-last-seen-setup-instructions "1.4.0")))
-
-;;;;;;;;;;;;
-;; Server ;;
-;;;;;;;;;;;;
-
-;; (require 'server)
-
-;; (unless (server-running-p)
-;;   (server-start))
+;;;;;;;;;;;;;;
+;; Org mode ;;
+;;;;;;;;;;;;;;
+
+(use-package org
+  :init (progn
+	 (setq org-directory "~/org")
+	 (setq org-mobile-directory "~/mobile-org")
+
+	 (setq org-log-done 'time)
+
+	 (setq org-agenda-files (concat org-directory "/agenda-files.txt"))
+
+	 (setq org-default-notes-file (concat org-directory "/notes.org"))
+	 (setq org-refile-targets '((nil :maxlevel . 9)
+				    (org-agenda-files :maxlevel . 9)))
+
+	 (org-babel-do-load-languages
+	  'org-babel-load-languages
+	  '((haskell . t))
+	 ))
+  )
+
+(use-package evil-org
+  :ensure t)
 
 ;;;;;;;;;;;;;;;
 ;; Languages ;;
 ;;;;;;;;;;;;;;;
 
+
+
+
 ;; Haskell
 
 (use-package ghc

  :config (global-company-mode 1)
  :bind ("M-/" . company-complete))

;;;;;;;;;;;;;
;; Linting ;;
;;;;;;;;;;;;;

;;; init --- My init file


;;; Commentary:
; This is just to shut flycheck up

;;; Code:

;;;;;;;;;;;;;;;;
;; Annoyances ;;
;;;;;;;;;;;;;;;;
