   (dolist (hook '(prog-mode-hook conf-mode-hook))
     (add-hook hook #'autopair-mode)))
 
+;; Idle Highlight
+(use-package idle-highlight-mode
+  :ensure t
+  :config (idle-highlight-mode 1)
+  :init
+  (dolist (hook '(prog-mode-hook conf-mode-hook))
+    (add-hook hook #'idle-highlight-mode)))
+
+;; Fringe
+(use-package fringe
+  :config
+  (setq-default left-fringe-width  10)
+  (setq-default right-fringe-width  10))
+
+;; Scroll Bar
+(use-package scroll-bar
+  :config
+  (scroll-bar-mode -1)
+  (setq mouse-wheel-scroll-amount '(1 ((shift) . 1) ((control) . nil)))
+  (setq mouse-wheel-progressive-speed nil))
+
+;; Linum
+(use-package linum
+  :config
+  (global-linum-mode t)
+  (setq linum-format "%d")
+  (setq column-number-mode t))
+
 ;; Whitespace
 (use-package whitespace
-  :init
-  (dolist (hook '(prog-mode-hook conf-mode-hook))
+  :bind (("C-c C-w" . whitespace-mode))
+  :init
+  (dolist (hook '(prog-mode-hook text-mode-hook conf-mode-hook))
     (add-hook hook #'whitespace-mode))
   :config
-  (global-whitespace-mode 1) ;; Whitespace ON.
+  (add-hook 'prog-mode-hook 'whitespace-mode)
+  (global-whitespace-mode t) ;; Whitespace ON.
+  (setq whitespace-global-modes '(not org-mode))
   (setq whitespace-line-column 80) ;; Set indent limit.
-  (add-hook 'prog-mode-hook 'whitespace-mode)
   (setq whitespace-display-mappings
         '(
           (space-mark 32 [183] [46])
           (newline-mark 10 [172 10])
-          (tab-mark 9 [9655 9] [92 9])
-          )))
-
-;; Fringe
-(use-package fringe
-  :config
-  (setq-default left-fringe-width  10)
-  (setq-default right-fringe-width  10))
-
-;; Scroll Bar
-(use-package scroll-bar
-  :config
-  (scroll-bar-mode -1)
-  (setq mouse-wheel-scroll-amount '(1 ((shift) . 1) ((control) . nil)))
-  (setq mouse-wheel-progressive-speed nil))
-
-;; Linum
-(use-package linum
-  :config
-  (global-linum-mode t)
-  (setq linum-format "%d")
-  (setq column-number-mode t))
+          (tab-mark 9 [9655 9] [92 9]))))
+
+;; Org
+(use-package org
+  :ensure t
+  :mode (("\\.org$" . org-mode))
+  :bind (("C-c C-x C-i" . org-clock-in)
+         ("C-c C-x C-o" . org-clock-out)
+         ("C-c C-x C-j" . org-clock-goto)
+         ("C-c C-x C-r" . org-clock-report))
+  :config
+  (progn
+    (define-key org-mode-map "\M-q" 'toggle-truncate-lines)
+    (setq org-directory "~/org")
+    (setq org-clock-persist t)
+    (setq org-clock-mode-line-total 'current)
+    ;; config stuff
+    ))
+
+;; Org-Bullets
+(use-package org-bullets
+  :ensure t
+  :commands (org-bullets-mode)
+  :init (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))
+
+;; Flycheck
+(use-package flycheck
+  :init
+  (dolist (hook '(org-mode-hook))
+    (add-hook hook #'flyspell-mode)))
+
+;; Helm
+(use-package helm
+  :ensure t
+  :bind (("M-x" . helm-M-x)
+         ("C-x C-f" . helm-find-files))
+  :config
+  (setq helm-split-window-in-side-p        t ;; opens helm inside window
+        helm-move-to-line-cycle-in-source  t
+        helm-autoresize-min-height         20
+        helm-autoresize-max-height         35
+        helm-scroll-amount                 8)
+  (define-key helm-map (kbd "<tab>") 'helm-execute-persistent-action)
+  (define-key helm-map (kbd "C-z") 'helm-select-action)
+  (setq helm-mode-fuzzy-match t))
+
 
 ;; Smex
 ;;(use-package smex

    (setq python-indent 4)))



;; Useful definitions

(defun lorem-ipsum ()
  "Insert a lorem ipsum."
    (interactive)

(global-set-key (kbd "C-;") 'comment-or-uncomment-region)
(global-set-key (kbd "M-/") 'hippie-expand)

;; Window Splitting Made Easy
(global-set-key [f1] 'split-window-horizontally)
(global-set-key [f2] 'split-window-vertically)
(global-set-key [f3] 'delete-window)

;; Menu Bars
(tool-bar-mode -1)
(menu-bar-mode -1)
