minor tweaks

init.el

@@ -19,7 +19,3 @@
 
 (org-babel-load-file (expand-file-name "~/.emacs.d/setup.org"))
 
-
-
-
-

setup.org

@@ -3,6 +3,15 @@
 #+BEGIN_SRC emacs-lisp
   (delete-selection-mode 1)
 
+  (line-number-mode 1)
+
+  (show-paren-mode 1)
+
+
+  (global-set-key (kbd "C-c p") 
+		  (lambda() (interactive)
+		    (org-babel-load-file "~/.emacs.d/init.org")))
+
   (setq scroll-conservatively 100)
   ;;;;;; WINDOW
   (when window-system
@@ -22,19 +31,39 @@
   (setq initial-scratch-message "")
   (setq ring-bell-function 'ignore)
 
+  (global-set-key "\M-g" 'goto-line)
+
+
   (use-package monokai-theme)
   (set-cursor-color "#ff1493")
 #+END_SRC
 ** Packages
+*** Org
+#+BEGIN_SRC emacs-lisp
+  (add-to-list 'org-structure-template-alist
+	  '("m" "#+begin_src emacs-lisp\n\n#+end_src" "<src lang=\"emacs-lisp\">\n\n</src>"))
+
+
+
+  (setq org-hide-leading-stars t)
+  (setq org-alphabetical-lists t)
+  (setq org-src-fontify-natively t)  ;; you want this to activate coloring in blocks
+  (setq org-src-tab-acts-natively t) ;; you want this to have completion in blocks
+  (setq org-hide-emphasis-markers t) ;; to hide the *,=, or / markers
+  (setq org-pretty-entities t)       ;; to have \alpha, \to and others display as utf8 http://orgmode.org/manual/Special-symbols.html
+#+END_SRC
 *** Code
 #+BEGIN_SRC emacs-lisp
-  (use-package haskell-mode
-    :config (add-hook 'haskell-mode-hook 'interactive-haskell-mode)) 
-  (use-package paredit)
+   (use-package haskell-mode)
+  (add-hook 'haskell-mode-hook 'interactive-haskell-mode)
+   (use-package paredit)
 
-  (use-package magit)
-  (use-package ghc)
+   (use-package magit)
+   (use-package ghc)
 
+  ;; (use-package intero
+  ;;   :config
+  ;;   (intero-global-mode 1))
 #+END_SRC
 *** Navigation
 **** Ido